ソースを参照

fix sampleObj bug

ZZJ 2 年 前
コミット
ccc759665c

+ 34 - 34
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -535,40 +535,40 @@ export default {
                                                    c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
                                                    c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
                                         let obj = {
-                                            wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
-                                            wei_tuo_dan_wei_: item.wtdh,
-                                            lian_xi_ren_: item.wei_tuo_fang_lian,
-                                            lian_xi_dian_hua_: item.wei_tuo_lian,
-                                            yang_ben_ming_che: item.yang_pin_ming_che,
-                                            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_,
-                                            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_,
-                                            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,
-                                            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_shu_lian: lysl == null ?'':lysl,
-                                            liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            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,
-                                            jian_ce_xiang_mu_: xiangMuZh,
-                                            shou_yang_ren_:this.$store.getters.userInfo.user.name
-                                        }
+                                                wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
+                                                wei_tuo_dan_wei_: item.wtdh,
+                                                lian_xi_ren_: item.wei_tuo_fang_lian,
+                                                lian_xi_dian_hua_: item.wei_tuo_lian,
+                                                yang_ben_ming_che: item.yang_pin_ming_che,
+                                                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_,
+                                                yang_ben_zhuang_t: item.yang_pin_zhuang_t,
+                                                shou_yang_ri_qi_: currentTime,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                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,
+                                                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_shu_lian: 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,
+                                                biao_zhi_uuid_: currentUUID,
+                                                song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                jian_ce_xiang_mu_: xiangMuZh,
+                                                shou_yang_ren_:this.$store.getters.userInfo.user.name
+                                    }
                                         // console.log(obj)
                                         ypdjb.push(obj)
                                     }

+ 8 - 8
src/views/system/jbdScan/js/manualConfirmationJSSupplementary.js

@@ -542,12 +542,12 @@ 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_,
-                                            xing_bie_: ypInfoList[index].xing_bie_,
-                                            nian_ling_: ypInfoList[index].nian_ling_,
+                                            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_,
                                             yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                             shou_yang_ri_qi_: currentTime,
-                                            bei_zhu_: ypInfoList[index].bei_zhu_,
+                                            bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
                                             yang_ben_lei_xing: yblx,
                                             yun_shu_tiao_jian: ystj,
                                             yang_pin_shu_lian: ypsl,
@@ -560,11 +560,11 @@ export default {
                                             liu_yang_cun_fang: ifLy == '是'?lycf:'',
                                             liu_yang_shu_lian: lysl == null ?'':lysl,
                                             liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            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,
+                                            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,
                                             biao_zhi_uuid_: currentUUID,
-                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu,
+                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
                                             jian_ce_xiang_mu_: xiangMuZh,
                                             shou_yang_ren_:this.$store.getters.userInfo.user.name
                                         }

+ 9 - 9
src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -491,12 +491,12 @@ 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_,
-                                            xing_bie_: ypInfoList[index].xing_bie_,
-                                            nian_ling_: ypInfoList[index].nian_ling_,
+                                            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_,
                                             yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                             shou_yang_ri_qi_: currentTime,
-                                            bei_zhu_: ypInfoList[index].bei_zhu_,
+                                            bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
                                             yang_ben_lei_xing: yblx,
                                             yun_shu_tiao_jian: ystj,
                                             yang_pin_shu_lian: ypsl,
@@ -509,14 +509,14 @@ export default {
                                             liu_yang_cun_fang: ifLy == '是'?lycf:'',
                                             liu_yang_shu_lian: lysl == null ?'':lysl,
                                             liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                            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,
+                                            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,
                                             biao_zhi_uuid_: currentUUID,
-                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu,
+                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
                                             jian_ce_xiang_mu_: xiangMuZh,
                                             shou_yang_ren_:this.$store.getters.userInfo.user.name
-                                        }
+                                    }
                                         // console.log(obj)
                                         ypdjb.push(obj)
                                     }