From b42de9c907a6ebe639bcb3e069aad2cfebf329ff Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Mon, 17 Jul 2023 09:53:32 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=99=A8?=
=?UTF-8?q?=E6=A2=B0=E4=BF=A1=E6=81=AF=EF=BC=9A=E9=94=81=E5=AE=9A=E3=80=81?=
=?UTF-8?q?=E9=80=80=E5=9B=9E=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/udiInfoManageSp.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index ff53de71..8099d4de 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -523,7 +523,7 @@ export default {
postQuery.ids.push(row.rlId);
});
if(postQuery.ids.length<=0){
- this.$message.error("请先选择供应商!");
+ this.$message.error("请先选择产品!");
return
}
lockStatus(postQuery)
From bb289a3f8681892c9e58c377333c2413c32c6c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com>
Date: Mon, 17 Jul 2023 09:58:48 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E5=BA=93=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=A2=84=E8=AD=A6=E8=AE=BE=E7=BD=AE=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inventory/addInvRemindSetDialog.vue | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue
index 9a0b6e65..2e06bf34 100644
--- a/src/views/inventory/addInvRemindSetDialog.vue
+++ b/src/views/inventory/addInvRemindSetDialog.vue
@@ -145,7 +145,7 @@ export default {
deptCode: null,
invCode: null,
invSpaceCode: null,
- lowStock: false,
+ lowStock: null,
lackStock: false,
overStock: false,
expireDate: false,
@@ -166,11 +166,21 @@ export default {
getInfoByInvId({invId: this.invId}).then((res) => {
if (res.code === 20000) {
this.formData = res.data;
- this.formData.lowStock = false;
- this.formData.lackStock = false;
- this.formData.overStock = false;
- this.formData.expireDate = false;
- this.formData.recentDate = false;
+ if (res.data.lowStock == null) {
+ this.formData.lowStock = false;
+ }
+ if (res.data.lackStock == null) {
+ this.formData.lackStock = false;
+ }
+ if (res.data.overStock == null) {
+ this.formData.overStock = false;
+ }
+ if (res.data.expireDate == null) {
+ this.formData.expireDate = false;
+ }
+ if (res.data.recentDate == null) {
+ this.formData.recentDate = false;
+ }
} else {
this.$message.error(res.meesage);
}
From 9be928c396b3d69cada1e09f76abaebfc449f95e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 17 Jul 2023 11:22:19 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=89=E5=AE=8C=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=EF=BC=8C=E5=BD=95=E5=85=A5=E4=BA=A7=E5=93=81=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86=20=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E5=90=8E=E4=BE=9B=E5=BA=94=E5=95=86=E6=B2=A1=E6=94=B9=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purOrder/purOrderEditDialog.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index d70dfca1..37ce3403 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -452,6 +452,7 @@ export default {
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
+ this.currentRow.supId = row.supName;
updateDetail(this.currentRow);
}
},
From 88fc636c44f8ff8c5604f84b437128efa256614f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 17 Jul 2023 11:55:46 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E9=80=89?=
=?UTF-8?q?=E5=85=A5=E5=8D=95=E6=8D=AE=E6=97=B6=E5=8A=A0=E4=B8=8A=E5=88=A4?=
=?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/business/stockOrderPrint.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
index 2c61b724..6f70c566 100644
--- a/src/views/basic/business/stockOrderPrint.vue
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -414,7 +414,8 @@ export default {
.then(response => {
this.loading = false;
if (response.code == 20000) {
- this.list = response.data.list || [];
+ //this.list = response.data.list || [];
+ this.list = [];
this.total = response.data.total || 0;
this.detailList = [];
} else {
@@ -430,7 +431,9 @@ export default {
},
combine(){
- if(this.orderQuery==null && this.orderQuery.length==0){
+ debugger
+ console.log(this.orderQuery)
+ if(this.orderQuery==null || this.orderQuery.length==0){
this.$message.error("请先选择单据!")
return;
}
From 458ca89f5f840bbdea43d344e75867cabf495735 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 17 Jul 2023 11:59:23 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/business/stockOrderPrint.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
index 6f70c566..f4b82b12 100644
--- a/src/views/basic/business/stockOrderPrint.vue
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -414,8 +414,7 @@ export default {
.then(response => {
this.loading = false;
if (response.code == 20000) {
- //this.list = response.data.list || [];
- this.list = [];
+ this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList = [];
} else {
From 8b3d59be35187d8957afd23b2c16dc0d63b09794 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 17 Jul 2023 14:54:51 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/remind/invRemindMsg.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index 1c73b216..0aa780b1 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -361,6 +361,7 @@ export default {
limit: 20,
listInv:this.invCodeList,
};
+ this.queryName = null;
this.getList();
this.spaceList = [];
this.ggxhList = [];
From 0b6f964eb5b1a722f300157c6a46cf13e5369082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Mon, 17 Jul 2023 15:09:34 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=99=A8?=
=?UTF-8?q?=E6=A2=B0=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=80=89=E5=85=A5=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/basicCompanyProductsImport.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/basic/product/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue
index f2bb7580..439c0d28 100644
--- a/src/views/basic/product/basicCompanyProductsImport.vue
+++ b/src/views/basic/product/basicCompanyProductsImport.vue
@@ -435,12 +435,13 @@ export default {
selectExport() {
var selectData = this.multipleSelection;
+ this.filterQuery.rlIds=[];
if(selectData.length==0){
this.$message.error("请先选择产品!");
return
}
selectData.forEach((obj) => {
- this.filterQuery.rlIds.push(obj.id);
+ this.filterQuery.rlIds.push(obj.id);
this.filterQuery.nameCode=obj.nameCode;
});
From ce9f770c746d5930672f8c1ca7857b3832df90da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Mon, 17 Jul 2023 15:19:26 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E7=9A=84=20=E5=BE=80?=
=?UTF-8?q?=E6=9D=A5=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B=20=E8=B7=9F=20?=
=?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=20=E9=87=8C=E7=9A=84=20?=
=?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B=20?=
=?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/corpMaintain/corpMaintain.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index c171f6e2..d6bb2a58 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -14,7 +14,8 @@