|
@@ -160,7 +160,7 @@ import {getDateRangeFormatDate} from '@/utils/date'
|
|
|
import store from '@/store'
|
|
|
import {clone} from '@/utils/clone.js'
|
|
|
import {ElMessage, ElMessageBox} from 'element-plus'
|
|
|
-import {listIsBlank} from "@/utils/blank-utils";
|
|
|
+import {listIsBlank, stringIsBlank} from "@/utils/blank-utils";
|
|
|
|
|
|
export default {
|
|
|
setup() {
|
|
@@ -212,13 +212,11 @@ export default {
|
|
|
for (let i = 0; i < feiYongData.value.length; i++) {
|
|
|
keQueRenData.value.push(clone(feiYongData.value[i]))
|
|
|
}
|
|
|
- return
|
|
|
+ } else {
|
|
|
+ keQueRenData.value = feiYongData.value.filter(item => {
|
|
|
+ return item.execDept === dept || stringIsBlank(item.execDept)
|
|
|
+ })
|
|
|
}
|
|
|
- feiYongData.value.forEach(item => {
|
|
|
- if ((item.execDept === dept || typeof item.execDept === 'undefined')) {
|
|
|
- keQueRenData.value.push(item)
|
|
|
- }
|
|
|
- })
|
|
|
})
|
|
|
}
|
|
|
|