From ebd9a355270569c60b089e39ae08cb4cd7a4e218 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, 17 May 2023 16:16:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basic/basicUnitMaintain.js | 8 +
src/api/inout/orderMuti.js | 71 +++++++
src/views/inout/muti/ioOrderMutiSet.vue | 164 ++++++++++++++++
src/views/inout/muti/ioOrderMutiSetDialog.vue | 176 ++++++++++++++++++
4 files changed, 419 insertions(+)
create mode 100644 src/api/inout/orderMuti.js
create mode 100644 src/views/inout/muti/ioOrderMutiSet.vue
create mode 100644 src/views/inout/muti/ioOrderMutiSetDialog.vue
diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js
index 0355fc24..19a5d97d 100644
--- a/src/api/basic/basicUnitMaintain.js
+++ b/src/api/basic/basicUnitMaintain.js
@@ -104,6 +104,14 @@ export function getCorpList(query) {
});
}
+export function selectCorpList(query) {
+ return axios({
+ url: "/udiwms/basic/unit/maintain/selectCorpList",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/api/inout/orderMuti.js b/src/api/inout/orderMuti.js
new file mode 100644
index 00000000..77b9a8d8
--- /dev/null
+++ b/src/api/inout/orderMuti.js
@@ -0,0 +1,71 @@
+import axios from '@/utils/request'
+
+export function filterList(query) {
+ return axios({
+ url: "/udiwms/inout/muti/filterList",
+ method: "get",
+ params: query
+ });
+}
+
+export function addMuti(query) {
+ return axios({
+ url: "/udiwms/inout/muti/add",
+ method: "post",
+ data: query
+ });
+}
+
+export function updateMuti(query) {
+ return axios({
+ url: "/udiwms/inout/muti/update",
+ method: "post",
+ data: query
+ });
+}
+
+export function detailMuti(query) {
+ return axios({
+ url: "/udiwms/inout/muti/detail",
+ method: "post",
+ data: query
+ });
+}
+
+
+
+export function findByCode(query) {
+ return axios(
+ {
+ url: "/udiwms/basic/findByCode",
+ method: "get",
+ params: query
+ }
+ );
+}
+
+export function getCodeList(params) {
+ return axios({
+ url: "/udiwms/inout/code/filterList",
+ method: "get",
+ params: params
+ });
+}
+
+export function findByOrderId(params) {
+ return axios({
+ url: "/udiwms/inout/code/findByOrderId",
+ method: "get",
+ params: params
+ });
+}
+
+export function getCodeListForEdit(params){
+ return axios({
+ url: "/udiwms/inout/code/getCodeListForEdit",
+ method: "get",
+ params: params
+ });
+}
+
+
diff --git a/src/views/inout/muti/ioOrderMutiSet.vue b/src/views/inout/muti/ioOrderMutiSet.vue
new file mode 100644
index 00000000..78d2df6c
--- /dev/null
+++ b/src/views/inout/muti/ioOrderMutiSet.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{
+ item.code
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{item.code}}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 草稿保存
+ 立即提交
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/inout/muti/ioOrderMutiEditSelectDialog.vue b/src/views/inout/muti/ioOrderMutiEditSelectDialog.vue
new file mode 100644
index 00000000..25cc82e0
--- /dev/null
+++ b/src/views/inout/muti/ioOrderMutiEditSelectDialog.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选入
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/inout/muti/ioOrderMutiSelect.vue b/src/views/inout/muti/ioOrderMutiSelect.vue
new file mode 100644
index 00000000..92be5e51
--- /dev/null
+++ b/src/views/inout/muti/ioOrderMutiSelect.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/views/inout/muti/ioOrderMutiSet.vue b/src/views/inout/muti/ioOrderMutiSet.vue
index 78d2df6c..afd57f3c 100644
--- a/src/views/inout/muti/ioOrderMutiSet.vue
+++ b/src/views/inout/muti/ioOrderMutiSet.vue
@@ -8,7 +8,7 @@
查询
- 新增
+ 新增
diff --git a/src/views/inout/muti/ioOrderMutiSetDialog.vue b/src/views/inout/muti/ioOrderMutiSetDialog.vue
index 39620155..27990ba4 100644
--- a/src/views/inout/muti/ioOrderMutiSetDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiSetDialog.vue
@@ -24,7 +24,7 @@
-
+
{
});
},
- lokk(){
- console.log(this.inputQuery)
- },
findFromInvList(val) {
let cQuery = {
corpType: 4,
From 9735c0fcc2714bce87f74d78a443881cccee8006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 19 May 2023 17:45:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inout/orderMuti.js | 11 +
src/views/inout/muti/ioOrderMuti.vue | 9 +
src/views/inout/muti/ioOrderMutiAudit.vue | 259 ++++++++++++++++-
.../inout/muti/ioOrderMutiAuditDialog.vue | 203 ++++++++++++-
.../inout/muti/ioOrderMutiEditDialog.vue | 10 +-
src/views/inout/muti/ioOrderMutiSelect.vue | 271 +++++++++++++++++-
.../inout/muti/ioOrderMutiSelectDialog.vue | 210 ++++++++++++++
src/views/inout/muti/ioOrderMutiSet.vue | 9 +
src/views/inout/muti/ioOrderMutiSetDialog.vue | 17 +-
9 files changed, 990 insertions(+), 9 deletions(-)
create mode 100644 src/views/inout/muti/ioOrderMutiSelectDialog.vue
diff --git a/src/api/inout/orderMuti.js b/src/api/inout/orderMuti.js
index 60e4f600..888f4d7d 100644
--- a/src/api/inout/orderMuti.js
+++ b/src/api/inout/orderMuti.js
@@ -149,6 +149,17 @@ export function delectMuti(query) {
);
}
+export function auditMuti(query) {
+ return axios(
+ {
+ url: "/udiwms/inout/order/muti/auditMuti",
+ method: "post",
+ data: query
+ }
+ );
+}
+
+
diff --git a/src/views/inout/muti/ioOrderMuti.vue b/src/views/inout/muti/ioOrderMuti.vue
index dea9350d..f211a4fe 100644
--- a/src/views/inout/muti/ioOrderMuti.vue
+++ b/src/views/inout/muti/ioOrderMuti.vue
@@ -144,6 +144,7 @@ export default {
mark: null,
totalCount:null,
useCount:null,
+ status:0,
page: 1,
limit: 10,
},
@@ -205,6 +206,7 @@ export default {
orderIdFk: null,
relIdFk: null,
mark: null,
+ status:0,
page: 1,
limit: 10,
}
@@ -241,6 +243,13 @@ export default {
this.orderMutiVisible = true;
},
getList() {
+ if (this.actDateRange != null) {
+ this.filterQuery.startDate = this.actDateRange[0];
+ this.filterQuery.endDate = this.actDateRange[1];
+ } else {
+ this.filterQuery.startDate = null;
+ this.filterQuery.endDate = null;
+ }
this.loading = true;
selectMutiList(this.filterQuery)
.then((response) => {
diff --git a/src/views/inout/muti/ioOrderMutiAudit.vue b/src/views/inout/muti/ioOrderMutiAudit.vue
index 62030410..6452cbfb 100644
--- a/src/views/inout/muti/ioOrderMutiAudit.vue
+++ b/src/views/inout/muti/ioOrderMutiAudit.vue
@@ -1,10 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核通过
+ 审核拒绝
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue
index e492e5fe..3868d19c 100644
--- a/src/views/inout/muti/ioOrderMutiEditDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue
@@ -9,11 +9,11 @@
-
+
- 添加
+ 添加
@@ -316,14 +316,14 @@ export default {
},
components: {ioOrderMutiEditSelectDialog},
created() {
- debugger
- this.inputQuery = this.filterQuery
- this.pId=this.inputQuery.id
if(this.formName==2){
+ this.inputQuery = this.filterQuery
+ this.pId=this.inputQuery.id
this.selectMutiDetailList()
}else{
this.getMark();
}
+
},
}
diff --git a/src/views/inout/muti/ioOrderMutiSelect.vue b/src/views/inout/muti/ioOrderMutiSelect.vue
index 92be5e51..e61113c3 100644
--- a/src/views/inout/muti/ioOrderMutiSelect.vue
+++ b/src/views/inout/muti/ioOrderMutiSelect.vue
@@ -1,10 +1,279 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/inout/muti/ioOrderMutiSet.vue b/src/views/inout/muti/ioOrderMutiSet.vue
index afd57f3c..f1ce1155 100644
--- a/src/views/inout/muti/ioOrderMutiSet.vue
+++ b/src/views/inout/muti/ioOrderMutiSet.vue
@@ -17,6 +17,11 @@
+
+
+ {{ checkUseMap[scope.row.checkUse] }}
+
+
@@ -91,6 +96,10 @@ export default {
1: "新增出库设置",
2: "编辑出库设置",
},
+ checkUseMap: {
+ 1: "是",
+ 0: "否",
+ },
orderMutiSetVisible: false,
};
},
diff --git a/src/views/inout/muti/ioOrderMutiSetDialog.vue b/src/views/inout/muti/ioOrderMutiSetDialog.vue
index 27990ba4..a66d00c4 100644
--- a/src/views/inout/muti/ioOrderMutiSetDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiSetDialog.vue
@@ -53,6 +53,16 @@
+
+
+
+
+ 是
+ 否
+
+
+
+
@@ -161,9 +171,14 @@ export default {
},
components: {},
created() {
- console.log(this.inputQuery)
this.getInvList();
this.findFromInvList();
+ if(this.formName==2){
+ this.getBusType();
+ }else{
+ this.inputQuery.checkUse=1;
+ }
+
},
}
From 9267b872c883855b579a3799b79bc9048a0dc30e 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, 22 May 2023 09:29:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/muti/ioOrderMuti.vue | 10 +++++++---
src/views/inout/muti/ioOrderMutiAudit.vue | 9 ++++++---
src/views/inout/muti/ioOrderMutiEditDialog.vue | 2 +-
src/views/inout/muti/ioOrderMutiSelect.vue | 8 ++++++--
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/inout/muti/ioOrderMuti.vue b/src/views/inout/muti/ioOrderMuti.vue
index f211a4fe..12db3347 100644
--- a/src/views/inout/muti/ioOrderMuti.vue
+++ b/src/views/inout/muti/ioOrderMuti.vue
@@ -29,7 +29,7 @@
-
+
@@ -142,6 +142,7 @@ export default {
orderIdFk: null,
relIdFk: null,
mark: null,
+ cpmctymc:null,
totalCount:null,
useCount:null,
status:0,
@@ -201,16 +202,18 @@ export default {
},
methods: {
onReset(){
- this.inputQuery={
+ this.filterQuery={
udiCode: null,
orderIdFk: null,
relIdFk: null,
mark: null,
- status:0,
+ cpmctymc:null,
page: 1,
limit: 10,
}
+ this.actDateRange=[]
this.getList();
+ this.detailList=[]
},
onSubmit() {
this.filterQuery.page = 1;
@@ -256,6 +259,7 @@ export default {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
+ this.detailList=[]
})
.catch(() => {
this.loading = false;
diff --git a/src/views/inout/muti/ioOrderMutiAudit.vue b/src/views/inout/muti/ioOrderMutiAudit.vue
index 6452cbfb..f6ce44a6 100644
--- a/src/views/inout/muti/ioOrderMutiAudit.vue
+++ b/src/views/inout/muti/ioOrderMutiAudit.vue
@@ -29,7 +29,7 @@
-
+
@@ -198,16 +198,18 @@ export default {
},
methods: {
onReset(){
- this.inputQuery={
+ this.filterQuery={
udiCode: null,
orderIdFk: null,
relIdFk: null,
mark: null,
- status:1,
+ cpmctymc:null,
page: 1,
limit: 10,
}
+ this.actDateRange=[]
this.getList();
+ this.detailList=[]
},
onSubmit() {
this.filterQuery.page = 1;
@@ -242,6 +244,7 @@ export default {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
+ this.detailList=[]
})
.catch(() => {
this.loading = false;
diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue
index 3868d19c..55c4d909 100644
--- a/src/views/inout/muti/ioOrderMutiEditDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue
@@ -24,7 +24,7 @@
-
+
diff --git a/src/views/inout/muti/ioOrderMutiSelect.vue b/src/views/inout/muti/ioOrderMutiSelect.vue
index e61113c3..e9423a89 100644
--- a/src/views/inout/muti/ioOrderMutiSelect.vue
+++ b/src/views/inout/muti/ioOrderMutiSelect.vue
@@ -29,7 +29,7 @@
-
+
@@ -198,15 +198,18 @@ export default {
},
methods: {
onReset(){
- this.inputQuery={
+ this.filterQuery={
udiCode: null,
orderIdFk: null,
relIdFk: null,
mark: null,
+ cpmctymc:null,
page: 1,
limit: 10,
}
+ this.actDateRange=[]
this.getList();
+ this.detailList=[]
},
onSubmit() {
this.filterQuery.page = 1;
@@ -241,6 +244,7 @@ export default {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
+ this.detailList=[]
})
.catch(() => {
this.loading = false;
From 7442d9807a63147bc7992a489629dfb698bc870e Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Mon, 22 May 2023 09:33:08 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E6=A0=B9=E6=8D=AE=E2=80=98=E9=87=87=E8=B4=AD=E4=BB=93?=
=?UTF-8?q?=E5=BA=93=E2=80=99=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/purchase/purOrder/purOrder.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index d1dd98fd..f402c3a6 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -26,7 +26,7 @@
-
+