From e90fea95905f523d278c7e10a181ddbc47e74c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 15:44:58 +0800
Subject: [PATCH] 集成日志bug

---
 Source/UBCS-WEB/src/views/docking/data.vue |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 1f442e8..61e3788 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -38,7 +38,8 @@
     },
     data:[],
     option: {
-      calcHeight: 30,
+      height:'auto',
+      calcHeight: 0,
       tip: false,
       searchShow: false,
       searchMenuSpan: 6,
@@ -54,62 +55,74 @@
           prop: "id",
           search: true,
           sortable:true,
-          width:150
+          // width:150
         },
         {
           label: "鍥惧彿",
-          prop: "uniquecode",
+          prop: "uniqueCode",
           search: true,
+          hide:true,
           sortable:true
         },
         {
-          label: '鍒嗙被id',
-          prop: 'classifyid',
+          label: '鍒嗙被浠e彿',
+          prop: 'classifyId',
           search: true,
           sortable:true,
-          width: 250
+          // width: 250
         },
         {
           label: '鍒嗙被鍚嶇О',
-          prop: 'classifyname',
+          prop: 'classifyName',
           search: true,
-          sortable:true
+          sortable:true,
         },
         {
           label: '涓氬姟绫诲瀷oid',
-          prop: 'btmoid',
+          prop: 'btmOid',
           sortable:true,
-          width: 150
+          hide:true,
+          // width: 250
         },
         {
           label: '涓氬姟绫诲瀷id',
-          prop: 'btmid',
+          prop: 'btmId',
           sortable:true,
-          width: 150
+          // width: 150
         },
         {
           label: '鎺ㄩ�佺被鍨�',
-          prop: 'sendtype',
+          prop: 'sendType',
           search: true,
           sortable:true,
-          width: 150
+          // width: 150,
+          formatter: function (row, column) {
+            if (row.sendType === 'Enabled') {
+              return '鍙戝竷';
+            } else if (row.sendType === 'TakeBack') {
+              return '鍥炴敹';
+            } else if (row.sendType === 'Disabled') {
+              return '鍋滅敤';
+            }
+          }
         },
         {
           label: '鏄惁鍒嗚В浠诲姟',
-          prop: 'sendflag',
+          prop: 'sendFlag',
           search: true,
           sortable:true,
-          width: 150,
+          // width: 130,
           html:true,
           align:'center',
           type:'select',
+          searchLabelWidth:130,
           dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
           props: {
             label: "value",
             value: "key"
           },
           formatter : function (row, column) {
-            return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+            return row.sendFlag == 'true' || row.sendFlag == '1' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800" ></i>'
           }
         }
       ]

--
Gitblit v1.9.3