Merge branch 'master' of http://git.zthymaoyi.com/wangchao/yiliangyiyun-pc-zl

# Conflicts:
#	src/views/houseSelfCollect/newWeighingManagement.vue
#	src/views/houseSelfCollect/weightCheckRecord.vue

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1991,26 +1991,22 @@ export default {
           this.weighingList.boxNoOther =
             val.qualityInspectionManagement.boxNoOther
           this.weighingList.titleNo = val.qualityInspectionManagement.titleNo
-          this.weighingList.titleNoOther =
-            val.qualityInspectionManagement.titleNoOther
-          if (
-            this.tpyeNo == 2 &&
-            this.status == 1 &&
-            val &&
-            val.qualityInspectionManagement.confirm == 0 &&
-            this.warehouseName != '克东千丰库'
-          ) {
-            this.submitAllow = true
-            // this.$message({
-            //   message: '该条质检信息未确认',
-            //   type: 'warning'
-            // });
-          }
+          this.weighingList.titleNoOther = val.qualityInspectionManagement.titleNoOther
+          // if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0 && this
+          //   .warehouseName != '克东千丰库') {
+          //   this.submitAllow = true
+          //   this.$message({
+          //     message: '该条质检信息未确认',
+          //     type: 'warning'
+          //   });
+          // }
           this.paramType = val.qualityInspectionManagement.paramType
         }
 
         this.coverImgList.push(val.addressUrl)
       }
+      console.log(val)
+      this.weighingList.addressUrl = val.addressUrl
     },
     cancel() {
       if (this.reader) {
@@ -2220,7 +2216,15 @@ export default {
           })
           return
         }
+
+          this.weighingList.addressUrl = this.weighingList.addressUrl+','+this.coverImgList.toString()
+      }
+<<<<<<< HEAD
+=======
+      else{
+          this.weighingList.addressUrl = this.coverImgList.toString()
       }
+>>>>>>> 0cdbde441704903f128ea4965b50cf2fc68528ff
       // if (this.tpyeNo == 2) {
       //   if (this.submitAllow) {
       //     this.$message.error('该条质检信息未确认')
@@ -2233,10 +2237,16 @@ export default {
         type: 'warning'
       })
         .then(() => {
+<<<<<<< HEAD
           this.deptBudgetList.secretaryWeigher = localStorage.getItem(
             'ws-pf_staffName'
           )
           this.weighingList.addressUrl = this.coverImgList.toString()
+=======
+          this.deptBudgetList.secretaryWeigher =
+            localStorage.getItem('ws-pf_staffName')
+          // this.weighingList.addressUrl = this.coverImgList.toString()
+>>>>>>> 0cdbde441704903f128ea4965b50cf2fc68528ff
           var that = this
           var warehousing = {}
           //贸易入库保存需要再走入库接口

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -189,17 +189,19 @@
           prop="secretaryWeigher"
           label="司称员"
         ></el-table-column>
-        <el-table-column key="15" label="附件" width="200">
+        <el-table-column key="15" label="照片" width="200">
           <template scope="scope">
             <!-- {{scope.row.addressUrl.split(',')[0]}} -->
             <div v-if="scope.row.addressUrl" style="display:flex">
               <img
+                v-if="scope.row.addressUrl.split(',')[0]"
                 :src="scope.row.addressUrl.split(',')[0]"
                 alt=""
                 style="width:100px"
                 @click="showImg(scope.row.addressUrl.split(',')[0])"
               />
               <img
+                v-if="scope.row.addressUrl.split(',')[1]"
                 :src="scope.row.addressUrl.split(',')[1]"
                 alt=""
                 style="width:100px"