From 64452be313bc17ce3844ad8d7def47c629bb9b06 Mon Sep 17 00:00:00 2001 From: xhj Date: Sun, 15 Dec 2024 09:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20npm=20=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 9 +-- src/utils/dict.js | 5 +- src/views/jhzxgl/components/SljhPrint.vue | 69 +++++++++++++++++++++-- src/views/jhzxgl/sljhD.vue | 8 ++- 4 files changed, 79 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index ba52069..987c3cd 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,12 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", - "pdfjs-dist": "2.0.943", + "pdfjs-dist": "^2.0.943", "pizzip": "^3.1.1", "pl-table": "^2.7.5", "print-js": "^1.6.0", "qrcode": "^1.5.3", + "qrcodejs2": "0.0.2", "regenerator-runtime": "^0.13.9", "screenfull": "4.2.0", "script-loader": "0.7.2", @@ -62,10 +63,10 @@ "vue-worker": "^1.2.1", "vuedraggable": "2.20.0", "vuex": "3.1.0", - "vxe-table": "^3.7.5", + "vxe-table": "^3.7.8", "vxe-table-plugin-export-xlsx": "^2.3.1", "vxe-table-plugin-renderer": "^3.3.0", - "xe-utils": "^3.5.14", + "xe-utils": "^3.5.18", "xlsx": "^0.14.1" }, "devDependencies": { @@ -78,7 +79,7 @@ "babel-eslint": "10.1.0", "babel-jest": "23.6.0", "babel-plugin-dynamic-import-node": "2.3.3", - "chalk": "2.4.2", + "chalk": "^2.4.2", "chokidar": "2.1.5", "connect": "3.6.6", "eslint": "6.7.2", diff --git a/src/utils/dict.js b/src/utils/dict.js index e7ecb65..9ab1e1a 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -30,13 +30,14 @@ { case 'dictFormat': const dict=window.localStorage.getItem(code); + console.log(dict) if (!dict){ return code; } let dictItems=JSON.parse(dict) for (const item of dictItems) { - if (item.itemCode===value){ - return item.itemValue + if (item.bm===value){ + return item.bmsm } } break; diff --git a/src/views/jhzxgl/components/SljhPrint.vue b/src/views/jhzxgl/components/SljhPrint.vue index a7d42ba..b6eedc1 100644 --- a/src/views/jhzxgl/components/SljhPrint.vue +++ b/src/views/jhzxgl/components/SljhPrint.vue @@ -5,15 +5,19 @@ /*border: 1px #000 solid;*/ text-align: center; font-size: 20px; "> +
-
-
+
+ +
上 料 计 划
-
+
打印单据:{{item.sllsh}}
制单日期:{{item.dyrq}}
@@ -75,7 +79,7 @@ @@ -189,6 +241,13 @@ export default { text-align: center; font-size: 20px; +} + +.ewm{ + position: absolute; + left: 10px; + top:-0px; + } diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue index 2efeb58..0baaf09 100644 --- a/src/views/jhzxgl/sljhD.vue +++ b/src/views/jhzxgl/sljhD.vue @@ -347,7 +347,7 @@
- +
@@ -1063,12 +1063,16 @@ export default { let selectRecords = this.$refs.xGrid.getCheckboxRecords() if(selectRecords.length>0){ slPrintD(selectRecords).then(res=>{ + this.sljhPrintData=res.data + + this.$refs.dy.gegn(); console.log(this.sljhPrintData) this.wgzyprintFlag=true setTimeout(() => { this.$print(this.$refs.print) this.wgzyprintFlag = false + this.initList() }, 50) }) @@ -1115,8 +1119,10 @@ export default { this.sljhPrintData=res.data console.log(this.sljhPrintData) this.wgzyprintFlag=true + this.$refs.dy.gegn(); setTimeout(() => { this.$print(this.$refs.print) + this.wgzyprintFlag = false this.initList() }, 50)