From ebe748ee58b029740f179bfd7335cbce916168c0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 19 Oct 2023 15:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- .../basic/product/UdiInfoSelectLocalUdi.vue | 7 +- .../basic/product/UdiinfoSelectVersion.vue | 2 + src/views/inventory/supInoutSearchOrder.vue | 210 +++++++++++------- src/views/system/ration/InvRationSet.vue | 10 +- 5 files changed, 149 insertions(+), 84 deletions(-) diff --git a/.env.production b/.env.production index de1ab952..118755df 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ ENV = 'production' #林纪裕cd # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' @@ -30,7 +30,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/' # 平潭正式 -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器. diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue index c1239c22..1b6e0991 100644 --- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue @@ -394,6 +394,7 @@ export default { erpName: "", thirdName: null, keys: [], + devKeys: [], }, checked: true, udidlList: [], @@ -540,7 +541,7 @@ export default { }, checkCombine() { - if(isBlank(this.relId)) { + if (isBlank(this.relId)) { this.checkedUdi(); } else { this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", { @@ -561,10 +562,11 @@ export default { if (this.relId != null) { this.combineQuery.relId = this.relId; this.combineQuery.keys.push(this.currentRow.uuid); + this.combineQuery.devKeys.push(this.currentRow.deviceRecordKey); if (this.currentRow.check) { selected = this.currentRow; } - } else{ + } else { this.$message.warning('请选入产品!'); return; } @@ -576,6 +578,7 @@ export default { selected = obj; } this.combineQuery.keys.push(obj.uuid); + this.combineQuery.devKeys.push(obj.deviceRecordKey); }); } if (selected != null) { diff --git a/src/views/basic/product/UdiinfoSelectVersion.vue b/src/views/basic/product/UdiinfoSelectVersion.vue index aea98e34..405ca713 100644 --- a/src/views/basic/product/UdiinfoSelectVersion.vue +++ b/src/views/basic/product/UdiinfoSelectVersion.vue @@ -133,6 +133,7 @@ export default { erpName: "", thirdName: null, keys: [], + devKeys:[], }, checked: true, @@ -205,6 +206,7 @@ export default { if (this.relId != null) { this.combineQuery.relId = this.relId; this.combineQuery.keys.push(row.uuid); + this.combineQuery.devKeys.push(row.deviceRecordKey); } else return; this.combineLoading = true; diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index 2f1a1b7e..5fd61c0d 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -108,16 +108,18 @@
显示/隐藏搜索栏 - 选入打印 - 查询结果打印 重置 查询 + 选中打印 + 查询结果打印 +
- + - + @@ -135,6 +137,14 @@ + + + { @@ -317,81 +345,107 @@ export default { }); }, optinPrint() { - if (this.orderSelection == null || this.orderSelection.length <= 0) { - return this.$message.error("请选择打印的明细！"); - } - let query = {id: 4}; - verifyTemplateFile(query).then((res) => { - if (res.code === 20000) { - let printParams = { - templateId: res.data, - list: this.orderSelection - }; - printOrder(printParams).then((response) => { - //将pdf文件转换为url。 - const binaryData = []; - binaryData.push(response); - //获取blob链接。 - let url = window.URL.createObjectURL( - new Blob(binaryData, {type: "application/pdf"}) - ); - this.loading = false; - window.open(url);//打开新标签页，预览pdf。 - }) - }else{ - return this.$message.error(res.message); - } - }).catch((error) => { - this.loading = false; - this.$message.error(error.message); + this.$confirm("是否确定打印选中出入库明细, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", }) + .then(() => { + if (this.orderSelection == null || this.orderSelection.length <= 0) { + return this.$message.error("请选择打印的明细！"); + } + let query = {id: 4}; + verifyTemplateFile(query).then((res) => { + if (res.code === 20000) { + let printParams = { + templateId: res.data, + list: this.orderSelection + }; + printOrder(printParams).then((response) => { + //将pdf文件转换为url。 + const binaryData = []; + binaryData.push(response); + //获取blob链接。 + let url = window.URL.createObjectURL( + new Blob(binaryData, {type: "application/pdf"}) + ); + this.loading = false; + window.open(url);//打开新标签页，预览pdf。 + }) + } else { + return this.$message.error(res.message); + } + }).catch((error) => { + this.loading = false; + this.$message.error(error.message); + }) + }) + .catch(() => { + }); + }, - selectPrint(){ - let query = {id: 4}; - verifyTemplateFile(query).then((res) => { - if (res.code === 20000) { - let printParams = { - templateId: res.data, - orderIdFk: this.filterQuery.orderIdFk, - nameCode: this.filterQuery.nameCode, - coName: this.filterQuery.coName, - spec: this.filterQuery.spec, - batchNo: this.filterQuery.batchNo, - zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh, - manufacturer: this.filterQuery.manufacturer, - actionType: this.filterQuery.actionType, - keyWords: this.filterQuery.keyWords, - mainAction: this.filterQuery.mainAction, - action:this.filterQuery.action + selectPrint() { - }; - if (this.actDateRange !== null) { - printParams.startAduditTime = this.actDateRange[0]; - printParams.endAduditTime = this.actDateRange[1]; - } else { - printParams.startAduditTime = null; - printParams.endAduditTime = null; - } - printOrder(printParams).then((response) => { - //将pdf文件转换为url。 - const binaryData = []; - binaryData.push(response); - //获取blob链接。 - let url = window.URL.createObjectURL( - new Blob(binaryData, {type: "application/pdf"}) - ); + + this.$confirm("是否确定打印所有查询结果数据", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + + let query = {id: 4}; + verifyTemplateFile(query).then((res) => { + if (res.code === 20000) { + let printParams = { + templateId: res.data, + orderIdFk: this.filterQuery.orderIdFk, + nameCode: this.filterQuery.nameCode, + coName: this.filterQuery.coName, + spec: this.filterQuery.spec, + batchNo: this.filterQuery.batchNo, + zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh, + manufacturer: this.filterQuery.manufacturer, + actionType: this.filterQuery.actionType, + keyWords: this.filterQuery.keyWords, + mainAction: this.filterQuery.mainAction, + action: this.filterQuery.action + + }; + if (this.actDateRange !== null) { + printParams.startAduditTime = this.actDateRange[0]; + printParams.endAduditTime = this.actDateRange[1]; + } else { + printParams.startAduditTime = null; + printParams.endAduditTime = null; + } + printOrder(printParams).then((response) => { + //将pdf文件转换为url。 + const binaryData = []; + binaryData.push(response); + //获取blob链接。 + let url = window.URL.createObjectURL( + new Blob(binaryData, {type: "application/pdf"}) + ); + this.loading = false; + window.open(url);//打开新标签页，预览pdf。 + }) + } else { + this.$message.error(res.message); + return + } + }).catch((error) => { this.loading = false; - window.open(url);//打开新标签页，预览pdf。 + this.$message.error(error.message); }) - }else{ - this.$message.error(res.message); - return - } - }).catch((error) => { - this.loading = false; - this.$message.error(error.message); - }) + + }) + .catch(() => { + }); + return; + + } } , diff --git a/src/views/system/ration/InvRationSet.vue b/src/views/system/ration/InvRationSet.vue index ec2f3ed1..ddc2e172 100644 --- a/src/views/system/ration/InvRationSet.vue +++ b/src/views/system/ration/InvRationSet.vue @@ -106,10 +106,14 @@ 查询 - 添加产品 + 添加产品 - 生成单据 + 生成单据 @@ -154,6 +158,7 @@