handle bug

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -416,7 +416,8 @@
                             <el-col :span="6">
                                 <el-form-item label="是否留样">
                                 <template slot-scope="scope">
-                                    <el-select v-model="item.shi_fou_liu_yang_" placeholder="请选择">
+                                    <el-select v-model="item.shi_fou_liu_yang_" placeholder="请选择"
+                                        @change="ifLiuYangChange(item,index)">
                                     <el-option
                                         v-for="item in ifLY"
                                         :key="item.value"
@@ -782,18 +783,40 @@ import * as dayjs from 'dayjs'
     },
     liuyanChange(item,index){
       // console.log(item,index)
-      this.flag = false
-      let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
-      let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
-      this.listData[index].xiao_hui_ri_qi_ = itemData
-      this.listData[index].liu_yang_qi_xian = val
-      this.flag = true
+      if(this.listData[index].liu_yang_ri_qi_=== undefined || this.listData[index].liu_yang_ri_qi_ === null){
+        this.listData[index].xiao_hui_ri_qi_ = null
+        this.listData[index].liu_yang_qi_xian = null
+      }else{
+        this.flag = false
+        let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
+        let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
+        this.listData[index].xiao_hui_ri_qi_ = itemData
+        this.listData[index].liu_yang_qi_xian = val
+        this.flag = true
+      }
     },
     changeShuLiang(index){
         let item = this.listData[index]
         let total = parseInt(item.shu_liang_ || 0) + parseInt(item.shu_liang_er_ || 0) + parseInt(item.shu_liang_san_ || 0) + parseInt(item.shu_liang_si_ || 0)
         item.yang_pin_zong_shu = total
         item.jie_yang_shu_lian = total
+    },
+    ifLiuYangChange(item,index){
+        // console.log(index)
+        if(this.listData[index].shi_fou_liu_yang_ == '否'){
+            this.listData[index].liu_yang_ri_qi_ = null
+            this.listData[index].liu_yang_qi_xian = null
+            this.listData[index].liu_yang_shu_lian_yi = null
+            this.listData[index].liu_yang_shu_lian_er = null
+            this.listData[index].liu_yang_shu_lian_san = null
+            this.listData[index].liu_yang_shu_lian_si = null
+
+            this.listData[index].liu_yang_wei_zhi_yi = null
+            this.listData[index].liu_yang_wei_zhi_er = null
+            this.listData[index].liu_yang_wei_zhi_san = null
+            this.listData[index].liu_yang_wei_zhi_si = null
+            // todo 更新留样位置1-4
+        }
     }
   }
 

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -396,7 +396,8 @@
                           <el-col :span="6">
                             <el-form-item label="是否留样">
                               <template slot-scope="scope">
-                                 <el-select v-model="item.shi_fou_liu_yang_" placeholder="请选择">
+                                 <el-select v-model="item.shi_fou_liu_yang_" placeholder="请选择"
+                                 @change="ifLiuYangChange(item,index)">
                                    <el-option
                                      v-for="item in ifLY"
                                      :key="item.value"
