Prechádzať zdrojové kódy

update no updateValueBug

ZZJ 3 rokov pred
rodič
commit
cf287e652c

+ 11 - 0
package-lock.json

@@ -57,6 +57,7 @@
         "normalize.css": "^8.0.1",
         "nprogress": "^0.2.0",
         "papaparse": "^5.3.0",
+        "pdfh5": "^1.4.2",
         "pinyin": "^2.11.1",
         "pinyin4js": "^1.3.18",
         "qrcodejs2": "0.0.2",
@@ -15522,6 +15523,11 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/pdfh5": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/pdfh5/-/pdfh5-1.4.2.tgz",
+      "integrity": "sha512-1BL8HIx/EEZowRPBgas7/WokbGEv1gxKNRmmHSimG113178mKxIBH4pxWBc0tj6d25Sy+EwnlQwv9cUUmQa42w=="
+    },
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -34749,6 +34755,11 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pdfh5": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/pdfh5/-/pdfh5-1.4.2.tgz",
+      "integrity": "sha512-1BL8HIx/EEZowRPBgas7/WokbGEv1gxKNRmmHSimG113178mKxIBH4pxWBc0tj6d25Sy+EwnlQwv9cUUmQa42w=="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",

+ 8 - 7
src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -329,7 +329,8 @@ export default {
                                 shu_liang_si_: ypInfoList[yp].shu_liang_si_,
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
-                                jie_yang_zhuang_t:"已接收"
+                                jie_yang_zhuang_t:"已接收",
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
                             }
                         }
                         sampleList.push(o)
@@ -430,8 +431,8 @@ export default {
                                     let lxList = []
                                     let ypggList = []
                                     let liuYangList = []
-                                    lxList.push(item.yang_pin_lei_xing, item.yang_pin_lei_er_, item.yang_pin_lei_san_, item.yang_pin_lei_si_)
-                                    ypggList.push(item.yang_pin_gui_ge_, item.yang_pin_gui_ge_e, item.yang_pin_gui_ge_s, item.yang_pin_gui_si_)
+                                    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(';')
@@ -445,10 +446,10 @@ export default {
                                         xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                         let xiangMuZh = xmmc.filter(i => i).join(',')
 
-                                        let yblx = c == 0 ? item.yang_pin_lei_xing : c == 1 ? item.yang_pin_lei_er_ : c == 2 ? item.yang_pin_lei_san_ : c == 3 ? item.yang_pin_lei_si_ : ''
-                                        let ystj = c == 0 ? item.yang_ben_yun_shu_ : c == 1 ? item.yang_pin_yun_shu_ : c == 2 ? item.yang_pin_yun_san : c == 3 ? item.yang_pin_yun_si_ : ''
-                                        let ypsl = c == 0 ? item.shu_liang_ : c == 1 ? item.shu_liang_er_ : c == 2 ? item.shu_liang_san_ : c == 3 ? item.shu_liang_si_ : ''
-                                        let ybgg = c == 0 ? item.yang_pin_gui_ge_ : c == 1 ? item.yang_pin_gui_ge_e : c == 2 ? item.yang_pin_gui_ge_s : c == 3 ? item.yang_pin_gui_si_ : ''
+                                        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_ : ''
+                                        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 : c == 3 ? ypInfoList[index].yang_pin_yun_si_ : ''
+                                        let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : c == 1 ? ypInfoList[index].shu_liang_er_ : c == 2 ? ypInfoList[index].shu_liang_san_ : c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                        let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
                                         let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
                                         let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
                                         let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''

+ 8 - 7
src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -282,7 +282,8 @@ export default {
                                 shu_liang_si_: ypInfoList[yp].shu_liang_si_,
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
-                                jie_yang_zhuang_t:"已接收"
+                                jie_yang_zhuang_t:"已接收",
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
                             }
                         }
                         sampleList.push(o)
@@ -384,8 +385,8 @@ export default {
                                     let lxList = []
                                     let ypggList = []
                                     let liuYangList = []
-                                    lxList.push(item.yang_pin_lei_xing, item.yang_pin_lei_er_, item.yang_pin_lei_san_, item.yang_pin_lei_si_)
-                                    ypggList.push(item.yang_pin_gui_ge_, item.yang_pin_gui_ge_e, item.yang_pin_gui_ge_s, item.yang_pin_gui_si_)
+                                    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(';')
@@ -399,10 +400,10 @@ export default {
                                         xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
                                         let xiangMuZh = xmmc.filter(i => i).join(',')
 
-                                        let yblx = c == 0 ? item.yang_pin_lei_xing : c == 1 ? item.yang_pin_lei_er_ : c == 2 ? item.yang_pin_lei_san_ : c == 3 ? item.yang_pin_lei_si_ : ''
-                                        let ystj = c == 0 ? item.yang_ben_yun_shu_ : c == 1 ? item.yang_pin_yun_shu_ : c == 2 ? item.yang_pin_yun_san : c == 3 ? item.yang_pin_yun_si_ : ''
-                                        let ypsl = c == 0 ? item.shu_liang_ : c == 1 ? item.shu_liang_er_ : c == 2 ? item.shu_liang_san_ : c == 3 ? item.shu_liang_si_ : ''
-                                        let ybgg = c == 0 ? item.yang_pin_gui_ge_ : c == 1 ? item.yang_pin_gui_ge_e : c == 2 ? item.yang_pin_gui_ge_s : c == 3 ? item.yang_pin_gui_si_ : ''
+                                        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_ : ''
+                                        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 : c == 3 ? ypInfoList[index].yang_pin_yun_si_ : ''
+                                        let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : c == 1 ? ypInfoList[index].shu_liang_er_ : c == 2 ? ypInfoList[index].shu_liang_san_ : c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                        let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
                                         let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
                                         let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
                                         let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''