From ce16808cb1c192e1c657b831aee98484f5780d95 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 25 Jul 2024 08:10:51 +0800
Subject: [PATCH 1/5] =?UTF-8?q?/components/bpmnProcessDesigner/package/pen?=
 =?UTF-8?q?al/task/task-components/=20=E8=B7=AF=E5=BE=84=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=20DeptTree=20=E7=94=A8=E4=BA=8E=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=83=A8=E9=97=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/task-components/DeptTree_Task.vue    | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue
new file mode 100644
index 0000000..5a307ca
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="head-container">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称"  style="width: 280px">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
+  <div class="head-container">
+    <el-tree
+      ref="treeRef"
+      :data="deptList"
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+      :props="defaultProps"
+      highlight-current
+      node-key="id"
+      @node-click="handleNodeClick"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ElTree } from 'element-plus'
+import * as DeptApi from '@/api/system/dept'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+defineOptions({ name: 'SystemUserDeptTree' })
+
+const deptName = ref('')
+const deptList = ref<Tree[]>([]) // 树形结构
+const treeRef = ref<InstanceType<typeof ElTree>>()
+
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await DeptApi.getSimpleDeptList()
+  deptList.value = []
+  deptList.value.push(...handleTree(res))
+}
+
+/** 基于名字过滤 */
+const filterNode = (name: string, data: Tree) => {
+  if (!name) return true
+  return data.name.includes(name)
+}
+
+/** 处理部门被点击 */
+const handleNodeClick = async (row: { [key: string]: any }) => {
+  emits('node-click', row)
+}
+const emits = defineEmits(['node-click'])
+
+/** 监听deptName */
+watch(deptName, (val) => {
+  treeRef.value!.filter(val)
+})
+
+/** 初始化 */
+onMounted(async () => {
+  await getTree()
+})
+</script>

From 89ab1a838981433cd74ec4cefcdf6c267479bffc Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 25 Jul 2024 08:12:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E4=BA=86=E4=B8=A4=E7=A7=8D?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0=E9=80=89=E6=8B=A9=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=90=8E=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=20=E9=83=BD=E8=BF=98=E6=B2=A1=E5=81=9A?=
 =?UTF-8?q?=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/task/task-components/UserTask.vue   |  45 ++-
 .../penal/task/task-components/UserTaskbk.vue | 259 ++++++++++++++++++
 2 files changed, 300 insertions(+), 4 deletions(-)
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 0dffeb0..c05d054 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -64,6 +64,14 @@
         <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
     </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 30"
+      label="用户部门"
+      prop="candidateParam"
+      span="24"
+    >
+      <DeptTree @node-click="handleDeptNodeClick" />
+    </el-form-item>
     <el-form-item
       v-if="userTaskForm.candidateStrategy == 30"
       label="指定用户"
@@ -77,11 +85,12 @@
         style="width: 100%"
         @change="updateElementTask"
       >
+        <!--          v-for="item in userOptions"-->
         <el-option
-          v-for="item in userOptions"
-          :key="item.id"
-          :label="item.nickname"
-          :value="item.id"
+          v-for="item in list"
+          :key="item['deptId']"
+          :label="item['nickname']"
+          :value="item['deptId']"
         />
       </el-select>
     </el-form-item>
@@ -135,6 +144,7 @@ import * as PostApi from '@/api/system/post'
 import * as UserApi from '@/api/system/user'
 import * as UserGroupApi from '@/api/bpm/userGroup'
 import ProcessExpressionDialog from './ProcessExpressionDialog.vue'
