diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index dcdf99ad..469f037e 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,6 +9,20 @@
placeholder="仓库名称"
>
+
+
+
+
+
+
+
+
重置
@@ -28,34 +42,48 @@
>
+
+
+
+
+ {{ advanceTypeTypeMap[scope.row.advanceType] }}
+
+
-
-
-
-
-
-
-
-
-
+
+
+ {{
+ scope.row.spUse | spUerFilterName
+ }}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -395,17 +424,22 @@ export default {
// page: 1,
// limit: 10,
},
- isAdvanceTypeShow:false,
- isShow:false,
+ isAdvanceTypeShow: false,
+ isShow: false,
loading: true,
list: [],
isExpandAll: true,
total: 0,
+ advanceTypeTypeMap: {
+ 1: "入账库",
+ 3: "寄售库",
+ 2: "预验收库",
+ },
formMap: {
add: "仓库信息-新增",
edit: "仓库信息-编辑"
},
- invWouse:{},
+ invWouse: {},
formName: null,
configParms: {},
currentCode: null,
@@ -424,6 +458,7 @@ export default {
]
},
subData: {},
+ subDataType:{},
fromDeptOptions: [],
invOptions: [],
thirdSubQuery: {
@@ -448,6 +483,7 @@ export default {
},
sysList: [],
sysSubList: [],
+ advanceTypese: [],
};
},
methods: {
@@ -460,6 +496,7 @@ export default {
name: "",
status: "",
};
+ this.subDataType.advanceType=null;
this.getList();
//置空用户列表和货位信息列表的参数
@@ -472,6 +509,7 @@ export default {
},
onSubmit() { //提交查询
+ this.query.advanceType=this.subDataType.advanceType;
this.getList();
},
@@ -483,6 +521,7 @@ export default {
this.loading = false;
let invlist = response.data || [];
this.list = this.handleTree(invlist, "code", "parentCode");
+ console.log(this.list);
})
.catch(() => {
this.loading = false;
@@ -491,34 +530,38 @@ export default {
});
},
handleSubForm(data, formName) { //新增，编辑
- if(data != null ){
- this.invWouse=data;
+ if (data != null) {
+ this.invWouse = data;
}
this.formName = formName;
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
- this.subData.advanceType=this.subData.advanceType.toString();
- if(this.subData.parentCode!=null && this.subData.parentCode!=""){
- this.isAdvanceTypeShow=true;
- this.isShow=false;
- }else{
- this.isAdvanceTypeShow=false;
- this.isShow=true
- this.subData.parentCode=null;
+ this.subData.advanceType = this.subData.advanceType.toString();
+ if (this.subData.parentCode != null && this.subData.parentCode != "") {
+ this.isAdvanceTypeShow = true;
+ this.isShow = false;
+ } else {
+ this.isAdvanceTypeShow = false;
+ this.isShow = true
+ this.subData.parentCode = null;
}
} else if (formName === "add") {
- this.isShow=true
- if(data==null){
- this.isAdvanceTypeShow=false;
- this.subData = {advanceType: '1', spUse: false,parentCode:null};
- }else{
- this.isAdvanceTypeShow=true;
- this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
+ this.isShow = true
+ if (data == null) {
+ this.isAdvanceTypeShow = false;
+ this.subData = {advanceType: '1', spUse: false, parentCode: null};
+ } else {
+ this.isAdvanceTypeShow = true;
+ this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
}
}
+ //转换
+ let advanceTypese = this.subData.advanceType
+
+
this.subFormVisible = true;
this.getSubThrsysDetailData();
- if(this.subData.parentCode!=null && this.subData.parentCode!=""){
+ if (this.subData.parentCode != null && this.subData.parentCode != "") {
filterSubAll(this.query)
.then((response) => {
let invList = response.data || [];