diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index b9889f0..bdb33e4 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -87,7 +87,7 @@ - + @@ -466,6 +466,10 @@ export default { this.processInfoForm.setFieldsValue(pick(param, 'processName')) }) }, + // 子组件控制loading + changeLoading (loading) { + this.loading = loading + }, // 不可驳回的回调 disabledReject () { this.rejectDisabled = true diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue index 32d6934..e3a4da1 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue @@ -154,6 +154,8 @@ style="width: 100%" :tree-data="categoryTreeList" show-search + tree-checkable + treeCheckStrictly :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect') + $t('responsibleDepartment')" /> @@ -674,6 +676,7 @@ export default { this.$refs.ruleForm.validate(valid => { console.log('-----valid', valid) if (valid) { + this.$emit('loading', true) // 获取下方那个表格信息 const param = Object.assign({}, this.standardDataSource[0], this.formInline) regulatoryComplianceCheckGenerate(param).then(res => { @@ -689,6 +692,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.$emit('loading', false) }) } }) @@ -729,15 +734,20 @@ export default { // 查询 searchQuery () { if (this.queryParam.authDept) { - // 获取选中的部门的所有子集 - // 先获取选中的部门在部门里的对象 - const obj = this.getDepartObj(this.queryParam.authDept, this.categoryTreeList) - console.log('------------obj', obj) + const objArr = [] + for (const item of this.queryParam.authDept) { + // 获取选中的部门的所有子集 + // 先获取选中的部门在部门里的对象 + const obj = this.getDepartObj(item.value, this.categoryTreeList) + console.log('------------obj', obj) + objArr.push(obj) + } // 获取选中部门的所有子集id - const deptArr = this.getDepartChildren([obj]).map(item => item.key) + const deptArr = this.getDepartChildren(objArr).map(item => item.key) console.log('------------deptArr', deptArr) - this.dataSource = this.dataList.filter(item => { - return deptArr.includes(item.authDept) + this.dataSource = this.dataList.filter(data => { + const authDept = data.authDept ? data.authDept.split(',') : [] + return deptArr.some(item => authDept.includes(item)) }) } else { this.dataSource = JSON.parse(JSON.stringify(this.dataList)) @@ -747,6 +757,7 @@ export default { }, // 重置 searchReset () { + this.queryParam = {} this.dataSource = JSON.parse(JSON.stringify(this.dataList)) this.selectedRowKeys = [] this.selectionRows = []