[update] 法规符合性排查流程

src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue

@@ -179,9 +179,10 @@ import UserSelectModal from '@/components/selection/UserSelectModal'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import { RegulatoryComplianceCheckNodes, ProcessKey } from '../../../enums/commonEnums'
 import {
+  getDataDraft,
   regulatoryComplianceCheckAgree, regulatoryComplianceCheckApproval,
   regulatoryComplianceCheckGetDataById,
-  regulatoryComplianceCheckGetDataDraft, regulatoryComplianceCheckReject,
+  regulatoryComplianceCheckReject,
   regulatoryComplianceCheckSave, regulatoryComplianceCheckTurnTo
 } from '../../../api/workCenter'
 import pick from 'lodash.pick'
@@ -353,7 +354,7 @@ export default {
         func = regulatoryComplianceCheckGetDataById
         params = param.taskId
       } else {
-        func = regulatoryComplianceCheckGetDataDraft
+        func = getDataDraft
         params = param
       }
       func(params).then(res => {

src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue

@@ -198,13 +198,11 @@ import JTable from '@/components/jero/JTable'
 import StandardSelectionModal from '@/components/selection/StandardSelectionModal'
 import { getForeignStandardDetail } from '@/api/standardRegulationLibraryApi'
 import ManualAddModal from './ManualAddModal'
-import STreeSelect from '@/components/STreeSelect'
 import { StandardSource, AddType } from '@/enums/commonEnums'
 import { regulatoryComplianceCheckGenerate } from '@/api/workCenter'
 import { getFormDictTreeList, queryDepartTreeList } from '../../../../api/api'
 import { downloadFile } from '../../../../api/manage'
 import MarketRegulationsListSelection from '../../../../components/selection/MarketRegulationsListSelection'
-import pick from 'lodash.pick'
 
 const uidGenerator = () => {
   return '-' + parseInt(Math.random() * 10000 + 1, 10)
@@ -216,8 +214,7 @@ export default {
     MarketRegulationsListSelection,
     JTable,
     ManualAddModal,
-    StandardSelectionModal,
-    STreeSelect
+    StandardSelectionModal
   },
   props: {
     disabled: {
@@ -384,14 +381,14 @@ export default {
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.modelStatus'),
           align: 'center',
           width: 180,
-          dataIndex: 'modelState',
+          dataIndex: 'modelState_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 责任部门
           title: this.$t('responsibleDepartment'),
           align: 'center',
           width: 180,
-          dataIndex: 'authDept',
+          dataIndex: 'authDept_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -621,12 +618,12 @@ export default {
     // 获取部门在部门下拉框的对象
     getDepartObj (departId, departList) {
       for (const item of departList) {
-        if (item.id === departId) {
+        if (item.key === departId) {
           return item
         }
         if (item.children) {
           const obj = this.getDepartObj(departId, item.children)
-          if (obj.id) {
+          if (obj && obj.key) {
             return obj
           }
         }
@@ -634,7 +631,15 @@ export default {
     },
     // 根据传入的部门获取他的所有子集
     getDepartChildren (dept) {
-
+      let arr = []
+      for (const item of dept) {
+        arr.push(item)
+        if (item.children) {
+          const resArr = this.getDepartChildren(item.children)
+          arr = arr.concat(resArr)
+        }
+      }
+      return arr
     },
     // 查询
     searchQuery () {
@@ -642,10 +647,12 @@ export default {
         // 获取选中的部门的所有子集
         // 先获取选中的部门在部门里的对象
         const obj = this.getDepartObj(this.queryParam.authDept, this.categoryTreeList)
+        console.log('------------obj', obj)
         // 获取选中部门的所有子集id
-
+        const deptArr = this.getDepartChildren([obj]).map(item => item.key)
+        console.log('------------deptArr', deptArr)
         this.dataSource = this.dataList.filter(item => {
-          return item.authDept + '' === this.queryParam.authDept + ''
+          return deptArr.includes(this.queryParam.authDept)
         })
       } else {
         this.dataSource = JSON.parse(JSON.stringify(this.dataList))