From 511ecdfdaaa7ad51dbb767c16cac37f7919e451e Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Wed, 10 May 2023 14:31:01 +0800
Subject: [PATCH 01/22] this.getList();
---
src/views/basic/product/udiInfoManageSp.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index b54a9cab..db8fd27e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -281,6 +281,7 @@ export default {
};
this.total = 0;
this.list = [];
+ this.getList();
},
search() {
this.filterQuery.page = 1;
@@ -671,7 +672,7 @@ export default {
}
,
created() {
- // this.getList();
+ this.getList();
this.selectSysParam();
this.getSysFilter();
this.findMethod();
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 02/22] =?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 03/22] =?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 @@
-
+
Date: Wed, 10 May 2023 15:00:32 +0800
Subject: [PATCH 04/22] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purApply/purApply.vue | 13 +++++++++----
src/views/purchase/purApply/pureApplyAudit.vue | 18 +++++++++++++++---
.../purchase/purApply/pureApplySearch.vue | 1 +
src/views/purchase/purPlan/purPlan.vue | 4 ++++
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index c5b787d7..e5c4ff25 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -264,6 +264,7 @@ export default {
targetDeptCode: this.invCodebe,
targetInvCode:null
};
+ this.initActDateRange()
if(deptCode!=this.invCodebe){
this.getInvList()
}
@@ -428,6 +429,13 @@ export default {
this. getInvList();
});
},
+ initActDateRange(){
+
+ let end = new Date();
+ let start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ this.actDateRange = [start, end];
+ }
}
,
@@ -450,10 +458,7 @@ export default {
}
,
created() {
- let end = new Date();
- let start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- this.actDateRange = [start, end];
+ this.initActDateRange()
this.getDeptList();
}
,
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 2364418b..6bf1b49a 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -11,7 +11,7 @@
-
+
-
+
{
this.invList = res.data || [];
})
@@ -385,8 +397,8 @@ export default {
this.filterQuery.targetDeptCode=this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode
}
- this.getList();
this. getInvList();
+ this.getList();
});
},
}
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index d278bf74..128417f6 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -311,6 +311,7 @@ export default {
targetDeptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.actAuditDateRange = [];
this.getList();
},
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 63419ab1..42401c74 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -179,6 +179,7 @@ export default {
editStatus: 1,
emergency:'',
deptCode:'',
+ invCode:null
},
invCodebe:null,
formName: null,
@@ -262,8 +263,10 @@ export default {
type: 1,
editStatus: 1,
deptCode: this.invCodebe,
+ invCode:null
};
this.actDateRange = [];
+ this.getInvList()
this.getList();
},
handleClose() {
@@ -406,6 +409,7 @@ export default {
var query={
parentId:this.filterQuery.deptCode
}
+ this.filterQuery.invCode = null
filterSubAll(query).then((res) => {
this.invList = res.data || [];
})
From 894280f55a5db52e464ec5e0a5f164916edbec16 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 15:00:46 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E5=8D=95=E6=8D=AEbug=E4=BF=AE=E7=A8=BF?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/IoCreateBusOrder.vue | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index efa4089a..c038959f 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -392,7 +392,6 @@ export default {
let query = {
code: this.filterQuery.invCode,
enabled: true,
- vueType: "supDelivery",
};
getLocalJoinByUser(query)
.then((response) => {
@@ -425,7 +424,6 @@ export default {
//获取订单列表
getList() {
this.loading = true;
- this.filterQuery.vueType = "supDelivery";
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
From d0d686bac997d2808da03430e3e727e54ce66fe9 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 10 May 2023 15:18:06 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogSelectReceiveOrder.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 348e5759..ada5cd42 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -90,7 +90,7 @@
-
+
From 107fdcab6028ff76240216d9754e2ddbbe0a4975 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 15:20:24 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?=
=?UTF-8?q?=E5=8D=95=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/receive/DialogNewReceive.vue | 6 ++++++
src/views/inout/receive/receiveAudit.vue | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index ca10d3df..53b7ebef 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -94,6 +94,12 @@
+
+
+
+
+
+
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 9cee0051..f238e6ac 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -10,7 +10,7 @@
-
+
{
this.invList = response.data || [];
if (this.invList.length > 0) {
- this.filterQuery.targetInvCode = this.invList[0].code
- this.invCodebe = this.filterQuery.targetInvCode
+ this.filterQuery.invCode = this.invList[0].code
+ this.invCodebe = this.filterQuery.invCode
}
this.getList();
})
From 24620ec5515b56580cc46c7c9ee59dd33b7e7214 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 10 May 2023 15:35:47 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=20=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=20=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purPlan/purPlanSearch.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index bce34a18..c62137d2 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -328,10 +328,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 76aedc71d18ec17866d5f055115ca3a1f9c1f761 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 10 May 2023 16:04:49 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E2=80=98?=
=?UTF-8?q?=E7=B4=A7=E6=80=A5=E7=A8=8B=E5=BA=A6=E2=80=99=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purPlan/purPlanAudit.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 8fe86c55..ffab9352 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -186,9 +186,9 @@ export default {
4: "已拒绝"
},
emergencyMap: {
- 1: "普通",
- 2: "紧急",
- 3: "不紧急",
+ 1: "正常",
+ 2: "较急",
+ 3: "特急",
},
invList: {},
deptList: {},
From 7ca496e89b1ce532da1f7e8786d8b8e57d08bd74 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 10 May 2023 16:06:54 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purPlan/purPlanAudit.vue | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 8fe86c55..2b0212f2 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -26,7 +26,7 @@
-
+
{
this.invList = res.data || [];
})
From bd59cb95b30e09a4478ffead8a4f2da50e0ede36 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 10 May 2023 16:10:49 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.test | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.test b/.env.test
index e7f166e5..f0599398 100644
--- a/.env.test
+++ b/.env.test
@@ -15,8 +15,8 @@ ENV = 'test'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
-# 文明东
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+# 192.168.0.66测试服务器
+VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
From db0fcc7ab19bab6983a8d7d0e04bd3d9a032d919 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Wed, 10 May 2023 16:15:19 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=93=E6=9E=9C?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA=E6=97=B6=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/corpMaintain/corpSelect.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/corpMaintain/corpSelect.vue b/src/views/basic/corpMaintain/corpSelect.vue
index 0d1be379..869890d5 100644
--- a/src/views/basic/corpMaintain/corpSelect.vue
+++ b/src/views/basic/corpMaintain/corpSelect.vue
@@ -353,13 +353,17 @@ import {
},
selectExport() {
- var selectData = this.multipleSelection;
+ /* var selectData = this.multipleSelection;
selectData.forEach((obj) => {
this.query.ids.push(obj.id);
- });
+ });*/
this.allExport();
},
allExport() {
+ var selectData = this.multipleSelection;
+ selectData.forEach((obj) => {
+ this.query.ids.push(obj.id);
+ });
exportExcel(this.query)
.then((response) => {
if (response.code == 20000) {
From 25f374ba5188fa75dee2d9a0b9951acfcf0cd3d1 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 10 May 2023 16:40:28 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A8=A1=E5=9D=97=E5=88=97=E8=A1=A8=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purOrder/purOrderSearchDetails.vue | 6 +++---
src/views/purchase/purPlan/purPlanSearchDetails.vue | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/purchase/purOrder/purOrderSearchDetails.vue b/src/views/purchase/purOrder/purOrderSearchDetails.vue
index 63ff1f7a..d0014ea2 100644
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@@ -4,7 +4,7 @@
-
+
@@ -75,11 +75,11 @@
-
+
-
+
diff --git a/src/views/purchase/purPlan/purPlanSearchDetails.vue b/src/views/purchase/purPlan/purPlanSearchDetails.vue
index 255ab1e7..11410a5c 100644
--- a/src/views/purchase/purPlan/purPlanSearchDetails.vue
+++ b/src/views/purchase/purPlan/purPlanSearchDetails.vue
@@ -4,7 +4,7 @@
-
+
@@ -75,11 +75,11 @@
-
+
-
+
From 80a6bc6d7a4bc67581272d2fb3fa8bdea47ed6ff Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 10 May 2023 17:57:25 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E2=80=98?=
=?UTF-8?q?=E7=B4=A7=E6=80=A5=E7=A8=8B=E5=BA=A6=E2=80=99=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purOrder/purOrderSearch.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 09ce2289..0fe95bba 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -209,9 +209,9 @@ export default {
4: "已拒绝"
},
emergencyMap: {
- 1: "普通",
- 2: "紧急",
- 3: "不紧急",
+ 1: "正常",
+ 2: "较急",
+ 3: "特急",
},
invList: {},
deptList: {},
From 3d08c5cc5e4ae404d9860abb3cc83d85feb1581c Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 11 May 2023 09:02:22 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0*=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/corpMaintain/corpMaintain.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index d2e94e3a..f1418213 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -275,6 +275,9 @@ export default {
// ],
creditNo: [
{required: true, message: "请输入社会信用号", trigger: "blur"}
+ ],
+ corpType: [
+ {required: true, message: "请选择往来单位类型", trigger: "blur"}
]
},
spellUpdate: false,
From d1409c84034e524c96dfcbcc188d9a7651d46717 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 11 May 2023 09:19:12 +0800
Subject: [PATCH 16/22] =?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/busType/bussinessType.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index c37bddf9..0010360a 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -422,6 +422,10 @@ export default {
this.$message.error('请选择是否更改库存！')
return
}
+ if (this.inputQuery.sortNum > 999) {
+ this.$message.error('排序不能超过999！')
+ return
+ }
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
From 55a6284a02a4d663279a632f52fd17704df38eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 11 May 2023 09:25:40 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?=
=?UTF-8?q?=E5=8D=95=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/role/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c9cde7e6..b99d1ed1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -66,14 +66,14 @@
编辑
删除
From 0430d53bd20584a52248d2ed73401d9b9e077186 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 11 May 2023 09:36:25 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=93=E5=BA=93=E6=9F=A5=E8=AF=A2=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/basic/busType/bussinessTypeModify.vue | 2 +-
src/views/purchase/purOrder/purOrderAudit.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 688bcf2c..99d0e98f 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -188,7 +188,7 @@
-
+
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index cc48b686..a35fbb85 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -26,7 +26,7 @@
-
+
Date: Thu, 11 May 2023 09:48:19 +0800
Subject: [PATCH 19/22] =?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=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=20?=
=?UTF-8?q?=E5=92=8C=E9=87=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85?=
=?UTF-8?q?=E7=A9=BA=E7=AD=89=20=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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 0fe95bba..01d10707 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -314,6 +314,7 @@ export default {
editStatus: 1,
deptCode: this.invCodebe,
};
+ this.actAuditDateRange = [];
this.actDateRange = [];
this.getList();
},
@@ -338,10 +339,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 e0d3d5f1995de8f96b0576cbad1587befcbcb6dc Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 11 May 2023 10:13:46 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?=
=?UTF-8?q?=E5=88=87=E6=8D=A2=E9=83=A8=E9=97=A8=E9=87=8D=E7=BD=AE=E5=90=8E?=
=?UTF-8?q?=20=E9=83=A8=E9=97=A8=E4=BB=93=E5=BA=93=E6=9C=AA=E8=81=94?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purOrder/purOrder.vue | 1 +
src/views/purchase/purOrder/purOrderAudit.vue | 1 +
src/views/purchase/purOrder/purOrderSearch.vue | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 82b69796..84045529 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -262,6 +262,7 @@ export default {
deptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
handleClose() {
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index a35fbb85..887dcc7e 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -257,6 +257,7 @@ export default {
deptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 01d10707..8a046ea7 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -316,6 +316,7 @@ export default {
};
this.actAuditDateRange = [];
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
From 6a6388e23e8b3553963f423fbe8a2fc7a69a66ee Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 11 May 2023 11:09:09 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=94=A8=E6=88=B7=E5=85=B3=E8=81=94=20?=
=?UTF-8?q?=E5=B0=B1=E4=B8=8D=E8=83=BD=E7=BB=99=E8=A7=92=E8=89=B2=E7=A6=81?=
=?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/role/index.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b99d1ed1..84469f9d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -543,9 +543,13 @@ export default {
return
}
updateRole(this.form).then(response => {
+ if(response.code === 20000){
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
+ }else{
+ this.$message.error(response.message);
+ }
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
From ae5df67da32c000d1703f00438b370689369e9f2 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 11 May 2023 11:37:59 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E5=88=9B=E5=BA=93=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=88=9A=E8=BF=9B=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=83=BD=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/dept/invRelUsers.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index 03977a68..d9fe1321 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -208,7 +208,7 @@ export default {
};
this.loadUserList();
},
- loadUserList() { //获取仓库用户列表
+ loadUserList() { //获取仓库用户列表//下面方框重置按钮
// if (val != null) {
// this.userQuery.page = val;
// }
@@ -324,7 +324,7 @@ export default {
},
created() {
this.userQuery.code = this.inputQuery.code;
- this.loadUserList();
+ //this.loadUserList();//不让前端一开始就去就展示数据
}
}