bug修复

prod
wj 2 years ago
parent 21c94f22c0
commit 9ecd0c5c40

@ -264,6 +264,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode:null targetInvCode:null
}; };
this.initActDateRange()
if(deptCode!=this.invCodebe){ if(deptCode!=this.invCodebe){
this.getInvList() this.getInvList()
} }
@ -428,6 +429,13 @@ export default {
this. getInvList(); 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() { created() {
let end = new Date(); this.initActDateRange()
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getDeptList(); this.getDeptList();
} }
, ,

@ -11,7 +11,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门"> <el-form-item label="申购部门">
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"> <el-select v-model="filterQuery.targetDeptCode" @change="deptChange" placeholder="请选择申购部门" style="width: 90%">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -26,7 +26,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库"> <el-form-item label="申购仓库">
<el-select v-model="filterQuery.targetInvCode" @change="getInvList" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.name" :key="item.name"
@ -167,6 +167,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
targetDeptCode:'', targetDeptCode:'',
targetInvCode: null
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -238,6 +239,7 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = { this.filterQuery = {
billNo: "", billNo: "",
thirdSysFk: "", thirdSysFk: "",
@ -251,7 +253,11 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode: null
}; };
if(deptCode!=this.invCodebe){
this.getInvList()
}
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -370,10 +376,16 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
deptChange(){
this. getInvList();
this.getList();
},
getInvList() { getInvList() {
var query={ var query={
parentId:this.filterQuery.targetDeptCode parentId:this.filterQuery.targetDeptCode
} }
this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })
@ -385,8 +397,8 @@ export default {
this.filterQuery.targetDeptCode=this.deptList[0].code this.filterQuery.targetDeptCode=this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode this.invCodebe=this.filterQuery.targetDeptCode
} }
this.getList();
this. getInvList(); this. getInvList();
this.getList();
}); });
}, },
} }

@ -311,6 +311,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.actAuditDateRange = [];
this.getList(); this.getList();
}, },

@ -179,6 +179,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
deptCode:'', deptCode:'',
invCode:null
}, },
invCodebe:null, invCodebe:null,
formName: null, formName: null,
@ -262,8 +263,10 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
deptCode: this.invCodebe, deptCode: this.invCodebe,
invCode:null
}; };
this.actDateRange = []; this.actDateRange = [];
this.getInvList()
this.getList(); this.getList();
}, },
handleClose() { handleClose() {
@ -406,6 +409,7 @@ export default {
var query={ var query={
parentId:this.filterQuery.deptCode parentId:this.filterQuery.deptCode
} }
this.filterQuery.invCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })

Loading…
Cancel
Save