From fe4ba6a28b0b464fd6fdb189d98477d79b11a6c2 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, 10 May 2023 11:28:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invPlaceOrder.js | 8 ++ src/views/inventory/InvPlaceSelect.vue | 135 +++++++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 src/views/inventory/InvPlaceSelect.vue diff --git a/src/api/inventory/invPlaceOrder.js b/src/api/inventory/invPlaceOrder.js index 1461787b..1cf4479b 100644 --- a/src/api/inventory/invPlaceOrder.js +++ b/src/api/inventory/invPlaceOrder.js @@ -15,3 +15,11 @@ export function getInvPlaceOrderDetailList(params) { params: params }); } + +export function selectPlaceList(params) { + return axios({ + url: "/spms/inv/product/selectPlaceList", + method: "get", + params: params + }); +} diff --git a/src/views/inventory/InvPlaceSelect.vue b/src/views/inventory/InvPlaceSelect.vue new file mode 100644 index 00000000..a44d67b7 --- /dev/null +++ b/src/views/inventory/InvPlaceSelect.vue @@ -0,0 +1,135 @@ + + + + + + From 8422f6c36205841c1379d717205de7f30b4affbc 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, 10 May 2023 14:28:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9di=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BAnameCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/bindHospProduct.vue | 3 ++- src/views/inventory/InvCheckPlace.vue | 2 +- src/views/inventory/InvOrderPlaceModify.vue | 2 +- src/views/inventory/InvOutPlace.vue | 2 +- src/views/inventory/InvPlace.vue | 2 +- src/views/inventory/InvPlaceChangeModify.vue | 2 +- src/views/inventory/InvPlaceSelect.vue | 2 +- src/views/inventory/InvProductPlaceOutModify.vue | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue index d010fca4..667afa4f 100644 --- a/src/views/basic/product/bindHospProduct.vue +++ b/src/views/basic/product/bindHospProduct.vue @@ -159,7 +159,8 @@ export default { page: 1, limit: 20, addType: 1, - diType: 1 + diType: 1, + bindType: 1 }; this.getList(); }, diff --git a/src/views/inventory/InvCheckPlace.vue b/src/views/inventory/InvCheckPlace.vue index 2f0d0e8b..e7ed1905 100644 --- a/src/views/inventory/InvCheckPlace.vue +++ b/src/views/inventory/InvCheckPlace.vue @@ -122,7 +122,7 @@ - + diff --git a/src/views/inventory/InvOrderPlaceModify.vue b/src/views/inventory/InvOrderPlaceModify.vue index 0998d859..ef421115 100644 --- a/src/views/inventory/InvOrderPlaceModify.vue +++ b/src/views/inventory/InvOrderPlaceModify.vue @@ -92,7 +92,7 @@ - + diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue index db62e1cb..16f320c0 100644 --- a/src/views/inventory/InvPlace.vue +++ b/src/views/inventory/InvPlace.vue @@ -123,7 +123,7 @@ - + diff --git a/src/views/inventory/InvPlaceChangeModify.vue b/src/views/inventory/InvPlaceChangeModify.vue index 79bfdd31..5e6910db 100644 --- a/src/views/inventory/InvPlaceChangeModify.vue +++ b/src/views/inventory/InvPlaceChangeModify.vue @@ -103,7 +103,7 @@ - + diff --git a/src/views/inventory/InvProductPlaceOutModify.vue b/src/views/inventory/InvProductPlaceOutModify.vue index aaaa52fa..a21d8974 100644 --- a/src/views/inventory/InvProductPlaceOutModify.vue +++ b/src/views/inventory/InvProductPlaceOutModify.vue @@ -72,7 +72,7 @@ - + From d0d95c6f0cb48507eed6985e2cd60c276bcb395e Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Wed, 10 May 2023 14:37:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=E5=88=86=E7=B1=BB=E6=8D=A2=E8=A1=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/product.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 3ff8622b..3bd030e0 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -2134,13 +2134,12 @@ export default { margin-bottom: 0px; } -/* .el-row { +.el-row { display: flex; - flex-wrap: wrap; - margin-bottom: 6px; + flex-wrap: nowrap; } -.el-col { +/* .el-col { border-radius: 4px; flex-wrap: wrap; } */ From 86af5e096d9b53bd144da39b92623d1d65f968fe Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 10 May 2023 14:40:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=B3=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=20=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=E9=97=B4=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/purchase/purApply/pureApplySearch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue index d278bf74..4f3d69d2 100644 --- a/src/views/purchase/purApply/pureApplySearch.vue +++ b/src/views/purchase/purApply/pureApplySearch.vue @@ -330,10 +330,10 @@ export default { this.filterQuery.endDate = null; } if (this.actAuditDateRange != null) { - this.filterQuery.starAuditDate = this.actAuditDateRange[0]; + this.filterQuery.startAuditDate = this.actAuditDateRange[0]; this.filterQuery.endAuditDate = this.actAuditDateRange[1]; } else { - this.filterQuery.starAuditDate = null; + this.filterQuery.startAuditDate = null; this.filterQuery.endAuditDate = null; } this.loading = true; From b7b804b71bd4903537e1427808860f83b55898aa Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 10 May 2023 14:50:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=94=B3=E8=B4=AD=20?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=83=A8=E9=97=A8=20=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=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/purApply/pureApplyAudit.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue index 2364418b..b19e148f 100644 --- a/src/views/purchase/purApply/pureApplyAudit.vue +++ b/src/views/purchase/purApply/pureApplyAudit.vue @@ -11,7 +11,9 @@ - +