Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/crm/tongji.vue

@@ -196,6 +196,12 @@
       //初始化
       this.Date()
     },
+    beforeDestroy() {
+      if(screenfull.isFullscreen){
+        screenfull.toggle()
+      }
+      // clearInterval(this.timer);
+    },
     methods: {
       allView() {
         // 默认显示全屏

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

@@ -434,9 +434,9 @@ export default {
                                     lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
                                     ypggList.push(ypInfoList[index].yang_pin_gui_ge_, ypInfoList[index].yang_pin_gui_ge_e, ypInfoList[index].yang_pin_gui_ge_s, ypInfoList[index].yang_pin_gui_si_)
                                     liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
-                                    let yplxz = lxList.filter(i => i).join(';')
-                                    let ypggStr = ypggList.filter(i => i).join(';')
-                                    let liuyangStr = liuYangList.filter(i => i).join(';')
+                                    let yplxz = lxList.filter(i => i).join('；')
+                                    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

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

@@ -388,9 +388,9 @@ export default {
                                     lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
                                     ypggList.push(ypInfoList[index].yang_pin_gui_ge_, ypInfoList[index].yang_pin_gui_ge_e, ypInfoList[index].yang_pin_gui_ge_s, ypInfoList[index].yang_pin_gui_si_)
                                     liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
-                                    let yplxz = lxList.filter(i => i).join(';')
-                                    let ypggStr = ypggList.filter(i => i).join(';')
-                                    let liuyangStr = liuYangList.filter(i => i).join(';')
+                                    let yplxz = lxList.filter(i => i).join('；')
+                                    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