From d5c4b9b3768f4dd425749625b00b9d82b4b6edd9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 31 May 2023 10:02:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/orderDetailBiz.js | 9 ++++ src/views/inout/InvoiceCkeck.vue | 79 +++++++++++++++++++++++--------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index b237b36..bf93635 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -100,6 +100,15 @@ export function filterBizOrderList(params) { }); } +export function parseInvoice(params) { + return axios({ + url: "/udiwms/inout/biz/parseInvoice", + method: "get", + params: params + }); +} + + diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index c35fd0f..3b1696f 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -13,22 +13,25 @@ :model="inputQuery" :rules="formRules" ref="dataForm" - label-width="110px" + label-width="150px" style="padding-top: 40px" > - - - - - - - - - - - - + + + + + + + @@ -205,6 +208,12 @@ width="100" > + + { if (response.code === 20000) { @@ -515,6 +533,25 @@ export default { }); }, + getInputFocus(event) { + event.currentTarget.select(); + }, + + enterKey(){ + let param={ + code :this.inputQuery.code + } + parseInvoice(param) + .then((res)=>{ + if(res.code == 20000){ + this.inputQuery=res.data; + } + }) + + + }, + + uploadHandleError() {}, uploadHandleSuccess(response, file, fileList) { debugger; From 8f3887bc618b3305567f71c9aa885b803d5f19f4 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 1 Jun 2023 14:32:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogThrReviewOrder.vue | 16 ++++++++-------- src/views/inventory/addInvRemindSetDialog.vue | 7 +++++++ .../purchase/purOrder/purOrderDetailDialog.vue | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index 49c17d1..98e7563 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -108,14 +108,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue index 45a924c..0d059db 100644 --- a/src/views/inventory/addInvRemindSetDialog.vue +++ b/src/views/inventory/addInvRemindSetDialog.vue @@ -166,6 +166,13 @@ export default { getInfoByInvId({invId: this.invId}).then((res) => { if (res.code === 20000) { this.formData = res.data; + if(res.data.lowStock==null || res.data.lackStock==null || res.data.overStock==null || res.data.expireDate==null || res.data.recentDate==null){ + this.formData.lowStock=false; + this.formData.lackStock=false; + this.formData.overStock=false; + this.formData.expireDate=false; + this.formData.recentDate=false; + } } else { this.$message.error(res.meesage); } diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue index 7f74f3b..7c73318 100644 --- a/src/views/purchase/purOrder/purOrderDetailDialog.vue +++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue @@ -103,7 +103,7 @@ - 是否生成采购入库单 + 是否生成采购入库单 @@ -279,7 +279,6 @@ export default { this.loading = false }) }, - saveOrder(status) { let tip = '' if (status == '1') { @@ -502,7 +501,8 @@ export default { this.formData.targetInv = 1000 this.orderEditor = true this.sValue = this.formData.corpName - this.formData.autoPurchase = true; + this.formData.autoPurchase = true + console.log(this.formData) this.getStockOrderDetailList() } else { this.formData = { From 23229dd8e26d1ab1d31d94fa7f538920a3b2d385 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 1 Jun 2023 14:55:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E9=83=A8=E9=97=A8=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=9C=AA=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/purOrder/purOrderSearch.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue index 5804062..e115b72 100644 --- a/src/views/purchase/purOrder/purOrderSearch.vue +++ b/src/views/purchase/purOrder/purOrderSearch.vue @@ -23,8 +23,9 @@ { + // console.log("res1", res); + this.invList = res.data || []; + }); + + }, + + // 帮助按钮点击事件 help() { this.certFileUrl = From 6eeab330652f89d8210d696fc9c09294083bd7c3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 1 Jun 2023 15:30:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E5=A4=9A=E9=80=89=E6=A1=86=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/purOrder/purOrderDetailDialog.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue index 7c73318..1fc5a1f 100644 --- a/src/views/purchase/purOrder/purOrderDetailDialog.vue +++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue @@ -103,7 +103,7 @@ - 是否生成采购入库单 + 是否生成采购入库单 @@ -196,6 +196,7 @@ export default { }, data() { return { + autoPurchase: true, code: '', query: { orderIdFk: '', @@ -501,8 +502,8 @@ export default { this.formData.targetInv = 1000 this.orderEditor = true this.sValue = this.formData.corpName - this.formData.autoPurchase = true - console.log(this.formData) + // this.formData.autoPurchase = true + this.$set(this.formData, 'autoPurchase', true) this.getStockOrderDetailList() } else { this.formData = { From 262c1c5cc41c961a29128e1d40ddf15d85923a75 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 1 Jun 2023 18:02:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogSelectPurOrder.vue | 28 ++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/views/inout/DialogSelectPurOrder.vue b/src/views/inout/DialogSelectPurOrder.vue index ea1199e..0d6e2b1 100644 --- a/src/views/inout/DialogSelectPurOrder.vue +++ b/src/views/inout/DialogSelectPurOrder.vue @@ -10,12 +10,13 @@ - + + :value="item.code" + > {{ item.name }} @@ -23,16 +24,16 @@ - + + :value="item.code"> {{ item.name }} + @@ -337,7 +338,16 @@ export default { this.pickerUpOptions = []; this.getList(); }, + change(val){ + let param={ + pcode:val + } + getInvListByUser(param).then((res) => { + this.invList = res.data || []; + this.getBusType(); + }) + }, onSubmitFind() { this.filterQuery.page = 1; this.getList();