ccjgmwz 1 년 전
부모
커밋
0cdbde4417
3개의 변경된 파일26개의 추가작업 그리고 19개의 파일을 삭제
  1. 21 14
      src/views/houseSelfCollect/newWeighingManagement.vue
  2. 3 3
      src/views/houseSelfCollect/weightCheckRecord.vue
  3. 2 2
      src/views/login/index.vue

+ 21 - 14
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1869,17 +1869,19 @@ 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'
-            });
-          }
+          // 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
         }
       }
+      console.log(val)
+      this.weighingList.addressUrl = val.addressUrl
     },
     cancel() {
       if (this.reader) {
@@ -2089,13 +2091,18 @@ export default {
           })
           return
         }
+        
+          this.weighingList.addressUrl = this.weighingList.addressUrl+','+this.coverImgList.toString()
       }
-      if (this.tpyeNo == 2) {
-        if (this.submitAllow) {
-          this.$message.error('该条质检信息未确认')
-          return
-        }
+      else{
+          this.weighingList.addressUrl = this.coverImgList.toString()
       }
+      // if (this.tpyeNo == 2) {
+      //   if (this.submitAllow) {
+      //     this.$message.error('该条质检信息未确认')
+      //     return
+      //   }
+      // }
       this.$confirm('确定保存检斤信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -2104,7 +2111,7 @@ export default {
         .then(() => {
           this.deptBudgetList.secretaryWeigher =
             localStorage.getItem('ws-pf_staffName')
-          this.weighingList.addressUrl = this.coverImgList.toString()
+          // this.weighingList.addressUrl = this.coverImgList.toString()
           var that = this
           var warehousing = {}
           //贸易入库保存需要再走入库接口

+ 3 - 3
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -73,12 +73,12 @@
         <el-table-column key="9" prop="buckleMiscellaneous" label="扣重(公斤)" width="100"></el-table-column>
         <el-table-column key="10" prop="netWeight" label="净重(公斤)" width="100"></el-table-column>
         <el-table-column key="11" 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 :src="scope.row.addressUrl.split(',')[0]" alt="" style="width:100px" @click="showImg(scope.row.addressUrl.split(',')[0])"/>
-              <img :src="scope.row.addressUrl.split(',')[1]" alt="" style="width:100px" @click="showImg(scope.row.addressUrl.split(',')[1])"/>
+              <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" @click="showImg(scope.row.addressUrl.split(',')[1])"/>
             </div>
            
           </template>

+ 2 - 2
src/views/login/index.vue

@@ -273,13 +273,13 @@
       :before-close="serviceClose" :closeOnClickModal="true" :appendToBody="true">
       <serviceDialog @close="serviceClose"></serviceDialog>
     </el-dialog>
-    <div class="bottom">
+    <!-- <div class="bottom">
           <div class="row1">
           Copyright www.eliangeyun.com All Right Reserved @淘粮(海南)科技发展有限公司  </div>
           <div class="">
           <a href="https://beian.miit.gov.cn">琼ICP备2021004821号-2</a>
           </div>
-    </div>
+    </div> -->
   </div>
 </template>