From 37957f7cadc83e946cffbab45adaa88bf3f6cb65 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Tue, 27 Dec 2022 14:39:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=88=87=E6=8D=A2=E4=BA=BA=E5=91=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=90=8E=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Process/components/nodePanel/task.vue | 12 ++++++------
 ruoyi-ui/src/components/flow/Role/index.vue          |  5 ++---
 ruoyi-ui/src/components/flow/User/index.vue          |  5 ++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index 5d61809d..48472a04 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -20,10 +20,10 @@
           <el-input placeholder="请选择人员" class="input-with-select" v-model="checkValues">
               <template slot="append">
                 <!--指定用户-->
-                <el-button style="padding-left: 7px" size="mini" icon="el-icon-user" @click="singleUserCheck"/>
+                <el-button style="padding-left: 7px" icon="el-icon-user" @click="singleUserCheck"/>
                 <el-divider direction="vertical"></el-divider>
                 <!--选择表达式-->
-                <el-button style="padding-right: 7px" size="mini" icon="el-icon-postcard" @click="singleExpCheck('assignee')"/>
+                <el-button style="padding-right: 7px" icon="el-icon-postcard" @click="singleExpCheck('assignee')"/>
               </template>
           </el-input>
       </template>
@@ -31,10 +31,10 @@
           <el-input placeholder="请选择候选用户" class="input-with-select" v-model="checkValues">
             <template slot="append">
               <!--候选用户-->
-              <el-button style="padding-left: 7px" size="mini" icon="el-icon-user" @click="multipleUserCheck"/>
+              <el-button style="padding-left: 7px" icon="el-icon-user" @click="multipleUserCheck"/>
               <el-divider direction="vertical"></el-divider>
               <!--选择表达式-->
-              <el-button style="padding-right: 7px" size="mini" icon="el-icon-postcard" @click="singleExpCheck('candidateUsers')"/>
+              <el-button style="padding-right: 7px" icon="el-icon-postcard" @click="singleExpCheck('candidateUsers')"/>
             </template>
           </el-input>
       </template>
@@ -42,10 +42,10 @@
         <el-input placeholder="请选择候选角色" class="input-with-select" v-model="checkValues">
           <template slot="append">
           <!--候选角色-->
-            <el-button style="padding-left: 7px" size="mini" icon="el-icon-user" @click="multipleRoleCheck"/>
+            <el-button style="padding-left: 7px" icon="el-icon-user" @click="multipleRoleCheck"/>
             <el-divider direction="vertical"></el-divider>
               <!--选择表达式-->
-            <el-button style="padding-right: 7px" size="mini" icon="el-icon-postcard" @click="singleExpCheck('candidateGroups')"/>
+            <el-button style="padding-right: 7px" icon="el-icon-postcard" @click="singleExpCheck('candidateGroups')"/>
           </template>
         </el-input>
       </template>
diff --git a/ruoyi-ui/src/components/flow/Role/index.vue b/ruoyi-ui/src/components/flow/Role/index.vue
index 8bb4518b..11d4a21d 100644
--- a/ruoyi-ui/src/components/flow/Role/index.vue
+++ b/ruoyi-ui/src/components/flow/Role/index.vue
@@ -16,7 +16,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-if="selectType === 'multiple'" ref="dataTable"  v-loading="loading" :data="roleList" @selection-change="handleMultipleRoleSelect">
+    <el-table v-show="checkType === 'multiple'" ref="dataTable"  v-loading="loading" :data="roleList" @selection-change="handleMultipleRoleSelect">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
@@ -28,7 +28,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-else v-loading="loading" :data="roleList" @current-change="handleSingleRoleSelect">
+    <el-table v-show="checkType === 'single'" v-loading="loading" :data="roleList" @current-change="handleSingleRoleSelect">
       <el-table-column  width="55" align="center" >
         <template slot-scope="scope">
           <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
@@ -80,7 +80,6 @@ export default {
   },
   data() {
     return {
-      selectType: this.checkType,
       // 遮罩层
       loading: true,
       // 选中数组
diff --git a/ruoyi-ui/src/components/flow/User/index.vue b/ruoyi-ui/src/components/flow/User/index.vue
index 90b4b827..45469871 100644
--- a/ruoyi-ui/src/components/flow/User/index.vue
+++ b/ruoyi-ui/src/components/flow/User/index.vue
@@ -53,7 +53,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-if="selectType === 'multiple'" ref="dataTable" v-loading="loading" :data="userList" @selection-change="handleMultipleUserSelect">
+        <el-table v-show="checkType === 'multiple'" ref="dataTable" v-loading="loading" :data="userList" @selection-change="handleMultipleUserSelect">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -61,7 +61,7 @@
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
         </el-table>
-        <el-table v-else v-loading="loading" :data="userList" @current-change="handleSingleUserSelect">
+        <el-table v-show="checkType === 'single'" v-loading="loading" :data="userList" @current-change="handleSingleUserSelect">
           <el-table-column  width="55" align="center" >
             <template slot-scope="scope">
               <el-radio v-model="radioSelected" :label="scope.row.userId">&nbsp;</el-radio>
@@ -112,7 +112,6 @@ export default {
   },
   data() {
     return {
-      selectType: this.checkType,
       // 遮罩层
       loading: true,
       // 选中数组