From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/wel/index.vue |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 863ede5..e5f02a9 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -90,31 +90,47 @@
           header: false,
           align: 'center',
           index: true,
-          menuWidth: 100,
+          menuWidth: 80,
           editBtn: false,
           delBtn: false,
+          border:true,
           column: [{
             label: '浠诲姟鍚嶇О',
-            prop: 'name',
+            prop: 'taskName',
+            sortable:true,
+            headerAlign:'center',
+            align:'left',
             html: true,
+            width:300,
+            overHidden:true,
             formatter: (val) => {
-              return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.taskName + '</a>'
+              return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
             }
           },
             {
               label: '涓婁竴姝ュ鐞嗘椂闂�',
+              sortable:true,
+              width:150,
               prop: 'createTime'
             },
             {
-              label: '鎻忚堪',
-              prop: 'description'
+              label: '涓婁竴姝ユ搷浣滀汉',
+              sortable:true,
+              width:120,
+              prop: 'historyActivityAssigneName'
             },
             {
-              label: '涓婁竴姝ユ搷浣滀汉',
-              prop: 'creator_name'
+              label: '娴佺▼鎻忚堪',
+              prop: 'processDesc',
+              overHidden:true,
+              formatter: (val) => {
+                return  val.variables.processDesc
+              }
             },
             {
               label: '鎵�灞炴祦绋嬫ā鏉�',
+              sortable:true,
+              overHidden:true,
               prop: 'categoryName'
             }
           ]
@@ -251,7 +267,7 @@
         })
       },
       cellHandle(row, column, cell, event) {
-        if (column.property == 'name') {
+        if (column.property == 'taskName') {
           this.gotodo(row)
         }
       },

--
Gitblit v1.9.3