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;
+ }
+
},
}