From c9d1100eacd139c625433aa15e7d5f62e511a211 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 19 Jan 2023 18:19:01 +0800
Subject: [PATCH] perf: task assign rule

---
 yudao-ui-admin-vue3/package.json              |  1 -
 .../src/views/bpm/taskAssignRule/index.vue    | 31 ++++++-------------
 .../bpm/taskAssignRule/taskAssignRule.data.ts |  4 +--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 2302aba48..7da9c5ff1 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -52,7 +52,6 @@
     "vue-i18n": "9.2.2",
     "vue-router": "^4.1.6",
     "vue-types": "^5.0.2",
-    "vue3-treeselect": "^0.1.10",
     "vxe-table": "^4.3.9",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7"
diff --git a/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/index.vue b/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/index.vue
index 7060485cd..d3b6a19b3 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/index.vue
@@ -62,14 +62,14 @@
           span="24"
           v-if="formData.type === 20 || formData.type === 21"
         >
-          <treeselect
+          <el-tree-select
+            ref="treeRef"
             v-model="formData.deptIds"
-            :options="deptTreeOptions"
-            multiple
-            flat
-            :defaultExpandLevel="3"
-            placeholder="请选择指定部门"
-            :normalizer="normalizer"
+            node-key="id"
+            show-checkbox
+            :props="defaultProps"
+            :data="deptTreeOptions"
+            empty-text="加载中，请稍后"
           />
         </el-form-item>
         <el-form-item label="指定岗位" prop="postIds" span="24" v-if="formData.type === 22">
@@ -127,18 +127,13 @@
 </template>
 <script setup lang="ts" name="TaskAssignRule">
 // 全局相关的 import
-import { onMounted, reactive, ref } from 'vue'
-import { ElInput, ElTag, ElOption, ElSelect, ElForm, ElFormItem } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 
 // 业务相关的 import
-import Treeselect from 'vue3-treeselect'
-import 'vue3-treeselect/dist/vue3-treeselect.css'
-import { useXTable } from '@/hooks/web/useXTable'
 import { allSchemas } from './taskAssignRule.data'
 import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule'
 import { listSimpleRolesApi } from '@/api/system/role'
-import { handleTree } from '@/utils/tree'
+import { handleTree, defaultProps } from '@/utils/tree'
 import { listSimplePostsApi } from '@/api/system/post'
 import { getListSimpleUsersApi } from '@/api/system/user'
 import { listSimpleUserGroupsApi } from '@/api/bpm/userGroup'
@@ -168,7 +163,7 @@ const [registerTable] = useXTable({
   allSchemas: allSchemas,
   params: queryParams,
   getListApi: TaskAssignRuleApi.getTaskAssignRuleList,
-  isList: false // TODO 如果 isList 改成 true 时，进入页面不会加载数据
+  isList: true
 })
 // 修改任务责任表单
 const xForm = ref<FormInstance>()
@@ -267,14 +262,6 @@ const getAssignRuleOptionName = (type, option) => {
   }
   return '未知(' + option + ')'
 }
-// 格式化部门的下拉框
-const normalizer = (node) => {
-  return {
-    id: node.id,
-    label: node.name,
-    children: node.children
-  }
-}
 
 // ========== 初始化 ==========
 onMounted(() => {
diff --git a/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/taskAssignRule.data.ts b/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/taskAssignRule.data.ts
index f66a7fbe9..5bb6d2638 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/taskAssignRule.data.ts
+++ b/yudao-ui-admin-vue3/src/views/bpm/taskAssignRule/taskAssignRule.data.ts
@@ -1,6 +1,4 @@
-import { reactive } from 'vue'
-import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
-import { DICT_TYPE } from '@/utils/dict'
+import { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({