From 2678ff0a8bbb0cc6b6ae4598dbadf52e341ee843 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 23 Jan 2022 03:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bpmn=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B3=A8=E9=87=8A=E6=8E=89=20UserTa?=
 =?UTF-8?q?sk=20=E7=9A=84=E8=A1=A8=E5=8D=95=E3=80=81=E5=80=99=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E9=80=89=E5=9E=8B=EF=BC=8C=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=88=90=E8=87=AA=E5=B7=B1=E7=9A=84=E3=80=90=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E3=80=91=E3=80=90=E4=BB=BB=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E8=A7=84=E5=88=99=E3=80=91=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/PropertiesPanel.vue         |  4 ++-
 .../penal/task/task-components/UserTask.vue   | 33 ++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
index 21d16ecac..646aced78 100644
--- a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -16,7 +16,9 @@
       </el-collapse-item>
       <el-collapse-item name="condition" v-if="formVisible" key="form">
         <div slot="title" class="panel-tab__title"><i class="el-icon-s-order"></i>表单</div>
-        <element-form :id="elementId" :type="elementType" />
+<!--        <element-form :id="elementId" :type="elementType" />-->
+        友情提示：使用 <router-link target="_blank" :to="{path:'/bpm/manager/form'}"><el-link type="danger">流程表单</el-link> </router-link>
+        替代，提供更好的表单设计功能
       </el-collapse-item>
       <el-collapse-item name="task" v-if="elementType.indexOf('Task') !== -1" key="task">
         <div slot="title" class="panel-tab__title"><i class="el-icon-s-claim"></i>任务</div>
diff --git a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 9bd181946..b34681930 100644
--- a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -1,20 +1,20 @@
 <template>
   <div style="margin-top: 16px">
-    <el-form-item label="处理用户">
-      <el-select v-model="userTaskForm.assignee" @change="updateElementTask('assignee')">
-        <el-option v-for="ak in mockData" :key="'ass-' + ak" :label="`用户${ak}`" :value="`user${ak}`" />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="候选用户">
-      <el-select v-model="userTaskForm.candidateUsers" multiple collapse-tags @change="updateElementTask('candidateUsers')">
-        <el-option v-for="uk in mockData" :key="'user-' + uk" :label="`用户${uk}`" :value="`user${uk}`" />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="候选分组">
-      <el-select v-model="userTaskForm.candidateGroups" multiple collapse-tags @change="updateElementTask('candidateGroups')">
-        <el-option v-for="gk in mockData" :key="'ass-' + gk" :label="`分组${gk}`" :value="`group${gk}`" />
-      </el-select>
-    </el-form-item>
+<!--    <el-form-item label="处理用户">-->
+<!--      <el-select v-model="userTaskForm.assignee" @change="updateElementTask('assignee')">-->
+<!--        <el-option v-for="ak in mockData" :key="'ass-' + ak" :label="`用户${ak}`" :value="`user${ak}`" />-->
+<!--      </el-select>-->
+<!--    </el-form-item>-->
+<!--    <el-form-item label="候选用户">-->
+<!--      <el-select v-model="userTaskForm.candidateUsers" multiple collapse-tags @change="updateElementTask('candidateUsers')">-->
+<!--        <el-option v-for="uk in mockData" :key="'user-' + uk" :label="`用户${uk}`" :value="`user${uk}`" />-->
+<!--      </el-select>-->
+<!--    </el-form-item>-->
+<!--    <el-form-item label="候选分组">-->
+<!--      <el-select v-model="userTaskForm.candidateGroups" multiple collapse-tags @change="updateElementTask('candidateGroups')">-->
+<!--        <el-option v-for="gk in mockData" :key="'ass-' + gk" :label="`分组${gk}`" :value="`group${gk}`" />-->
+<!--      </el-select>-->
+<!--    </el-form-item>-->
     <el-form-item label="到期时间">
       <el-input v-model="userTaskForm.dueDate" clearable @change="updateElementTask('dueDate')" />
     </el-form-item>
@@ -24,6 +24,9 @@
     <el-form-item label="优先级">
       <el-input v-model="userTaskForm.priority" clearable @change="updateElementTask('priority')" />
     </el-form-item>
+    友情提示：任务的分配规则，使用
+    <router-link target="_blank" :to="{path:'/bpm/manager/model'}"><el-link type="danger">流程模型</el-link> </router-link>
+    下的【分配规则】替代，提供指定角色、部门负责人、部门成员、岗位、工作组、自定义脚本等 7 种维护的任务分配维度，更加灵活！
   </div>
 </template>