From acbdc978e700a67d54b7a20640e2456c4a016172 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 23 Jul 2024 10:08:03 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=94=B9=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RegulatoryComplianceCheckProcess.vue      |  6 ++++-
 .../modules/EngineerInitBaseInfo.vue          | 25 +++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

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 @@
 
       <!--   业务基本信息和业务分派信息部分   -->
       <!--  节点1、法规工程师发起  -->
-      <engineer-init-base-info v-if="currentNode === 1" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange"></engineer-init-base-info>
+      <engineer-init-base-info v-if="currentNode === 1" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange" @loading="changeLoading"></engineer-init-base-info>
       <!--  节点2、各部门接口人分发  -->
       <interface-person-delivery-base-info v-if="currentNode === 2" ref="baseInfoRef" :disabled="isLook"></interface-person-delivery-base-info>
       <!--  节点3、主排查人分发  -->
@@ -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 = []