Merge branch 'bjxz-cjw' into bjxz-dev
This commit is contained in:
commit
cbd924f6ab
@ -481,7 +481,7 @@ export default {
|
|||||||
this.dialogVisible3= false;
|
this.dialogVisible3= false;
|
||||||
|
|
||||||
},
|
},
|
||||||
inquire(flag){
|
async inquire(flag){
|
||||||
this.worker.pageNo = 1;
|
this.worker.pageNo = 1;
|
||||||
|
|
||||||
if(flag == 2) {
|
if(flag == 2) {
|
||||||
@ -493,7 +493,22 @@ export default {
|
|||||||
// this.workerInfo.teamId = "";
|
// this.workerInfo.teamId = "";
|
||||||
// this.$refs.searchRef.resetFields
|
// this.$refs.searchRef.resetFields
|
||||||
}
|
}
|
||||||
this.getWorkerInfoList();
|
await this.getWorkerInfoList();
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
for(let i=0;i<this.workerList.length;i++ ){
|
||||||
|
for(let j=0;j<this.selectedWorkerList.length;j++){
|
||||||
|
if(this.workerList[i].id == this.selectedWorkerList[j].id){
|
||||||
|
console.log(this.workerList[i])
|
||||||
|
console.log(this.selectedWorkerList[j])
|
||||||
|
this.$refs.multipleTable.toggleRowSelection(this.workerList[i],true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},10)
|
||||||
|
|
||||||
},
|
},
|
||||||
async getWorkerInfoList (){
|
async getWorkerInfoList (){
|
||||||
// this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = ''
|
// this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = ''
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user