From aeb62186915778f7fc28e505a088e3e01972652c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sun, 30 Jul 2023 18:47:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?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/purchase/purOrder/purOrderEditDialog.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 22086fb2..b5107f37 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -165,7 +165,7 @@
+ :value="item.name">
@@ -445,7 +445,7 @@ export default {
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
- this.currentRow.supId = row.supName;
+ this.currentRow.supId= this.suppliers.find(item => item.name == row.supName).erpId
updateDetail(this.currentRow);
}
},
From 8bf70e3107482db00db7a28d04bdd4aff1511f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 31 Jul 2023 17:50:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E6=B3=A8=E5=86=8C=E8=AF=81=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/PanelCreateOrderBizDetail.vue | 73 ++-----------------
1 file changed, 8 insertions(+), 65 deletions(-)
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 5c1ff83d..0738aae4 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -95,73 +95,16 @@
-
-
-
+
+
-
- 保存
-
-
- 编辑
-
- 复制
-
-
- 删除
-
- 绑定产品
-
- 绑定供应商
-
-
+ 保存
+ 编辑
+ 复制
+ 删除
+ 绑定产品
+
From 140720d4e7e66abdf071c04ff8820af2412872a0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 31 Jul 2023 18:00:47 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogCreateOrder.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index dde0c5b0..a406e7d3 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -17,7 +17,7 @@
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
- >选入预验收库单
+ >选入预验收入库单
草稿保存
From 0a08c9ebbe32ded6609f26ed73373fc5045763d4 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 1 Aug 2023 18:17:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=86=E7=94=A8?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=9B=B6=E5=BA=93=E5=AD=98=E5=92=8C=E8=B4=9F?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=20=E4=BF=9D=E5=AD=98=E6=97=B6=E5=88=A4?=
=?UTF-8?q?=E6=96=AD=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inventory/invPorduct.js | 8 +++
src/api/inventory/invPreInSearch.js | 8 +++
src/api/inventory/invPreProduct.js | 10 +++
src/views/inout/DialogSelectInvProduct.vue | 12 ++--
src/views/inout/receive/DialogNewReceive.vue | 39 +++++++----
src/views/inout/receive/receiveAudit.vue | 73 ++++++++++----------
6 files changed, 93 insertions(+), 57 deletions(-)
diff --git a/src/api/inventory/invPorduct.js b/src/api/inventory/invPorduct.js
index 70a293a1..426c85b9 100644
--- a/src/api/inventory/invPorduct.js
+++ b/src/api/inventory/invPorduct.js
@@ -8,6 +8,14 @@ export function getInvProduct(params) {
});
}
+export function getInvProductStock(params) {
+ return axios({
+ url: "/spms/inv/product/filterStock",
+ method: "get",
+ params: params
+ });
+}
+
export function getProduct(params) {
return axios({
url: "/spms/inv/product/filterProduct",
diff --git a/src/api/inventory/invPreInSearch.js b/src/api/inventory/invPreInSearch.js
index 68579ffe..57da8472 100644
--- a/src/api/inventory/invPreInSearch.js
+++ b/src/api/inventory/invPreInSearch.js
@@ -34,6 +34,14 @@ export function getInvPreInProduct(params) {
});
}
+export function getInvPreInProductStock(params) {
+ return axios({
+ url: "/spms/inv/pre/in/product/filterStock",
+ method: "get",
+ params: params
+ });
+}
+
export function getInvPreInProductDetail(params) {
return axios({
url: "/spms/inv/pre/in/product/filterDetail",
diff --git a/src/api/inventory/invPreProduct.js b/src/api/inventory/invPreProduct.js
index ef3ae5ef..d9ebb7d5 100644
--- a/src/api/inventory/invPreProduct.js
+++ b/src/api/inventory/invPreProduct.js
@@ -8,6 +8,16 @@ export function getInvPreProduct(params) {
});
}
+export function getInvPreProductStock(params) {
+ return axios({
+ url: "/spms/inv/pre/product/filterStock",
+ method: "get",
+ params: params
+ });
+}
+
+
+
export function getInvPreProductDetail(params) {
return axios({
url: "/spms/inv/pre/product/filterDetail",
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index 4212da93..7cf3c644 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -66,12 +66,12 @@