From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/flow/manager.vue | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index 11d8184..0e4db1b 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -13,6 +13,7 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
+ @row-click="clickRowChange"
@on-load="onLoad">
<template slot="menuLeft">
<el-radio-group v-model="mode" size="small">
@@ -24,19 +25,21 @@
<el-button type="text"
size="small"
icon="el-icon-refresh"
- v-if="permission.flow_manager_state"
- @click.stop="handleState(scope.row,scope.index)">鍙樻洿鐘舵��
+ :style="{color: scope.row.suspensionState === 1 ? '#67C23A' : '#F56C6C'}"
+ v-if="permissionList.state"
+ @click.stop="handleDoState(scope.row, scope.index)">
+ {{ scope.row.suspensionState === 1 ? '婵�娲�' : '鎸傝捣' }}
</el-button>
<el-button type="text"
size="small"
icon="el-icon-search"
- v-if="permission.flow_manager_image"
+ v-if="permissionList.image"
@click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
</el-button>
<el-button type="text"
size="small"
icon="el-icon-delete"
- v-if="permission.flow_manager_remove"
+ v-if="permissionList.delBtn"
@click.stop="handleSlotDelete(scope.row,scope.index)">鍒犻櫎
</el-button>
</template>
@@ -118,7 +121,8 @@
}],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -132,6 +136,7 @@
dialogWidth: 900,
menuWidth: 250,
dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
column: [
{
label: '绉熸埛缂栧彿',
@@ -200,7 +205,9 @@
...mapGetters(["permission"]),
permissionList() {
return {
- delBtn: this.vaildData(this.permission.flow_manager_remove, false),
+ state:this.vaildData(this.permission.flow_manager.flow_manager_state, false),
+ image:this.vaildData(this.permission.flow_manager.flow_manager_image, false),
+ delBtn: this.vaildData(this.permission.flow_manager.flow_manager_delete, false),
};
},
ids() {
@@ -229,8 +236,15 @@
this.onLoad(this.page, params);
done();
},
+ clickRowChange(row){
+ this.$refs.crud.toggleSelection();
+ this.selectionList = row;
+ this.$refs.crud.setCurrentRow(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ },
selectionChange(list) {
this.selectionList = list;
+ this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
},
selectionClear() {
this.selectionList = [];
@@ -280,15 +294,15 @@
this.stateBox = true;
this.selectionId = row.id;
},
- handleDoState() {
- if (!this.flowState) {
- this.$message({
- type: "warn",
- message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
- });
- return;
- }
- changeState({processId: this.selectionId, state: this.flowState}).then(res => {
+ handleDoState(row) {
+ // if (!this.flowState) {
+ // this.$message({
+ // type: "warn",
+ // message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
+ // });
+ // return;
+ // }
+ changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
const data = res.data;
if (data.success) {
this.$message({
--
Gitblit v1.9.3