From ad1d03df9261a3274b71cb76576584c5e3f46445 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 17:42:58 +0800 Subject: [PATCH 1/4] =?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/InvoiceRegistration.vue | 1 - src/views/inventory/InvSupPreProducts.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 8b6a791..3b9b1ce 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -690,7 +690,6 @@ export default { } this.filterQuery.page = 1; - this.filterQuery.supInoivceSearch=null; this.getList(); }, hideSearch() { diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue index dae6671..83f6298 100644 --- a/src/views/inventory/InvSupPreProducts.vue +++ b/src/views/inventory/InvSupPreProducts.vue @@ -266,7 +266,7 @@ export default { }, getInvList() { let query = { - advanceType: true, + advanceType: 2, }; getInvListByUser(query) .then((response) => { From 36dca1d91e59019c36d916a397bd07d53550ca17 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 20:58:14 +0800 Subject: [PATCH 2/4] =?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/basic/locUdi/UdiSupplement.vue | 2 +- src/views/inout/InvoiceRegistration.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue index 9d2fc44..86a57ee 100644 --- a/src/views/basic/locUdi/UdiSupplement.vue +++ b/src/views/basic/locUdi/UdiSupplement.vue @@ -331,7 +331,7 @@ export default { return !row.check; }, handleCurrentChange(val) { - this.unionQuery.page = val; + this.unionQuery.page = val.page; this.getList(); }, tableRowClassName({row, rowIndex}) { diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 3b9b1ce..61e2e77 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -737,7 +737,7 @@ export default { getBusType() { let query = { code: this.filterQuery.invCode, - enabled: true, + enable: true, vueType: "supInvoice", }; getLocalJoinByUser(query) From 9f2dfa497f5aef5e534055a657380773b075ae86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Apr 2023 22:51:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 8 + src/views/basic/business/stockOrderPrint.vue | 546 ++++++++++++++++++ src/views/inventory/inner/innerCodeDetail.vue | 7 +- src/views/inventory/inner/innerOrder.vue | 6 +- .../inventory/inner/innerOrderEditDialog.vue | 34 +- .../inner/innerOrderSelectProduct.vue | 6 +- 6 files changed, 597 insertions(+), 10 deletions(-) create mode 100644 src/views/basic/business/stockOrderPrint.vue diff --git a/src/api/inout/order.js b/src/api/inout/order.js index a32fa73..031b8d6 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -505,3 +505,11 @@ export function updateOrderDetailBiz(params) { }); } + +export function orderDetailAdd(params) { + return axios({ + url: "/inv/inner/order/orderDetailAdd", + method: "post", + data: params + }); +} diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue new file mode 100644 index 0000000..268cf10 --- /dev/null +++ b/src/views/basic/business/stockOrderPrint.vue @@ -0,0 +1,546 @@ + + + + + diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue index 166ac7c..51a311b 100644 --- a/src/views/inventory/inner/innerCodeDetail.vue +++ b/src/views/inventory/inner/innerCodeDetail.vue @@ -273,7 +273,7 @@ export default { getOrderQRCodeTextList() { this.loading = true; - filterPrint({sOrderId :this.query.orderIdFk}) //查找该单号下的所有条码 + filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码 .then((response) => { console.log(response) this.codeArray = response.data.list || []; @@ -378,7 +378,7 @@ export default { type: "warning", }).then(() => { this.loading = true; - generateInnerQRCodeText({orderIdFk: this.formData.id}) + generateInnerQRCodeText({orderIdFk: this.formData.recordKey}) .then(response => { this.loading = false; if (response.code === 20000) { @@ -427,8 +427,9 @@ export default { if (this.$isNotBlank(this.inQuery.id)) { this.formData = this.inQuery.formData; this.query.orderId = this.inQuery.id; - this.query.orderIdFk = this.formData.id; + this.query.orderIdFk = this.formData.recordKey; this.query.sOrderId = this.inQuery.id; + console.log(this.query) this.getOrderQRCodeTextList(); } }, diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue index e080ee3..c0a3a41 100644 --- a/src/views/inventory/inner/innerOrder.vue +++ b/src/views/inventory/inner/innerOrder.vue @@ -45,8 +45,8 @@ @@ -239,7 +239,7 @@ export default { }); }, handleDetail(row) { - let query = {orderIdFk: row.id}; + let query = {orderIdFk: row.recordKey}; this.loading = true; listInnerOrderDetail(query) //查找该单号下的所有条码 .then((response) => { diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue index d1fa892..b4b6dab 100644 --- a/src/views/inventory/inner/innerOrderEditDialog.vue +++ b/src/views/inventory/inner/innerOrderEditDialog.vue @@ -108,6 +108,7 @@ :closeDialog="closeDialogC2" :data="thisData" :pId="pId" + :billNo="billNo" :filterType="2" > @@ -123,6 +124,11 @@ :append-to-body='true' > @@ -131,7 +137,7 @@