From 75bd71aa8da7633703e668b8bcf1269cf6caddc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Fri, 6 Sep 2024 10:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=89=A9=E6=96=99=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E2=80=9C=E6=98=93=E8=A2=AB=E7=9B=97/=E9=AB=98=E4=BB=B7?= =?UTF-8?q?=E5=80=BC=E7=89=A9=E5=93=81=E2=80=9D=E9=80=89=E9=A1=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/md/mditem/index.vue | 166 +++++++++++++++++-------- src/views/mes/md/workstation/index.vue | 4 +- 2 files changed, 114 insertions(+), 56 deletions(-) diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue index 3866b9c..f96c4a3 100644 --- a/src/views/mes/md/mditem/index.vue +++ b/src/views/mes/md/mditem/index.vue @@ -185,66 +185,88 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - + +
+ +
+ +
+ +
+ + + + + + + + + @@ -368,6 +390,7 @@ import {genCode} from "@/api/system/autocode/rule" import { getToken } from "@/utils/auth"; import { treeselect } from "@/api/mes/md/itemtype"; import Treeselect from "@riophae/vue-treeselect"; +import { getBarcodeUrl } from "@/api/mes/wm/barcode"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { @@ -427,6 +450,13 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData" }, + //二维码查询参数 + barcodeParams: { + bussinessId: null, + bussinessCode: null, + barcodeFormart: 'QR_CODE', //模式二维码 + barcodeType: 'ITEM' //类型 + }, // 查询参数 queryParams: { pageNum: 1, @@ -526,6 +556,7 @@ export default { itemOrProduct: undefined, enableFlag: 'Y', safeStockFlag: 'N', + barcodeUrl: null, minStock: 0, maxStock: 0, optType: undefined, @@ -560,6 +591,7 @@ export default { this.open = true; this.title = "查看物料/产品"; this.optType = "view"; + this.getBarcodeUrl(); }); }, /** 新增按钮操作 */ @@ -583,6 +615,7 @@ export default { this.open = true; this.optType = "edit"; this.title = "修改物料/产品"; + this.getBarcodeUrl(); }); }, /** 提交按钮 */ @@ -648,6 +681,16 @@ export default { submitFileForm() { this.$refs.upload.submit(); }, + //获取二维码地址 + getBarcodeUrl(){ + this.barcodeParams.bussinessId = this.form.itemId; + this.barcodeParams.bussinessCode = this.form.itemCode; + getBarcodeUrl(this.barcodeParams).then( response =>{ + if(response.data != null){ + this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM + } + }); + }, //自动生成物料编码 handleAutoGenChange(autoGenFlag){ debugger; @@ -661,4 +704,19 @@ export default { } } }; - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue index cac96f3..3490dda 100644 --- a/src/views/mes/md/workstation/index.vue +++ b/src/views/mes/md/workstation/index.vue @@ -373,7 +373,7 @@ export default { bussinessId: null, bussinessCode: null, barcodeFormart: 'QR_CODE', //模式二维码 - barcodeType: 'WORKSTATION' //类型为供应商 + barcodeType: 'WORKSTATION' //类型 }, // 表单参数 form: { @@ -639,7 +639,7 @@ export default { handleToolTypeAdd(){ this.$refs.toolList.handleAdd(); }, - //获取某个供应商的二维码地址 + //获取某个工作站的二维码地址 getBarcodeUrl(){ this.barcodeParams.bussinessId = this.form.workstationId; this.barcodeParams.bussinessCode = this.form.workstationCode;