yusheng 2 days ago
parent
commit
f193d4f4d1

+ 2 - 1
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -257,10 +257,11 @@
             prop="attachmentUrl"
             align="center"
             :show-overflow-tooltip="true"
+            width="150"
           >
             <template slot-scope="scope">
               <span
-                ><fileMain v-model="scope.row.attachmentUrl" type="view"></fileMain
+                ><fileMain v-model="scope.row.attachmentUrl" type="add"></fileMain
               ></span>
             </template>
           </el-table-column>

+ 1 - 0
src/views/inspectionWork/components/sampleListDialog.vue

@@ -342,6 +342,7 @@
             label: '让步接收'
           }
         ],
+        clientEnvironmentId:'',
         sList: [] //检测工具筛选
       };
     },

+ 11 - 5
src/views/sample/sampleRecord/components/addSample.vue

@@ -440,7 +440,7 @@
             label: '照片',
             prop: 'attachmentUrl',
             slot: 'attachmentUrl',
-            width:150,
+            width: 150,
             align: 'center'
           },
           { label: '批次号', prop: 'batchNo', align: 'center' },
@@ -699,14 +699,18 @@
           await this.queryQualityTempleContent(
             !list1.length && row.qualityMode == 1
           );
-          if (this.$store.state.user.info.clientEnvironmentId == 10&&this.form.qualityType==3) {
+          if (
+            this.$store.state.user.info.clientEnvironmentId == 10 &&
+            this.form.qualityType == 3
+          ) {
             this.form.qualityMode = 2;
             this.form.recordingMethod = 2;
             this.form.conditionType = 2;
             this.form.quantity = 1;
             this.form.portion = 1;
-            
+
             await this.queryQualityTempleContent(true);
+            this.save();
           }
         }
       },
@@ -758,8 +762,9 @@
         });
         this.schemeList = res.list;
         if (is) {
-          this.updatePackingList();
+         await this.updatePackingList();
         }
+        return;
       },
       cancel() {
         this.form = {
@@ -1224,7 +1229,7 @@
             ...item,
             measureQuantity: item.measureQuantity, //作为计量数量
             sampleCode: codeList[index],
-            attachmentUrl:[],
+            attachmentUrl: [],
             qualitySampleTemplateList
           });
           // }
@@ -1233,6 +1238,7 @@
 
         this.sampleList = dataList;
         this.getTotal();
+        return
       },
       getTotal() {
         this.form.sampleQuantity = this.sampleList