+import DeptTree from '@/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue'
 
 defineOptions({ name: 'UserTask' })
 const props = defineProps({
@@ -153,6 +163,33 @@ const deptTreeOptions = ref() // 部门树
 const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  username: undefined,
+  mobile: undefined,
+  status: undefined,
+  deptId: undefined,
+  deptName: undefined,
+  createTime: []
+})
+const list = ref([]) // 列表的数
+/** 查询列表 */
+const getList = async () => {
+    try {
+      const data = await UserApi.getUserPage(queryParams)
+      list.value = data.list
+      console.log('list.value',list.value)
+    } finally {
+    }
+  }
+/** 处理部门被点击 */
+const handleDeptNodeClick = async (row) => {
+  console.log('row.id',row)
+  queryParams.deptId = row.id
+  await getList()
+}
 
 const resetTaskForm = () => {
   const businessObject = bpmnElement.value.businessObject
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue
new file mode 100644
index 0000000..0bb89c4
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue
@@ -0,0 +1,259 @@
+<template>
+  <el-form label-width="100px">
+    <el-form-item label="规则类型" prop="candidateStrategy">
+      <el-select
+        v-model="userTaskForm.candidateStrategy"
+        clearable
+        style="width: 100%"
+        @change="changeCandidateStrategy"
+      >
+        <el-option
+          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_CANDIDATE_STRATEGY)"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 10"
+      label="指定角色"
+      prop="candidateParam"
+    >
+      <el-select
+        v-model="userTaskForm.candidateParam"
+        clearable
+        multiple
+        style="width: 100%"
+        @change="updateElementTask"
+      >
+        <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 20 || userTaskForm.candidateStrategy == 21"
+      label="指定部门"
+      prop="candidateParam"
+      span="24"
+    >
+      <el-tree-select
+        ref="treeRef"
+        v-model="userTaskForm.candidateParam"
+        :data="deptTreeOptions"
+        :props="defaultProps"
+        empty-text="加载中，请稍后"
+        multiple
+        node-key="id"
+        show-checkbox
+        @change="updateElementTask"
+      />
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 22"
+      label="指定岗位"
+      prop="candidateParam"
+      span="24"
+    >
+      <el-select
+        v-model="userTaskForm.candidateParam"
+        clearable
+        multiple
+        style="width: 100%"
+        @change="updateElementTask"
+      >
+        <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 30"
+      label="用户部门"
+      prop="candidateParam"
+      span="24"
+    >
+      <DeptTree @node-click="handleDeptNodeClick" />
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy == 30"
+      label="指定用户"
+      prop="candidateParam"
+      span="24"
+    >
+      <el-select
+        v-model="userTaskForm.candidateParam"
+        clearable
+        multiple
+        style="width: 100%"
+        @change="updateElementTask"
+      >
+        <el-option
+          v-for="item in userOptions2"
+          :key="item['id']"
+          :label="item['nickname']"
+          :value="item['id']"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy === 40"
+      label="指定用户组"
+      prop="candidateParam"
+    >
+      <el-select
+        v-model="userTaskForm.candidateParam"
+        clearable
+        multiple
+        style="width: 100%"
+        @change="updateElementTask"
+      >
+        <el-option
+          v-for="item in userGroupOptions"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      v-if="userTaskForm.candidateStrategy === 60"
+      label="流程表达式"
+      prop="candidateParam"
+    >
+      <el-input
+        type="textarea"
+        v-model="userTaskForm.candidateParam[0]"
+        clearable
+        style="width: 72%"
+        @change="updateElementTask"
+      />
+      <el-button class="ml-5px" size="small" type="success" @click="openProcessExpressionDialog"
+      >选择表达式</el-button
+      >
+      <!-- 选择弹窗 -->
+      <ProcessExpressionDialog ref="processExpressionDialogRef" @select="selectProcessExpression" />
+    </el-form-item>
+  </el-form>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as RoleApi from '@/api/system/role'
+import * as DeptApi from '@/api/system/dept'
+import * as PostApi from '@/api/system/post'
+import * as UserApi from '@/api/system/user'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+import ProcessExpressionDialog from './ProcessExpressionDialog.vue'
+import DeptTree from '@/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue'
+
+defineOptions({ name: 'UserTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+//通过部门拿取对应用户
+let i=0
+let userOptions2 = ref([]);
+const handleDeptNodeClick = async (row) => {
+  i=0
+  userOptions2.value = []
+  console.log(i)
+  console.log('row.id',row.id)
+  console.log('userOptions',userOptions)
+  for (i; i<userOptions.value.length; i++){
+    if (userOptions.value[i].deptId === row.id){
+      userOptions2.value.push(userOptions["value"][i])
+      console.log('userOptions.value[i]',"  ",userOptions.value[i]['nickname'],"  ",userOptions.value[i]['deptId'],"  ",userOptions.value[i]['id'])
+    }
+  }
+  console.log('userOptions2',userOptions2)
+}
+
+const userTaskForm = ref({
+  candidateStrategy: undefined, // 分配规则
+  candidateParam: [] // 分配选项
+})
+const bpmnElement = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
+const deptTreeOptions = ref() // 部门树
+const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
+const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+
+const resetTaskForm = () => {
+  const businessObject = bpmnElement.value.businessObject
+  if (!businessObject) {
+    return
+  }
+  if (businessObject.candidateStrategy != undefined) {
+    userTaskForm.value.candidateStrategy = parseInt(businessObject.candidateStrategy) as any
+  } else {
+    userTaskForm.value.candidateStrategy = undefined
+  }
+  if (businessObject.candidateParam && businessObject.candidateParam.length > 0) {
+    if (userTaskForm.value.candidateStrategy === 60) {
+      // 特殊：流程表达式，只有一个 input 输入框
+      userTaskForm.value.candidateParam = [businessObject.candidateParam]
+    } else {
+      userTaskForm.value.candidateParam = businessObject.candidateParam
+        .split(',')
+        .map((item) => +item)
+    }
+  } else {
+    userTaskForm.value.candidateParam = []
+  }
+}
+
+/** 更新 candidateStrategy 字段时，需要清空 candidateParam，并触发 bpmn 图更新 */
+const changeCandidateStrategy = () => {
+  userTaskForm.value.candidateParam = []
+  updateElementTask()
+}
+
+/** 选中某个 options 时候，更新 bpmn 图  */
+const updateElementTask = () => {
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    candidateStrategy: userTaskForm.value.candidateStrategy,
+    candidateParam: userTaskForm.value.candidateParam.join(',')
+  })
+}
+
+// 打开监听器弹窗
+const processExpressionDialogRef = ref()
+const openProcessExpressionDialog = async () => {
+  processExpressionDialogRef.value.open()
+}
+const selectProcessExpression = (expression) => {
+  userTaskForm.value.candidateParam = [expression.expression]
+}
+
+watch(
+  () => props.id,
+  () => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      resetTaskForm()
+    })
+  },
+  { immediate: true }
+)
+
+onMounted(async () => {
+  // 获得角色列表
+  roleOptions.value = await RoleApi.getSimpleRoleList()
+  // 获得部门列表
+  const deptOptions = await DeptApi.getSimpleDeptList()
+  deptTreeOptions.value = handleTree(deptOptions, 'id')
+  // 获得岗位列表
+  postOptions.value = await PostApi.getSimplePostList()
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 获得用户组列表
+  userGroupOptions.value = await UserGroupApi.getUserGroupSimpleList()
+})
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+</script>

