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 1/6] =?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 @@
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="单据日期" prop="billDate"></el-table-column>
+ <el-table-column label="单据日期" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType">
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 2/6] =?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 @@
<el-input v-model="formData.remark" auto-complete="off"></el-input>
</el-form-item>
</el-col>
+
+ <el-col v-if="formData.status==4" :span="11">
+ <el-form-item prop="remark" label="拒绝原因:">
+ <el-input :disabled="true" v-model="formData.auditRemark" auto-complete="off"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-card>
<el-card>
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 @@
</el-col>
<el-col :span="8">
<el-form-item label="领用仓库:">
- <el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 100%;">
+ <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-option
v-for="item in invList"
:key="item.code"
@@ -243,7 +243,7 @@ export default {
page: 1,
limit: 10,
corpName: null,
- targetInvCode: this.invCodebe,
+ invCode: this.invCodebe,
type: 2,
editStatus: 2,
};
@@ -334,8 +334,8 @@ export default {
.then((response) => {
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 3/6] =?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 4/6] =?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 5/6] =?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 @@
<el-col :span="8">
<el-form-item label="采购仓库">
- <el-select v-model="filterQuery.targetInvCode" style="width: 90%" placeholder="请选择所属仓库">
+ <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
<el-option
v-for="item in invList"
:key="item.name"
@@ -172,7 +172,8 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- deptCode:'',
+ deptCode:'',
+ invCode:null
},
formName: null,
formMap: {
@@ -256,8 +257,10 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- deptCode: this.invCodebe,
+ deptCode: this.invCodebe,
+ invCode:null
};
+ this.getInvList()
this.actDateRange = [];
this.getList();
},
@@ -359,6 +362,7 @@ export default {
var query={
parentId:this.filterQuery.deptCode
}
+ this.filterQuery.invCode = null
filterSubAll(query).then((res) => {
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 6/6] =?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/'