Просмотр исходного кода

fix(qualityReportApproval): 修复质量报告审批中的URL生成和任务提交逻辑

liujt 6 месяцев назад
Родитель
Сommit
e864699b60

+ 1 - 1
src/views/bpm/handleTask/components/qualityReportApproval/detailDialog.vue

@@ -158,7 +158,7 @@ import { getToken } from '@/utils/token-util';
           // this.loadReportData();
           // this.loadListDetail();
           console.log('this.businessCode~~~', this.businessCode);
-          let url = await getJmPrintViewUrl(this.businessCode);
+          let url = await getJmPrintViewUrl('qmsqualityinspectionprint');
           this.fileUrl = `${url}?token=${getToken()}&id=${this.businessId}`;
           console.log('fileUrl~~~', this.fileUrl);
         }

+ 16 - 16
src/views/bpm/handleTask/components/qualityReportApproval/submit.vue

@@ -201,19 +201,19 @@
           (item) => item.id == this.form.userId
         );
         //主管指派采购员
-        if (this.taskDefinitionKey === 'deptLeaderAssign') {
-          if (!this.form.userId) {
-            this.$message.warning(`请选择采购员!`);
-            return;
-          }
-          await assign({
-            userId: userInfo.id,
-            userName: userInfo.name,
-            id: this.taskId,
-            reason: this.form.reason,
-            businessId: this.businessId
-          });
-        }
+        // if (this.taskDefinitionKey === 'deptLeaderAssign') {
+        //   if (!this.form.userId) {
+        //     this.$message.warning(`请选择采购员!`);
+        //     return;
+        //   }
+        //   await assign({
+        //     userId: userInfo.id,
+        //     userName: userInfo.name,
+        //     id: this.taskId,
+        //     reason: this.form.reason,
+        //     businessId: this.businessId
+        //   });
+        // }
         // //采购员核对
         // if (this.taskDefinitionKey === 'purchaserCheck') {
         //   let arr = await this.getTableValue();
@@ -223,7 +223,7 @@
         //   await UpdateInformation(arr);
         // }
         let API = !!status ? approveTaskWithVariables : rejectTask;
-        API({
+        await API({
           id: this.taskId,
           reason: this.form.reason,
           variables: {
@@ -236,8 +236,8 @@
           title: status === 0 ? '驳回' : ''
         });
       },
-      rejectTask(status) {
-        rejectTask({
+      async rejectTask(status) {
+        await rejectTask({
           id: this.taskId,
           reason: this.form.reason,
           variables: {