From d8509278e9c31459dffc90085fbfabb6d9a60ca6 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:19:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?/views/bpm/group/DeptTree=5FGroup.vue'=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=99=E4=B8=AA=E6=96=87=E4=BB=B6=20?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E4=BA=BA=E5=91=98=E5=88=86=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/group/DeptTree_Group.vue | 62 ++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/views/bpm/group/DeptTree_Group.vue

diff --git a/src/views/bpm/group/DeptTree_Group.vue b/src/views/bpm/group/DeptTree_Group.vue
new file mode 100644
index 0000000..e432f17
--- /dev/null
+++ b/src/views/bpm/group/DeptTree_Group.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="head-container">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称"  style="width: 600PX">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
+  <div class="head-container">
+    <el-tree
+      ref="treeRef"
+      :data="deptList"
+      :expand-on-click-node="false"
+      :filter-node-method="filterNode"
+      :props="defaultProps"
+      highlight-current
+      node-key="id"
+      @node-click="handleNodeClick"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ElTree } from 'element-plus'
+import * as DeptApi from '@/api/system/dept'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+defineOptions({ name: 'SystemUserDeptTree' })
+
+const deptName = ref('')
+const deptList = ref<Tree[]>([]) // 树形结构
+const treeRef = ref<InstanceType<typeof ElTree>>()
+
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await DeptApi.getSimpleDeptList()
+  deptList.value = []
+  deptList.value.push(...handleTree(res))
+}
+
+/** 基于名字过滤 */
+const filterNode = (name: string, data: Tree) => {
+  if (!name) return true
+  return data.name.includes(name)
+}
+
+/** 处理部门被点击 */
+const handleNodeClick = async (row: { [key: string]: any }) => {
+  emits('node-click', row)
+}
+const emits = defineEmits(['node-click'])
+
+/** 监听deptName */
+watch(deptName, (val) => {
+  treeRef.value!.filter(val)
+})
+
+/** 初始化 */
+onMounted(async () => {
+  await getTree()
+})
+</script>

