From e41ba809d6c587da02618adcb06f2106501ef249 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 25 九月 2023 09:53:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 91a235b..ff50556 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -90,6 +90,20 @@
prop: 'interfaceStatus',
value:7
},
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ value:8 },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ value:9
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ value:10
+ },
],
},
loading: false,
@@ -106,7 +120,6 @@
calcHeight: 0,
tip: false,
searchShow: false,
- // searchMenuSpan: 12,
border: true,
index: true,
viewBtn: true,
@@ -140,6 +153,24 @@
sortable:true,
overHidden: true,
width: 140
+ },
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ sortable:true,
+ width: 130
},
{
label: '闆嗘垚绯荤粺缂栧彿',
@@ -199,7 +230,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<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>'
+ return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
}
},
]
--
Gitblit v1.9.3