From e53e0d9cc7472153946147d548f572fd14be13f3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/views/wel/index.vue |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 863ede5..69a47eb 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: '涓婁竴姝ュ鐞嗘椂闂�',
-              prop: 'createTime'
-            },
-            {
-              label: '鎻忚堪',
-              prop: 'description'
+              sortable:true,
+              width:150,
+              prop: 'historyActivityDurationTime'
             },
             {
               label: '涓婁竴姝ユ搷浣滀汉',
-              prop: 'creator_name'
+              sortable:true,
+              width:120,
+              prop: 'historyActivityAssigneName'
+            },
+            {
+              label: '娴佺▼鎻忚堪',
+              prop: 'processDesc',
+              overHidden:true,
+              formatter: (val) => {
+                return  val.variables.processDesc
+              }
             },
             {
               label: '鎵�灞炴祦绋嬫ā鏉�',
+              sortable:true,
+              overHidden:true,
               prop: 'categoryName'
             }
           ]

--
Gitblit v1.9.3