From 85922c0733364b7b9a5f3203e9699882f0546b2b Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:20:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8id=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/task/task-components/UserTask.vue   | 13 ++++----
 src/views/bpm/group/UserGroupForm.vue         | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index c05d054..31e9d47 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -85,12 +85,11 @@
         style="width: 100%"
         @change="updateElementTask"
       >
-        <!--          v-for="item in userOptions"-->
         <el-option
-          v-for="item in list"
-          :key="item['deptId']"
+          v-for="item in userOptions"
+          :key="item['id']"
           :label="item['nickname']"
-          :value="item['deptId']"
+          :value="item['id']"
         />
       </el-select>
     </el-form-item>
@@ -163,6 +162,7 @@ const deptTreeOptions = ref() // 部门树
 const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -174,13 +174,12 @@ const queryParams = reactive({
   deptName: undefined,
   createTime: []
 })
-const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
     try {
       const data = await UserApi.getUserPage(queryParams)
-      list.value = data.list
-      console.log('list.value',list.value)
+      userOptions.value = data.list
+      // console.log('userOptions.value',userOptions.value)
     } finally {
     }
   }
diff --git a/src/views/bpm/group/UserGroupForm.vue b/src/views/bpm/group/UserGroupForm.vue
index ac0cfcb..5d5b527 100644
--- a/src/views/bpm/group/UserGroupForm.vue
+++ b/src/views/bpm/group/UserGroupForm.vue
@@ -13,6 +13,9 @@
       <el-form-item label="描述">
         <el-input v-model="formData.description" placeholder="请输入描述" type="textarea" />
       </el-form-item>
+      <el-form-item label="部门">
+        <DeptTree @node-click="handleDeptNodeClick" />
+      </el-form-item>
       <el-form-item label="成员" prop="userIds">
         <el-select v-model="formData.userIds" multiple placeholder="请选择成员">
           <el-option
