From 86dec97f86c00d636d3ea3d0454574c9a29fc40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 16:20:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 1 - src/views/inout/DialogNewReviewOrder.vue | 1 - src/views/inout/DialogSelectInvProduct.vue | 1 - 3 files changed, 3 deletions(-) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index c071ee84..b5828d1c 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -817,7 +817,6 @@ export default { }, submit(val) { - debugger let tQuery = Object.assign( JSON.parse(JSON.stringify(this.orderFormData)) ); diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue index a4f2be6c..6687dadb 100644 --- a/src/views/inout/DialogNewReviewOrder.vue +++ b/src/views/inout/DialogNewReviewOrder.vue @@ -290,7 +290,6 @@ export default { addCode() { - debugger if (this.$isBlank(this.udiCode)) { this.$message.error("UDI码不能为空！"); } diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue index 278c7254..9fda97ee 100644 --- a/src/views/inout/DialogSelectInvProduct.vue +++ b/src/views/inout/DialogSelectInvProduct.vue @@ -164,7 +164,6 @@ export default { }, getList() { - debugger this.loading = true; //寄售 if(this.invQueryData.advanceType==3){ From 851f943d1cce36c9d35f93519d713ea063990d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 16:21:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/print/pdfTmpleateManage.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue index 7e581e0c..0c8e75b0 100644 --- a/src/views/system/print/pdfTmpleateManage.vue +++ b/src/views/system/print/pdfTmpleateManage.vue @@ -106,7 +106,8 @@ - + + From 5e36d5ecd3b74a8a22544ec149a7bc188148e7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 16:30:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BB=93=E5=BA=93=E5=85=B3=E9=97=AD=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/thirdSys/inv/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index 9cb413eb..4bbaccbf 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -453,8 +453,6 @@ export default { // 更改值 this.formVisible = false; this.subFormVisible = false; - let Item = JSON.parse(localStorage.getItem('obj')) - this.subData=Item; this.getSubList(); return true; }, From b6220c816e3f94c4863345447613938e50bd9690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 4 May 2023 15:47:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E5=92=8C=E5=B8=A6=E7=A5=A8=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/supInoutSearchOrder.vue | 3 ++- src/views/purchase/company/supCompanyEditDialog.vue | 1 + src/views/system/param/busTypeChange.vue | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index ed979144..1f77d702 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -191,6 +191,7 @@ export default { limit: 10, startAduditTime: null, endAduditTime: null, + actionType: "norDetail", }; this.actDateRange=[] this.getList(); @@ -215,7 +216,7 @@ export default { }, getList() { this.loading = true; - this.filterQuery.actionType = this.actionType; + // this.filterQuery.actionType = this.actionType; getResultOrderList(this.filterQuery) .then((response) => { if (response.code === 20000) { diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue index 0e109212..d83bcf8d 100644 --- a/src/views/purchase/company/supCompanyEditDialog.vue +++ b/src/views/purchase/company/supCompanyEditDialog.vue @@ -517,6 +517,7 @@ export default { this.inputQuery.mobile=row.mobile this.inputQuery.detailAddr=row.addr this.customerId=this.inputQuery.customerId; + this.getCompanyCertList(); }, cancelDialog() { diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue index 929bf156..95c618e2 100644 --- a/src/views/system/param/busTypeChange.vue +++ b/src/views/system/param/busTypeChange.vue @@ -153,7 +153,8 @@ export default { 1: "耗材领用", 2: "产品申购", 3: "采购计划", - 4: "盘点转单" + 4: "盘点转单", + 5: "采购订单" }, orderStatus: { 1: "草稿", From 0a5b0411d6dbd6ec3545446e60cff935ad3c69e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 4 May 2023 16:55:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BC=9A=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogThrReviewOrder.vue | 16 ++++++++-------- src/views/system/dept/invWarehouse.vue | 5 ----- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index 49c17d12..ecd47196 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -108,14 +108,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 8e91105b..5b829084 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -559,7 +559,6 @@ export default { if (formName === "edit") { this.subData = JSON.parse(JSON.stringify(data)); this.subData.advanceType = this.subData.advanceType.toString(); - this.query.advanceType=1; if (this.subData.parentCode != null && this.subData.parentCode != "") { this.isAdvanceTypeShow = true; this.isShow = false; @@ -578,9 +577,6 @@ export default { this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code}; } } - //转换 - let advanceTypese = this.subData.advanceType - this.subFormVisible = true; this.getSubThrsysDetailData(); @@ -630,7 +626,6 @@ export default { } }, forInvSubmit() { // 新增，编辑---提交 - this.subData.advanceType=1; this.$refs["dataForm"].validate(valid => { if (valid) { saveSubWarehouse(this.subData, this.formName).then((response) => {