Przeglądaj źródła

fix(qualityReport): 修复质检报告详情获取及不良品处置逻辑

yusheng 1 tydzień temu
rodzic
commit
61dbeacddb

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

@@ -190,7 +190,7 @@
         form: {},
         tabOptions: [
           { key: 'main', name: '报告' },
-          { key: 'unqualifiedList', name: '不合格品台账' }
+          { key: 'unqualifiedList', name: '不品台账' }
         ],
         activeComp: 'main',
         // 质检报告数据
@@ -204,8 +204,8 @@
     methods: {
       async open() {
         let api = getDetailById;
-        let id = this.businessId;
 
+        let detail = null;
         if (this.businessType?.includes('质检任务单')) {
           api = taskmonadGetById;
         }
@@ -221,7 +221,14 @@
             pageNum: 1,
             size: 200
           });
-          this.id = data.qualityWorkOrderId;
+          detail = await api(data.qualityWorkOrderId);
+          let inspectImage = [];
+          detail.data.templateList.forEach((item) => {
+            if (item.inspectImage) {
+              inspectImage.push(...item.inspectImage);
+            }
+          });
+          console.log(inspectImage, 'inspectImage');
           this.tabOptions.unshift({
             key: 'unqualifiedHtml',
             name: '不合格品处置单'
@@ -255,9 +262,10 @@
                   }
             );
           });
+        } else {
+          detail = await api(this.businessId);
         }
 
-        const detail = await api(id);
         this.form = detail.data;
         this.initUnqualifiedProduct();
 

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

@@ -190,6 +190,7 @@
                     v-if="!isView"
                     v-model="basicInfoData.vehiclePhotoUrl"
                     module="qms"
+                    :limit="4"
                   ></image-upload>
                   <template v-else>
                     <img

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

@@ -113,7 +113,7 @@
         ) {
           const data = await this.getTableValue();
           if (data == 'isNodisposeType') {
-            this.$message.warning('有不合格品未处置,请检查!');
+            this.$message.warning('有不品未处置,请检查!');
             return;
           }
           if (this.businessType?.includes('检测报告单')) {