@@ -42,6 +45,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
+import DeptTree from '@/views/bpm/group/DeptTree_Group.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as UserGroupApi from '@/api/bpm/userGroup'
@@ -72,6 +76,33 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const userList = ref<any[]>([]) // 用户列表
 
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  username: undefined,
+  mobile: undefined,
+  status: undefined,
+  deptId: undefined,
+  deptName: undefined,
+  createTime: []
+})
+/** 查询列表 */
+const getList = async () => {
+  try {
+    const data = await UserApi.getUserPage(queryParams)
+    userList.value = data.list
+    // console.log('userList',userList.value)
+  } finally {
+  }
+}
+/** 处理部门被点击 */
+const handleDeptNodeClick = async (row) => {
+  console.log('row.id',row)
+  queryParams.deptId = row.id
+  await getList()
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true

From 3ac9a8c740d6b6c8a58fe913f7c0b7a72b3550e1 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:20:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=A6=E4=B8=80?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/task/task-components/UserTaskbk.vue | 259 ------------------
 1 file changed, 259 deletions(-)
 delete mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue
deleted file mode 100644
index 0bb89c4..0000000
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTaskbk.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-  <el-form label-width="100px">
-    <el-form-item label="规则类型" prop="candidateStrategy">
-      <el-select
-        v-model="userTaskForm.candidateStrategy"
-        clearable
-        style="width: 100%"
-        @change="changeCandidateStrategy"
-      >
-        <el-option
-          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_CANDIDATE_STRATEGY)"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy == 10"
-      label="指定角色"
-      prop="candidateParam"
-    >
-      <el-select
-        v-model="userTaskForm.candidateParam"
-        clearable
-        multiple
-        style="width: 100%"
-        @change="updateElementTask"
-      >
-        <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy == 20 || userTaskForm.candidateStrategy == 21"
-      label="指定部门"
-      prop="candidateParam"
-      span="24"
-    >
-      <el-tree-select
-        ref="treeRef"
-        v-model="userTaskForm.candidateParam"
-        :data="deptTreeOptions"
-        :props="defaultProps"
-        empty-text="加载中，请稍后"
-        multiple
-        node-key="id"
-        show-checkbox
-        @change="updateElementTask"
-      />
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy == 22"
-      label="指定岗位"
-      prop="candidateParam"
-      span="24"
-    >
-      <el-select
-        v-model="userTaskForm.candidateParam"
-        clearable
-        multiple
-        style="width: 100%"
-        @change="updateElementTask"
-      >
-        <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy == 30"
-      label="用户部门"
-      prop="candidateParam"
-      span="24"
-    >
-      <DeptTree @node-click="handleDeptNodeClick" />
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy == 30"
-      label="指定用户"
-      prop="candidateParam"
-      span="24"
-    >
-      <el-select
-        v-model="userTaskForm.candidateParam"
-        clearable
-        multiple
-        style="width: 100%"
-        @change="updateElementTask"
-      >
-        <el-option
-          v-for="item in userOptions2"
-          :key="item['id']"
-          :label="item['nickname']"
-          :value="item['id']"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy === 40"
-      label="指定用户组"
-      prop="candidateParam"
-    >
-      <el-select
-        v-model="userTaskForm.candidateParam"
-        clearable
-        multiple
-        style="width: 100%"
-        @change="updateElementTask"
-      >
-        <el-option
-          v-for="item in userGroupOptions"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-      v-if="userTaskForm.candidateStrategy === 60"
-      label="流程表达式"
-      prop="candidateParam"
-    >
-      <el-input
-        type="textarea"
-        v-model="userTaskForm.candidateParam[0]"
-        clearable
-        style="width: 72%"
-        @change="updateElementTask"
-      />
-      <el-button class="ml-5px" size="small" type="success" @click="openProcessExpressionDialog"
-      >选择表达式</el-button
-      >
-      <!-- 选择弹窗 -->
-      <ProcessExpressionDialog ref="processExpressionDialogRef" @select="selectProcessExpression" />
-    </el-form-item>
-  </el-form>
-</template>
-
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { defaultProps, handleTree } from '@/utils/tree'
-import * as RoleApi from '@/api/system/role'
-import * as DeptApi from '@/api/system/dept'
-import * as PostApi from '@/api/system/post'
-import * as UserApi from '@/api/system/user'
-import * as UserGroupApi from '@/api/bpm/userGroup'
-import ProcessExpressionDialog from './ProcessExpressionDialog.vue'
-import DeptTree from '@/components/bpmnProcessDesigner/package/penal/task/task-components/DeptTree_Task.vue'
-
-defineOptions({ name: 'UserTask' })
-const props = defineProps({
-  id: String,
-  type: String
-})
-//通过部门拿取对应用户
-let i=0
-let userOptions2 = ref([]);
-const handleDeptNodeClick = async (row) => {
-  i=0
-  userOptions2.value = []
-  console.log(i)
-  console.log('row.id',row.id)
-  console.log('userOptions',userOptions)
-  for (i; i<userOptions.value.length; i++){
-    if (userOptions.value[i].deptId === row.id){
-      userOptions2.value.push(userOptions["value"][i])
-      console.log('userOptions.value[i]',"  ",userOptions.value[i]['nickname'],"  ",userOptions.value[i]['deptId'],"  ",userOptions.value[i]['id'])
-    }
-  }
-  console.log('userOptions2',userOptions2)
-}
-
-const userTaskForm = ref({
-  candidateStrategy: undefined, // 分配规则
-  candidateParam: [] // 分配选项
-})
-const bpmnElement = ref()
-const bpmnInstances = () => (window as any)?.bpmnInstances
-
-const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
-const deptTreeOptions = ref() // 部门树
-const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
-const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
-const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
-
-const resetTaskForm = () => {
-  const businessObject = bpmnElement.value.businessObject
-  if (!businessObject) {
-    return
-  }
-  if (businessObject.candidateStrategy != undefined) {
-    userTaskForm.value.candidateStrategy = parseInt(businessObject.candidateStrategy) as any
-  } else {
-    userTaskForm.value.candidateStrategy = undefined
-  }
-  if (businessObject.candidateParam && businessObject.candidateParam.length > 0) {
-    if (userTaskForm.value.candidateStrategy === 60) {
-      // 特殊：流程表达式，只有一个 input 输入框
-      userTaskForm.value.candidateParam = [businessObject.candidateParam]
-    } else {
-      userTaskForm.value.candidateParam = businessObject.candidateParam
-        .split(',')
-        .map((item) => +item)
-    }
-  } else {
-    userTaskForm.value.candidateParam = []
-  }
-}
-
-/** 更新 candidateStrategy 字段时，需要清空 candidateParam，并触发 bpmn 图更新 */
-const changeCandidateStrategy = () => {
-  userTaskForm.value.candidateParam = []
-  updateElementTask()
-}
-
-/** 选中某个 options 时候，更新 bpmn 图  */
-const updateElementTask = () => {
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-    candidateStrategy: userTaskForm.value.candidateStrategy,
-    candidateParam: userTaskForm.value.candidateParam.join(',')
-  })
-}
-
-// 打开监听器弹窗
-const processExpressionDialogRef = ref()
-const openProcessExpressionDialog = async () => {
-  processExpressionDialogRef.value.open()
-}
-const selectProcessExpression = (expression) => {
-  userTaskForm.value.candidateParam = [expression.expression]
-}
-
-watch(
-  () => props.id,
-  () => {
-    bpmnElement.value = bpmnInstances().bpmnElement
-    nextTick(() => {
-      resetTaskForm()
-    })
-  },
-  { immediate: true }
-)
-
-onMounted(async () => {
-  // 获得角色列表
-  roleOptions.value = await RoleApi.getSimpleRoleList()
-  // 获得部门列表
-  const deptOptions = await DeptApi.getSimpleDeptList()
-  deptTreeOptions.value = handleTree(deptOptions, 'id')
-  // 获得岗位列表
-  postOptions.value = await PostApi.getSimplePostList()
-  // 获得用户列表
-  userOptions.value = await UserApi.getSimpleUserList()
-  // 获得用户组列表
-  userGroupOptions.value = await UserGroupApi.getUserGroupSimpleList()
-})
-
-onBeforeUnmount(() => {
-  bpmnElement.value = null
-})
-</script>