Merge branch 'dev_v3.2.7' of http://git.qmth.com.cn/teachcloud/teachcloud-print-web into dev_v3.2.7

src/constants/enumerate.js

@@ -243,8 +243,7 @@ export const PRINT_PLAN_STATUS = {
   NEW: "新建",
   READY: "就绪",
   PRINTING: "印刷中",
-  PRINT_FINISH: "印刷完成",
-  END: "已结束",
+  FINISH: "印刷完成",
 };
 // 印刷计划相关
 export const DRAW_RULE_TYPE = {
@@ -267,10 +266,10 @@ export const PRINT_CONTENT_TYPE = {
 // 印刷任务状态
 export const PRINT_TASK_STATUS = {
   NEW: "新建",
+  CREATING: "生成中",
   READY: "就绪",
   WAITING: "待印刷",
   PRINTING: "印刷中",
-  EXPIRED: "已过期",
   FINISH: "已完成",
   CANCEL: "作废",
 };

src/modules/exam/views/ExamTaskManage.vue

@@ -202,7 +202,7 @@
                 ((scope.row.status === 'STAGE' && !scope.row.enable) ||
                   scope.row.status === 'DRAFT') &&
                 scope.row.createId === curUserId &&
-                checkPrivilege('link', 'edit')
+                checkPrivilege('link', 'assign')
               "
               class="btn-primary"
               type="text"

src/modules/print/views/BusinessDataExport.vue

@@ -106,7 +106,7 @@
             :loading="loading"
             @click="toExport"
           >
-            导出查询结果
+            导出
           </el-button>
           <el-button
             v-if="checkPrivilege('button', 'export')"

src/modules/print/views/PrintTaskManage.vue

@@ -365,8 +365,7 @@
             >
             <el-button
               v-if="
-                (scope.row.status === 'END' ||
-                  scope.row.status === 'PRINT_FINISH') &&
+                (scope.row.status === 'END' || scope.row.status === 'FINISH') &&
                 checkPrivilege('link', 'normal')
               "
               :class="scope.row.normal ? 'btn-danger' : 'btn-primary'"