From df81835dd02eee62527997adf5a4ea2039b51fa4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 12:14:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/work/claim.vue |   96 +++++++++++++++++++++++++++---------------------
 1 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 6eb9ce6..5257443 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -17,19 +17,19 @@
         <el-button type="text"
                    size="small"
                    icon="el-icon-download"
-                   v-if="permission.work_claim_sign"
+                   v-if="permissionList.signtBtn"
                    @click.stop="handleClaim(scope.row)">绛炬敹
         </el-button>
         <el-button type="text"
                    size="small"
                    icon="el-icon-info"
-                   v-if="permission.work_claim_detail"
+                   v-if="permissionList.detailBtn"
                    @click.stop="handleDetail(scope.row)">璇︽儏
         </el-button>
         <el-button type="text"
                    size="small"
                    icon="el-icon-search"
-                   v-if="permission.work_claim_follow"
+                   v-if="permissionList.follow"
                    @click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
         </el-button>
       </template>
@@ -68,6 +68,7 @@
           calcHeight: 0,
           tip: false,
           simplePage: true,
+          columnBtn:false,
           searchShow: true,
           searchMenuSpan: 6,
           border: true,
@@ -80,50 +81,61 @@
           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: []
       };
     },
     computed: {
-      ...mapGetters(["permission", "flowRoutes"]),
+      ...mapGetters(["permission", "flowRoutes","permission"]),
+      permissionList(){
+        return{
+          signtBtn:this.vaildData(this.permission.work_claim.work_claim_sign,false),
+          detailBtn:this.vaildData(this.permission.work_claim.work_claim_detail,false),
+          follow:this.vaildData(this.permission.work_claim.work_claim_follow,false),
+        }
+      },
       ids() {
         let ids = [];
         this.selectionList.forEach(ele => {

--
Gitblit v1.9.3