hywen
/
YNUtdPlatform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sy-10-10'

This commit is contained in:
BianLzhaoMin 2024-12-10 16:41:04 +08:00
parent 9b5d6173d8 c36d1a1bbd
commit 1aaa065638
1 changed files with 70 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
pages/workPlan/dayPlan/sub-user/index.vue
View File

@ -247,7 +247,7 @@ export default {
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && !e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
tempPersonList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
@ -309,7 +309,7 @@ export default {
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && !e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
tempPersonList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
@ -333,7 +333,7 @@ export default {
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && !e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
tempPersonList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
@ -361,30 +361,73 @@ export default {
if (this.subUserListTemp.length == 0 && !this.isSearch) { if (this.subUserListTemp.length == 0 && !this.isSearch) {
if (this.personList.length > 0) { if (this.personList.length > 0) {
this.subUserListAll.forEach(e => { this.subUserListAll.forEach(e => {
if (this.personList[this.currentIndex].includes(e.idNumber)) { if (
this.personList[this.currentIndex].length > 0 &&
this.personList[this.currentIndex].includes(e.idNumber)
) {
e.isChecked = true e.isChecked = true
this.subUserListTemp.push(JSON.parse(JSON.stringify(e))) this.subUserListTemp.push(JSON.parse(JSON.stringify(e)))
} }
}) })
let tempArray = this.personList.filter((e, index) => index != this.currentIndex) let tempArray = this.personList.filter((e, index) => index != this.currentIndex)
let tempPersonList = []
if (tempArray.length > 0) { if (tempArray.length > 0) {
this.subUserList = [] this.subUserList = []
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
if (e.length > 1) {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
this.subUserList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
} }
}) })
})
if (tempPersonList.length === 0) {
this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll))
} else {
console.log('进入这里面')
let tempPersonStr = ''
tempPersonList.forEach(e => {
tempPersonStr = tempPersonStr + '@' + e.idNumber
})
this.subUserListAll.forEach(e => {
console.log(tempPersonStr, '---')
if (!tempPersonStr.includes(e.idNumber)) {
this.subUserList.push(e)
} }
}) })
if (this.subUserList.length == 0) { // this.subUserListAll.forEach(e => {
this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll)) // console.log('进入一个神奇的循环')
// tempPersonList.forEach(j => {
// console.log('进入一个神奇的循环99999', j)
// if (!j.idNumber.includes(e.idNumber)) {
// this.subUserList.push(e)
// }
// })
// })
} }
// tempArray.forEach(e => {
// if (e.length > 0) {
// this.subUserListAll.forEach(j => {
// if (!e.includes(j.idNumber)) {
// // this.subUserList.push(j)
// this.subUserList.push(JSON.parse(JSON.stringify(j)))
// // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
// }
// })
// }
// })
// if (this.subUserList.length == 0) {
// this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll))
// }
} else { } else {
this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll)) this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll))
// this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserListAll)) // this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserListAll))
@ -400,7 +443,7 @@ export default {
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && !e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
tempPersonList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
@ -442,7 +485,7 @@ export default {
// this.subUserListTemp // this.subUserListTemp
tempArray.forEach(e => { tempArray.forEach(e => {
this.subUserListAll.forEach(j => { this.subUserListAll.forEach(j => {
if (!e.includes(j.idNumber)) { if (e.length > 0 && !e.includes(j.idNumber)) {
// this.subUserList.push(j) // this.subUserList.push(j)
tempPersonList.push(JSON.parse(JSON.stringify(j))) tempPersonList.push(JSON.parse(JSON.stringify(j)))
// this.subUserListTemp.push(JSON.parse(JSON.stringify(j))) // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
@ -604,8 +647,12 @@ export default {
// 全选 // 全选
onCheckBoxChangeAll(isAllChecked) { onCheckBoxChangeAll(isAllChecked) {
console.log(isAllChecked, 'isAllChecked') console.log(isAllChecked, 'isAllChecked')
this.subUserListTemp = []
this.subUserList.forEach(e => { this.subUserList.forEach(e => {
e.isChecked = !isAllChecked e.isChecked = !isAllChecked
if (e.isChecked) {
this.subUserListTemp.push(e)
}
// this.subUserListAll.forEach(j => { // this.subUserListAll.forEach(j => {
// if (e.idNumber == j.idNumber) { // if (e.idNumber == j.idNumber) {
@ -614,11 +661,11 @@ export default {
// }) // })
}) })
if (this.subUserList.every(e => e.isChecked == true)) { // if (this.subUserList.every(e => e.isChecked == true)) {
this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserList)) // this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserList))
} else { // } else {
this.subUserListTemp = [] // this.subUserListTemp = []
} // }
// this.subUserListTemp.forEach(e => { // this.subUserListTemp.forEach(e => {
// e.isChecked = !e.isChecked // e.isChecked = !e.isChecked
@ -650,12 +697,12 @@ export default {
// }) // })
// } // }
if (this.subUserList.length > 0) return this.subUserList.filter(e => e.isChecked == true).length return this.subUserList.filter(e => e.isChecked === true).length
// return amount // return amount
}, },
isAllChecked() { isAllChecked() {
let isCheckedAll = false let isCheckedAll = false
if (this.subUserList.length > 0) return this.subUserList.every(e => e.isChecked === true) return this.subUserList.every(e => e.isChecked === true)
// if (this.subUserList.length > 0) { // if (this.subUserList.length > 0) {
// isCheckedAll = this.subUserList.every(e => e.isChecked === true) // isCheckedAll = this.subUserList.every(e => e.isChecked === true)