From bb98d179dd020e0b003446cb35ce422651ab8acd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/claim.vue | 114 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 63 insertions(+), 51 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 7b18e13..fc71ffd 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -1,17 +1,18 @@
<template>
<basic-container>
<avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- @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"
+ ref="crud"
+ v-model="form"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-click="clickRowChange"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
<template slot-scope="scope" slot="menu">
<el-button type="text"
size="small"
@@ -64,7 +65,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 0,
tip: false,
simplePage: true,
searchShow: true,
@@ -79,44 +80,48 @@
dialogWidth: 900,
menuWidth: 200,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ width:300,
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable:true,
+ width:150,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ width:180,
+ prop: 'processDefinitionStartTime'
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ width:200,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
@@ -144,6 +149,13 @@
},
selectionChange(list) {
this.selectionList = list;
+ this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
+ },
+ clickRowChange(row){
+ this.$refs.crud.toggleSelection();
+ this.selectionList = row;
+ this.$refs.crud.setCurrentRow(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
},
selectionClear() {
this.selectionList = [];
@@ -167,7 +179,7 @@
});
},
handleDetail(row) {
- this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`});
+ this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}?name=` +row.categoryName+'璇︽儏'});
},
handleImage(row) {
this.processInstanceId = row.processInstanceId;
--
Gitblit v1.9.3