修复样品接收时，清空第二个位置时 ，误操作联动第一个位置也清空的问题

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

@@ -725,7 +725,8 @@ export default {
             pageCount: 1,
             item: '',
             flag: true,
-            UnitFlag : true
+            UnitFlag : true,
+            lylocation:''
         }
     },
     methods: {
@@ -768,16 +769,19 @@ export default {
         /** 页面触发是否留样按钮执行判断事件 */
         ifLiuYangChange(index,LYIndex) {
             let item = this.listData[index]
+            console.log(index,LYIndex)
             let ifLYArgs = ['shi_fou_liu_yang_yi','shi_fou_liu_yang_er','shi_fou_liu_yang_san','shi_fou_liu_yang_si']
             let LYShuLiangArgs = ['liu_yang_shu_lian_yi','liu_yang_shu_lian_er','liu_yang_shu_lian_san','liu_yang_shu_lian_si']
+            let LYlocationArgs = ['liu_yang_wei_zhi_yi','liu_yang_wei_zhi_er','liu_yang_wei_zhi_san','liu_yang_wei_zhi_si']
             let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionFour']
             if (item[ifLYArgs[LYIndex]] == '否') {
                 item[LYShuLiangArgs[LYIndex]] = null
-                this.$refs[positionArgs[LYIndex]][0].clearPosition()
+                item[LYlocationArgs[LYIndex]] = null
+                // this.$refs[positionArgs[LYIndex]][0].clearPosition()
                 this.commonJudgeLiuYangState(item)
             } else {
                 item[LYShuLiangArgs[LYIndex]] = ' ml/支×1支'
-                // todo 把位置填写并显示？
+                item[LYlocationArgs[LYIndex]] = this.lylocation
             }
         },
         /** 判断该样品是否四种类型都 不留样，则置空 留样日期、留样期限 */

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

@@ -718,7 +718,8 @@ export default {
             pageCount: '',
             item: '',
             flag: true,
-            UnitFlag : true
+            UnitFlag : true,
+            lylocation:''
 
         }
     },
@@ -758,16 +759,19 @@ export default {
         /** 页面触发是否留样按钮执行判断事件 */
         ifLiuYangChange(index,LYIndex) {
             let item = this.listData[index]
+            console.log(index,LYIndex)
             let ifLYArgs = ['shi_fou_liu_yang_yi','shi_fou_liu_yang_er','shi_fou_liu_yang_san','shi_fou_liu_yang_si']
             let LYShuLiangArgs = ['liu_yang_shu_lian_yi','liu_yang_shu_lian_er','liu_yang_shu_lian_san','liu_yang_shu_lian_si']
+            let LYlocationArgs = ['liu_yang_wei_zhi_yi','liu_yang_wei_zhi_er','liu_yang_wei_zhi_san','liu_yang_wei_zhi_si']
             let positionArgs = ['LyPositionOne','LyPositionTwo','LyPositionThree','LyPositionFour']
             if (item[ifLYArgs[LYIndex]] == '否') {
                 item[LYShuLiangArgs[LYIndex]] = null
-                this.$refs[positionArgs[LYIndex]][0].clearPosition()
+                item[LYlocationArgs[LYIndex]] = null
+                // this.$refs[positionArgs[LYIndex]][0].clearPosition()
                 this.commonJudgeLiuYangState(item)
             } else {
                 item[LYShuLiangArgs[LYIndex]] = ' ml/支×1支'
-                // todo 把位置填写并显示？
+                item[LYlocationArgs[LYIndex]] = this.lylocation
             }
         },
         /** 判断该样品是否四种类型都 不留样，则置空 留样日期、留样期限 */

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

@@ -51,6 +51,7 @@ export default {
         },
         /* 获取数据 ，开始查阅记录 */
         loadData(obj) {
+            let that = this
             let sql = `select ypb.*,sqb.chu_ju_bao_gao_ya from t_lhypb ypb join t_lhwtsqb sqb on ypb.parent_id_ = sqb.id_  and find_in_set(ypb.id_,'${obj}') and ypb.jie_yang_zhuang_t = '待接收' and ypb.shi_fou_guo_shen_ = '1'`
             let liuYangSQL = `select liu_yang_qi_xian_ from t_lyqxpzb limit 1`
             let cfIDSQL = `select cun_fang_id_,liu_yang_id_ FROM t_ypwzmrxzb`
@@ -59,6 +60,7 @@ export default {
                 let option = res[1].variables.data[0].liu_yang_qi_xian_
                 let cfID = res[2].variables.data[0].cun_fang_id_
                 let lyID = res[2].variables.data[0].liu_yang_id_
+                that.lylocation = lyID
                 let rq = options[option]
                 if (temp) {
                     temp.forEach(item => {
@@ -547,7 +549,7 @@ export default {
                                                c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
                                     // fix样品类型不按顺序进行填写
-                                    if(yblx === null || yblx === undefined|| yblx === ''){
+                                    if(!yblx){
                                         console.log('current',c)
                                         continue
                                     }
@@ -592,29 +594,29 @@ export default {
                                             yang_ben_bian_hao: item.yang_pin_bian_hao,
                                             pi_hao_bian_hao_: item.song_jian_pi_hao_,
                                             song_jian_dan_wei: item.song_jian_dan_wei,
-                                            xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                            xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                            nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                            xing_ming_: ypInfoList[index].xing_ming_ || '',
+                                            xing_bie_: ypInfoList[index].xing_bie_ || '',
+                                            nian_ling_: ypInfoList[index].nian_ling_ || '',
                                             yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                             shou_yang_ri_qi_: currentTime,
-                                            bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                            bei_zhu_: ypInfoList[index].bei_zhu_1_  || '',
                                             yang_ben_lei_xing: yblx,
                                             yun_shu_tiao_jian: ystj,
                                             yang_pin_shu_lian: ypsl,
                                             yang_ben_gui_ge_s: ybgg,
                                             yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                            cun_fang_wei_zhi_: sywz ? sywz : '',
+                                            cun_fang_wei_zhi_: sywz || '',
                                             liu_zhuan_zhuang_: '待任务分配',
                                             shi_fou_liu_yang_: ifLy,
                                             liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
                                             liu_yang_cun_fang: ifLy == '是'?(lycf ? lycf : ''):'',
                                             liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
                                             liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ || '',
+                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
+                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
                                             biao_zhi_uuid_: currentUUID,
-                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
                                             jian_ce_xiang_mu_: xiangMuZh,
                                             shou_yang_ren_:this.$store.getters.userInfo.user.name,
                                             wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
@@ -648,8 +650,6 @@ export default {
                                 lhwtbID.push('{"id_":"' + item.wtID + '"}')
 
                             })
-
-
                             /* 4、任务分配 
                                 4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
                                 4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
@@ -751,7 +751,7 @@ export default {
                                                        c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                        c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
                                             // fix样品类型不按顺序进行填写
-                                            if(yblx === null || yblx === undefined || yblx === ''){
+                                            if(!yblx){
                                                 console.log('current',c)
                                                 continue
                                             }
@@ -796,29 +796,29 @@ export default {
                                                     yang_ben_bian_hao: item.yang_pin_bian_hao,
                                                     pi_hao_bian_hao_: item.song_jian_pi_hao_,
                                                     song_jian_dan_wei: item.song_jian_dan_wei,
-                                                    xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                                    xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                                    nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                                    xing_ming_: ypInfoList[index].xing_ming_ || '',
+                                                    xing_bie_: ypInfoList[index].xing_bie_ || '',
+                                                    nian_ling_: ypInfoList[index].nian_ling_ || '',
                                                     yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                     shou_yang_ri_qi_: currentTime,
-                                                    bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                                    bei_zhu_: ypInfoList[index].bei_zhu_1_  || '',
                                                     yang_ben_lei_xing: yblx,
                                                     yun_shu_tiao_jian: ystj,
                                                     yang_pin_shu_lian: ypsl,
                                                     yang_ben_gui_ge_s: ybgg,
                                                     yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                                    cun_fang_wei_zhi_: sywz ? sywz : '',
+                                                    cun_fang_wei_zhi_: sywz || '',
                                                     liu_zhuan_zhuang_: '待任务分配',
                                                     shi_fou_liu_yang_: ifLy,
                                                     liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
                                                     liu_yang_cun_fang: ifLy == '是'?(lycf ? lycf : ''):'',
                                                     liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
                                                     liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                                    xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                                    fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                                    fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                                    xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ || '',
+                                                    fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
+                                                    fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
                                                     biao_zhi_uuid_: currentUUID,
-                                                    song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                    song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
                                                     jian_ce_xiang_mu_: xiangMuZh,
                                                     shou_yang_ren_:this.$store.getters.userInfo.user.name,
                                                     wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
@@ -862,7 +862,6 @@ export default {
     
                                         优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
                                     */
-    
                                     // console.log("4、任务分配",rws) 2023/12/11 Mr王 去掉 ,"defKey":"Process_04o0csc","formKey":"lhrwfp"
                                     repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + '}').then(res=>{
                                         // console.log('4、更改委托表的 委托状态',lhwtbID)

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

@@ -27,6 +27,7 @@ export default {
         },
         /* 获取数据 ，开始查阅记录 */
         loadData(id) {
+            let that = this
             let flag = true // 重复扫码标志位
             for (let index in this.listData) { // 判断是否重复，重复扫码 数量自增
                 if (this.listData[index].yang_pin_bian_hao == id) {
@@ -69,6 +70,7 @@ export default {
                     let option = res[1].variables.data[0].liu_yang_qi_xian_
                     let cfID = res[2].variables.data[0].cun_fang_id_
                     let lyID = res[2].variables.data[0].liu_yang_id_
+                    that.lylocation = lyID
                     let rq = options[option]
                     if (temp) {
                         temp.forEach(item => {
@@ -489,7 +491,8 @@ export default {
                                                c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
                                     // fix样品类型不按顺序进行填写
-                                    if(yblx === null || yblx === undefined || yblx === ''){
+                                    if(!yblx){
+                                        console.log('current',c)
                                         continue
                                     }
                                     let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
@@ -533,29 +536,29 @@ export default {
                                             yang_ben_bian_hao: item.yang_pin_bian_hao,
                                             pi_hao_bian_hao_: item.song_jian_pi_hao_,
                                             song_jian_dan_wei: item.song_jian_dan_wei,
-                                            xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                            xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                            nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                            xing_ming_: ypInfoList[index].xing_ming_ || '',
+                                            xing_bie_: ypInfoList[index].xing_bie_ || '',
+                                            nian_ling_: ypInfoList[index].nian_ling_ || '',
                                             yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                             shou_yang_ri_qi_: currentTime,
-                                            bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                            bei_zhu_: ypInfoList[index].bei_zhu_1_  || '',
                                             yang_ben_lei_xing: yblx,
                                             yun_shu_tiao_jian: ystj,
                                             yang_pin_shu_lian: ypsl,
                                             yang_ben_gui_ge_s: ybgg,
                                             yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                            cun_fang_wei_zhi_: sywz ? sywz : '',
+                                            cun_fang_wei_zhi_: sywz || '',
                                             liu_zhuan_zhuang_: '待任务分配',
                                             shi_fou_liu_yang_: ifLy,
                                             liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
                                             liu_yang_cun_fang: ifLy == '是'?(lycf ? lycf : ''):'',
                                             liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
                                             liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ || '',
+                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
+                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
                                             biao_zhi_uuid_: currentUUID,
-                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
                                             jian_ce_xiang_mu_: xiangMuZh,
                                             shou_yang_ren_:this.$store.getters.userInfo.user.name,
                                             wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
@@ -589,8 +592,6 @@ export default {
                                 lhwtbID.push('{"id_":"' + item.wtID + '"}')
 
                             })
-
-
                             /* 4、任务分配 
                                 4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
                                 4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
@@ -692,7 +693,8 @@ export default {
                                                        c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                        c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
                                             // fix样品类型不按顺序进行填写
-                                            if(yblx === null || yblx === undefined || yblx === ''){
+                                            if(!yblx){
+                                                console.log('current',c)
                                                 continue
                                             }
                                             let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
@@ -736,29 +738,29 @@ export default {
                                                     yang_ben_bian_hao: item.yang_pin_bian_hao,
                                                     pi_hao_bian_hao_: item.song_jian_pi_hao_,
                                                     song_jian_dan_wei: item.song_jian_dan_wei,
-                                                    xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                                    xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                                    nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                                    xing_ming_: ypInfoList[index].xing_ming_ || '',
+                                                    xing_bie_: ypInfoList[index].xing_bie_ || '',
+                                                    nian_ling_: ypInfoList[index].nian_ling_ || '',
                                                     yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                     shou_yang_ri_qi_: currentTime,
-                                                    bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                                    bei_zhu_: ypInfoList[index].bei_zhu_1_  || '',
                                                     yang_ben_lei_xing: yblx,
                                                     yun_shu_tiao_jian: ystj,
                                                     yang_pin_shu_lian: ypsl,
                                                     yang_ben_gui_ge_s: ybgg,
                                                     yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                                    cun_fang_wei_zhi_: sywz ? sywz : '',
+                                                    cun_fang_wei_zhi_: sywz || '',
                                                     liu_zhuan_zhuang_: '待任务分配',
                                                     shi_fou_liu_yang_: ifLy,
                                                     liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
                                                     liu_yang_cun_fang: ifLy == '是'?(lycf ? lycf : ''):'',
                                                     liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
                                                     liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                                    xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                                    fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                                    fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                                    xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ || '',
+                                                    fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
+                                                    fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
                                                     biao_zhi_uuid_: currentUUID,
-                                                    song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                    song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
                                                     jian_ce_xiang_mu_: xiangMuZh,
                                                     shou_yang_ren_:this.$store.getters.userInfo.user.name,
                                                     wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
@@ -802,7 +804,6 @@ export default {
     
                                         优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
                                     */
-    
                                     // console.log("4、任务分配",rws) 2023/12/11 Mr王 去掉 ,"defKey":"Process_04o0csc","formKey":"lhrwfp"
                                     repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + '}').then(res=>{
                                         // console.log('4、更改委托表的 委托状态',lhwtbID)