修复样品类型跳号执行逻辑

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

@@ -534,18 +534,23 @@ export default {
                                 let ypggStr = ypggList.filter(i => i).join('；')
                                 let liuyangStr = liuYangList.filter(i => i).join('；')
                                 // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                let size = lxList.filter(i => i).join(',').match(/,/g)
-                                let count = 1
-                                size == null ? count = 1 : count = size.length + 1
+                                // let size = lxList.filter(i => i).join(',').match(/,/g)
+                                // let count = 1
+                                // size == null ? count = 1 : count = size.length + 1
                                 let xmmc = []
                                 xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                 let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
-                                for (let c = 0; c < count; c++) {
+                                for (let c = 0; c < 4; c++) {
 
                                     let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
                                                c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
                                                c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                    // fix样品类型不按顺序进行填写
+                                    if(yblx === null || yblx === undefined|| yblx === ''){
+                                        console.log('current',c)
+                                        continue
+                                    }
                                     let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
                                                c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
                                                c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
@@ -598,11 +603,11 @@ export default {
                                             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,
+                                            cun_fang_wei_zhi_: sywz ? 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:'',
+                                            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_,
@@ -734,17 +739,22 @@ export default {
                                         let ypggStr = ypggList.filter(i => i).join('；')
                                         let liuyangStr = liuYangList.filter(i => i).join('；')
                                         // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                        let size = lxList.filter(i => i).join(',').match(/,/g)
-                                        let count = 1
-                                        size == null ? count = 1 : count = size.length + 1
+                                        // let size = lxList.filter(i => i).join(',').match(/,/g)
+                                        // let count = 1
+                                        // size == null ? count = 1 : count = size.length + 1
                                         let xmmc = []
                                         xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                         let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
-                                        for (let c = 0; c < count; c++) {
+                                        for (let c = 0; c < 4; c++) {
                                             let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
                                                        c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
                                                        c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                        c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                            // fix样品类型不按顺序进行填写
+                                            if(yblx === null || yblx === undefined || yblx === ''){
+                                                console.log('current',c)
+                                                continue
+                                            }
                                             let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
                                                        c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
                                                        c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
@@ -797,11 +807,11 @@ export default {
                                                     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,
+                                                    cun_fang_wei_zhi_: sywz ? 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:'',
+                                                    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_,

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

@@ -476,18 +476,22 @@ export default {
                                 let ypggStr = ypggList.filter(i => i).join('；')
                                 let liuyangStr = liuYangList.filter(i => i).join('；')
                                 // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                let size = lxList.filter(i => i).join(',').match(/,/g)
-                                let count = 1
-                                size == null ? count = 1 : count = size.length + 1
+                                // let size = lxList.filter(i => i).join(',').match(/,/g)
+                                // let count = 1
+                                // size == null ? count = 1 : count = size.length + 1
                                 let xmmc = []
                                 xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                 let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
-                                for (let c = 0; c < count; c++) {
+                                for (let c = 0; c < 4; c++) {
 
                                     let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
                                                c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
                                                c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                    // fix样品类型不按顺序进行填写
+                                    if(yblx === null || yblx === undefined || yblx === ''){
+                                        continue
+                                    }
                                     let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
                                                c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
                                                c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
@@ -540,11 +544,11 @@ export default {
                                             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,
+                                            cun_fang_wei_zhi_: sywz ? 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:'',
+                                            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_,
@@ -676,17 +680,21 @@ export default {
                                         let ypggStr = ypggList.filter(i => i).join('；')
                                         let liuyangStr = liuYangList.filter(i => i).join('；')
                                         // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                        let size = lxList.filter(i => i).join(',').match(/,/g)
-                                        let count = 1
-                                        size == null ? count = 1 : count = size.length + 1
+                                        // let size = lxList.filter(i => i).join(',').match(/,/g)
+                                        // let count = 1
+                                        // size == null ? count = 1 : count = size.length + 1
                                         let xmmc = []
                                         xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                         let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
-                                        for (let c = 0; c < count; c++) {
+                                        for (let c = 0; c < 4; c++) {
                                             let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
                                                        c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
                                                        c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
                                                        c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                            // fix样品类型不按顺序进行填写
+                                            if(yblx === null || yblx === undefined || yblx === ''){
+                                                continue
+                                            }
                                             let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
                                                        c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
                                                        c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
@@ -739,11 +747,11 @@ export default {
                                                     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,
+                                                    cun_fang_wei_zhi_: sywz ? 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:'',
+                                                    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_,