From f1617cdfe03d1c9ca2e7d8acf0516825a6ea8346 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 23 十月 2023 14:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c7ea7bc..be118b6 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -43,6 +43,15 @@
<el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
+<!-- 鐢熷懡鍛ㄦ湡-->
+ <el-table-column v-for="item in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
+ :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
+ align="center">
+ <template slot-scope="scope">
+ <span>{{ scope.row.lcstatus_text }}</span>
+ </template>
+ </el-table-column>
+<!-- 缂栧彿-->
<el-table-column v-for="item in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden" :label="item.label" :prop="item.prop"
:show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
align="center">
@@ -61,13 +70,7 @@
:width="item.width"
align="center">
</el-table-column>
- <el-table-column v-for="item in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
- :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
- align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.lcstatus_text }}</span>
- </template>
- </el-table-column>
+
</el-table>
</el-row>
<!-- 鏂板-->
@@ -966,16 +969,5 @@
.bottom {
margin-top: 10px;
}
-//.custom-scrollbar::-webkit-scrollbar {
-// width: 10px !important;;/* 璁剧疆婊氬姩鏉＄殑瀹藉害 */
-//}
-//
-//.custom-scrollbar::-webkit-scrollbar-thumb {
-// background-color: #a11313 !important;; /* 璁剧疆婊氬姩鏉＄殑棰滆壊 */
-// border-radius: 5px !important;; /* 璁剧疆婊氬姩鏉＄殑杈规寮у害 */
-//}
-//
-//.custom-scrollbar::-webkit-scrollbar-track {
-// background-color: #f1f1f1 !important;; /* 璁剧疆婊氬姩鏉＄殑杞ㄩ亾棰滆壊 */
-//}
+
</style>
--
Gitblit v1.9.3