admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-24 23:13:26 +08:00
commit 51300e4edb
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/projectFront/examSystem2/examManagement/examManagement.vue
View File

@ -859,15 +859,15 @@ export default {
})
} else {
// this.examForm.questions = this.$refs.questionListTable.selection;
console.log(this.examForm.questions,886633)
if(this.$refs.questionListTable){
this.examForm.questions = this.$refs.questionListTable.selection;
} else {
let arr = [];
this.questionList.map(item => {
this.examForm.questions.split(',').map(item2 => {
if(item.id === item){
arr.push({id: item,type: item2.type})
if(item.id === item2){
// arr.push({id: item.id,type: item.type})
arr.push(item)
}
})
})

61
src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
View File

@ -387,6 +387,7 @@ export default {
this.$refs.examForm.resetFields()
}
this.selectWorkerList = []
this.selectedWorkerList = []
}
},
// subjectId(newV,oldV){
@ -443,42 +444,24 @@ export default {
this.$message.success('删除成功!');
}
},
addlocal(){
this.getWorkerInfoList();
async addlocal(){
await this.getWorkerInfoList();
setTimeout(() => {
this.$nextTick(() => {
// for(let i=0;i<this.workerList.length;i++ ){
// for(let j=0;i<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)
// }
// }
// }
// this.workerList.map((item,index) => {
// this.selectedWorkerList.map((item2,index2) => {
// if(item.id === item2.id){
// this.$refs.multipleTable.toggleRowSelection(this.workerList[index],true)
// }
// })
// })
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)
this.dialogVisible3 = true;
// this.$nextTick(() => {
// for(let i=0;i<this.questionList.length;i++){
// for(let j = 0;j<tempStr.length;j++){
// if(tempStr[j] == this.questionList[i].id){
// this.$refs.questionListTable.toggleRowSelection(this.questionList[i],true)
// }
// }
// }
// })
},
localSubmitBtn(){
this.selectedWorkerList = this.$refs.multipleTable.selection
@ -498,7 +481,7 @@ export default {
this.dialogVisible3= false;
},
inquire(flag){
async inquire(flag){
this.worker.pageNo = 1;
if(flag == 2) {
@ -510,7 +493,22 @@ export default {
// this.workerInfo.teamId = "";
// 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 (){
// this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = ''
@ -801,6 +799,7 @@ export default {
this.dialogVisible = false
this.getRecordList()
this.selectWorkerList = []
this.selectedWorkerList = []
})
} else {
// upSubdivisionProjectApi(this.workerInfo).then((res) => {