From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/start.vue | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/start.vue b/Source/UBCS-WEB/src/views/work/start.vue
index c7a3898..75ae125 100644
--- a/Source/UBCS-WEB/src/views/work/start.vue
+++ b/Source/UBCS-WEB/src/views/work/start.vue
@@ -1,18 +1,19 @@
<template>
<basic-container>
<avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- v-model="form"
- ref="crud"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ v-model="form"
+ ref="crud"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @row-click="clickRowChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
<template slot="menuLeft">
<el-radio-group v-model="mode" size="small">
<el-radio-button label="1">閫氱敤娴佺▼</el-radio-button>
@@ -23,13 +24,13 @@
<el-button type="text"
size="small"
icon="el-icon-video-play"
- v-if="permission.work_start_flow"
+ v-if="permissionList.startBtn"
@click.stop="handleStart(scope.row)">鍙戣捣
</el-button>
<el-button type="text"
size="small"
icon="el-icon-search"
- v-if="permission.work_start_image"
+ v-if="permissionList.img"
@click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
</el-button>
</template>
@@ -78,7 +79,8 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -151,7 +153,13 @@
}
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
+ ...mapGetters(["permission", "flowRoutes","permission"]),
+ permissionList(){
+ return{
+ startBtn:this.vaildData(this.permission.work_start.work_start_flow,false),
+ img:this.vaildData(this.permission.work_start.work_start_image,false),
+ }
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@@ -171,15 +179,22 @@
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 = [];
this.$refs.crud.toggleSelection();
},
handleStart(row) {
- this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`});
+ this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}?name=` +row.categoryName});
},
handleImage(row) {
this.processDefinitionId = row.id;
--
Gitblit v1.9.3