@@ -751,21 +752,42 @@ import * as dayjs from 'dayjs'
     }
   },
   methods:{
-    
     liuyanChange(item,index){
       // console.log(item,index)
-      this.flag = false
-      let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
-      let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
-      this.listData[index].xiao_hui_ri_qi_ = itemData
-      this.listData[index].liu_yang_qi_xian = val
-      this.flag = true
+      if(this.listData[index].liu_yang_ri_qi_=== undefined || this.listData[index].liu_yang_ri_qi_ === null){
+        this.listData[index].xiao_hui_ri_qi_ = null
+        this.listData[index].liu_yang_qi_xian = null
+      }else{
+        this.flag = false
+        let itemData =  dayjs(this.listData[index].liu_yang_ri_qi_).add(7,'day').format("YYYY-MM-DD")
+        let val =  dayjs(this.listData[index].liu_yang_ri_qi_).add(3,'month').format("YYYY-MM-DD")
+        this.listData[index].xiao_hui_ri_qi_ = itemData
+        this.listData[index].liu_yang_qi_xian = val
+        this.flag = true
+      }
     },
     changeShuLiang(index){
         let item = this.listData[index]
         let total = parseInt(item.shu_liang_ || 0) + parseInt(item.shu_liang_er_ || 0) + parseInt(item.shu_liang_san_ || 0) + parseInt(item.shu_liang_si_ || 0)
         item.yang_pin_zong_shu = total
         item.jie_yang_shu_lian = total
+    },
+    ifLiuYangChange(item,index){
+        // console.log(index)
+        if(this.listData[index].shi_fou_liu_yang_ == '否'){
+            this.listData[index].liu_yang_ri_qi_ = null
+            this.listData[index].liu_yang_qi_xian = null
+            this.listData[index].liu_yang_shu_lian_yi = null
+            this.listData[index].liu_yang_shu_lian_er = null
+            this.listData[index].liu_yang_shu_lian_san = null
+            this.listData[index].liu_yang_shu_lian_si = null
+
+            this.listData[index].liu_yang_wei_zhi_yi = null
+            this.listData[index].liu_yang_wei_zhi_er = null
+            this.listData[index].liu_yang_wei_zhi_san = null
+            this.listData[index].liu_yang_wei_zhi_si = null
+            // todo 更新留样位置1-4
+        }
     }
   }
   }

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -336,7 +336,6 @@ export default {
                         sampleList.push(o)
                     }
                     localStr = localArr.filter(i => i).join(',')
-
                     let value = ''
                     let lhypIdStr = ''
                     for (let i = 0; i < lhypbWJ.length; i++) {
@@ -366,7 +365,9 @@ export default {
                         ypInfoList.forEach(item => {
                             allUUID.push(item.biao_zhi_uuid_1, item.biao_zhi_uuid_2, item.biao_zhi_uuid_3, item.biao_zhi_uuid_4)
                             let allResult = []
-                            allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if(item.shou_yang_wei_zhi_yi != undefined){
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            }
                             if (item.shou_yang_wei_zhi_er != undefined) {
                                 allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
                             }
@@ -376,7 +377,9 @@ export default {
                             if (item.shou_yang_wei_zhi_si != undefined) {
                                 allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
                             }
-                            allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if(item.liu_yang_wei_zhi_yi){
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            }
                             if (item.liu_yang_wei_zhi_er != undefined) {
                                 allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
                             }
@@ -613,7 +616,7 @@ export default {
         },
         handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime,sampleType,liuYangNum) {
             !locationIds.has(currentLocation) ? locationIds.add(currentLocation) : localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta = '占用'
-            if (localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
+            if (localInfo.find(i => i.id_ === currentLocation)!=undefined  &&localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
                 let obj = {
                     where: {
                         id_: currentLocation

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -320,7 +320,9 @@ export default {
                         ypInfoList.forEach(item => {
                             allUUID.push(item.biao_zhi_uuid_1, item.biao_zhi_uuid_2, item.biao_zhi_uuid_3, item.biao_zhi_uuid_4)
                             let allResult = []
-                            allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if(item.shou_yang_wei_zhi_yi != undefined){
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            }
                             if (item.shou_yang_wei_zhi_er != undefined) {
                                 allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
                             }
@@ -330,7 +332,9 @@ export default {
                             if (item.shou_yang_wei_zhi_si != undefined) {
                                 allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
                             }
-                            allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if(item.liu_yang_wei_zhi_yi){
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            }
                             if (item.liu_yang_wei_zhi_er != undefined) {
                                 allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
                             }
@@ -563,7 +567,7 @@ export default {
         handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime,sampleType,liuYangNum) {
             !locationIds.has(currentLocation) ? locationIds.add(currentLocation) : localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta = '占用'
             // console.log(localInfo.find(i => i.id_ === currentLocation), currentLocation)
-            if (localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
+            if (localInfo.find(i => i.id_ === currentLocation)!=undefined  &&localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
                 let obj = {
                     where: {
                         id_: currentLocation