Browse Source

fix: 修复流程设计切换人员类型后列表数据未更新问题

master
tony 3 years ago
parent
commit
37957f7cad
  1. 12
      ruoyi-ui/src/components/Process/components/nodePanel/task.vue
  2. 5
      ruoyi-ui/src/components/flow/Role/index.vue
  3. 5
      ruoyi-ui/src/components/flow/User/index.vue

12
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>

5
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,
//

5
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,
//

Loading…
Cancel
Save