Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-03-17 14:01:57 +08:00
parent 82c6e01251 56da31b345
commit 7d5dd33879
40 changed files with 152 additions and 360 deletions
@@ -2823,6 +2823,8 @@ class execution extends control
            $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
        }

+        $this->view->fileName = (in_array($status, array('all', 'undone')) ? $this->lang->execution->$status : $this->lang->execution->statusList[$status]) . $this->lang->execution->common;
+
        $this->display();
    }