From efdfc33415d43d2f97cdfa66a48e3713f6c2fd1a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 20:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/views/wel/index.vue |   38 +++++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index d7ffd1a..aff2c5b 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -13,7 +13,7 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="16">
+      <el-col :span="24">
         <basic-container title="寰呭姙娴佺▼浠诲姟">
           <avue-crud ref="crud" :table-loading="loading" :data="todoData" :option="todoOption"
                      @on-load="onLoad"
@@ -28,18 +28,18 @@
           </avue-crud>
         </basic-container>
       </el-col>
-      <el-col :span="8">
-        <el-row>
-          <basic-container title="娑堟伅鍒楄〃">
-            <el-collapse v-model="logActiveNames" @change="handleChange">
-              <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">
-                <div>{{item.subtitle}}</div>
-              </el-collapse-item>
-            </el-collapse>
-          </basic-container>
-        </el-row>
+<!--      <el-col :span="8">-->
+<!--        <el-row>-->
+<!--          <basic-container title="娑堟伅鍒楄〃">-->
+<!--            <el-collapse v-model="logActiveNames" @change="handleChange">-->
+<!--              <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">-->
+<!--                <div>{{item.subtitle}}</div>-->
+<!--              </el-collapse-item>-->
+<!--            </el-collapse>-->
+<!--          </basic-container>-->
+<!--        </el-row>-->
 
-      </el-col>
+<!--      </el-col>-->
     </el-row>
     <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" append-to-body  :close-on-press-escape="false" :before-close="Xdelhandle">
       <el-form :model="form"  :rules="rules" ref="form">
@@ -86,13 +86,15 @@
         todoData: [],
         // 浠ｅ姙娴佺▼浠诲姟option
         todoOption: {
+          height:650,
           addBtn: false,
           header: false,
           align: 'center',
           index: true,
-          menuWidth: 100,
+          menuWidth: 80,
           editBtn: false,
           delBtn: false,
+          border:true,
           column: [{
             label: '浠诲姟鍚嶇О',
             prop: 'taskName',
@@ -100,6 +102,8 @@
             headerAlign:'center',
             align:'left',
             html: true,
+            width:300,
+            overHidden:true,
             formatter: (val) => {
               return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
             }
@@ -107,16 +111,19 @@
             {
               label: '涓婁竴姝ュ鐞嗘椂闂�',
               sortable:true,
-              prop: 'historyActivityDurationTime'
+              width:150,
+              prop: 'createTime'
             },
             {
               label: '涓婁竴姝ユ搷浣滀汉',
               sortable:true,
+              width:120,
               prop: 'historyActivityAssigneName'
             },
             {
               label: '娴佺▼鎻忚堪',
               prop: 'processDesc',
+              overHidden:true,
               formatter: (val) => {
                 return  val.variables.processDesc
               }
@@ -124,6 +131,7 @@
             {
               label: '鎵�灞炴祦绋嬫ā鏉�',
               sortable:true,
+              overHidden:true,
               prop: 'categoryName'
             }
           ]
@@ -260,7 +268,7 @@
         })
       },
       cellHandle(row, column, cell, event) {
-        if (column.property == 'name') {
+        if (column.property == 'taskName') {
           this.gotodo(row)
         }
       },

--
Gitblit v1.9.3