zhangjie 4 år sedan
förälder
incheckning
c6ca5ef041

+ 3 - 9
src/modules/exam/views/TaskApplyManage.vue

@@ -136,11 +136,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="
-                !scope.row.auditStatus &&
-                  !scope.row.reviewStatus &&
-                  scope.row.createId === curUserId
-              "
+              v-if="!scope.row.auditStatus && !scope.row.reviewStatus"
               class="btn-table-icon"
               type="text"
               icon="icon icon-edit"
@@ -150,8 +146,7 @@
             <el-button
               v-if="
                 scope.row.auditStatus === 'AUDITED' &&
-                  scope.row.reviewStatus === 'NOT_PASS' &&
-                  scope.row.createId === curUserId
+                  scope.row.reviewStatus === 'NOT_PASS'
               "
               class="btn-table-icon"
               type="text"
@@ -162,8 +157,7 @@
             <el-button
               v-if="
                 scope.row.auditStatus === 'NOT_AUDITED' &&
-                  scope.row.status === 'SUBMIT' &&
-                  scope.row.createId === curUserId
+                  scope.row.status === 'SUBMIT'
               "
               class="btn-table-icon"
               type="text"

+ 4 - 4
src/modules/print/views/PrintTaskManage.vue

@@ -353,7 +353,7 @@ export default {
       this.totalInfo = data || {};
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val.map(item => item.id);
+      this.multipleSelection = val.map(item => item.examDetailId);
     },
     toPreview(row) {},
     toSubmit(row) {
@@ -379,7 +379,7 @@ export default {
       })
         .then(async () => {
           const data = await resubmitPrintTask({
-            id: row.id,
+            id: row.examDetailId,
             printPlanId: row.printPlanId
           });
           if (!data) return;
@@ -396,7 +396,7 @@ export default {
         type: "warning"
       })
         .then(async () => {
-          const data = await cancelPrintTask(row.id);
+          const data = await cancelPrintTask(row.examDetailId);
           if (!data) return;
 
           this.$message.success("撤回成功!");
@@ -406,7 +406,7 @@ export default {
     },
     async toViewPdf(row) {
       let result = true;
-      const data = await getPrintTaskPdf(row.id).catch(() => {
+      const data = await getPrintTaskPdf(row.examDetailId).catch(() => {
         result = false;
       });
       if (!result) return;