From cffd3d06a2f69e4a15aa9465d36c0495247f88ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 12:24:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/work/send.vue |   96 +++++++++++++++++++++++++-----------------------
 1 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index 0a06f88..77c1bae 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -9,6 +9,7 @@
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
+               @row-click="clickRowChange"
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
@@ -63,7 +64,8 @@
         workBox: false,
         option: {
           height: 'auto',
-          calcHeight: 30,
+          calcHeight: 20,
+          columnBtn:false,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -77,50 +79,45 @@
           dialogWidth: 900,
           menuWidth: 150,
           dialogClickModal: false,
-          column: [
-            {
-              label: "娴佺▼鍒嗙被",
-              type: "select",
-              row: true,
-              dicUrl: "/api/blade-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: 'processIsFinished',
-              slot: true,
-              width: 80,
-            },
-            {
-              label: '鐢宠鏃堕棿',
-              prop: 'createTime',
-              width: 165,
-            },
-          ]
+          align: 'center',
+          column: [{
+            label: '娴佺▼鍚嶇О',
+            prop: 'processName',
+            search: true,
+            headerAlign:'center',
+            align:'left',
+            sortable:true,
+            overHidden:true,
+            formatter: (val) => {
+              return val.variables.processName
+            }
+          },  {
+            label: '娴佺▼杩涘害',
+            prop: 'processIsFinished',
+            slot: true,
+            width: 100,
+          }, {
+            label: '褰撳墠姝ラ',
+            prop: 'taskName',
+            width:150
+          }, {
+            label: '鍙戣捣鏃堕棿',
+            sortable:true,
+            width:180,
+            prop: 'processDefinitionStartTime'
+          },{
+            label: '鎵�灞炴祦绋嬫ā鏉�',
+            sortable:true,
+            prop: 'categoryName',
+            width:200
+          }, {
+            label: '娴佺▼鎻忚堪',
+            prop: 'processDesc',
+            overHidden:true,
+            formatter: (val) => {
+              return val.variables.processDesc
+            }
+          }]
         },
         data: []
       };
@@ -146,15 +143,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();
       },
       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