From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 791d4d1..9ca0d57 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -36,14 +36,14 @@
</el-select></span>
</div>
<el-table ref="dataTable" v-loading="isLoading" :data="tableData"
- :height="tableHeight"
+ :height="tableHeight" border
@select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
@select-all="handleSelectionAll" @selection-change="handleSelectionChange"
@sort-change="sortChange">
<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 CodeArray" v-if="!item.hidden" :label="item.label" :prop="item.prop"
+ <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">
<template slot-scope="scope">
@@ -52,7 +52,7 @@
</el-link>
</template>
</el-table-column>
- <el-table-column v-for="item in this.tableHeadFindData" v-if="!item.hidden && item.prop !== 'id'"
+ <el-table-column v-for="item in this.tableHeadFindData" v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus'"
:key="item.id"
:formatter="item.formatter"
:label="item.label" :prop="item.prop"
@@ -60,6 +60,13 @@
:sortable="item.sortable"
: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>
@@ -220,6 +227,8 @@
LinkList: [],
isCodeArrayPushed: false, // 缂栫爜鏁扮粍娣诲姞鏍囪瘑鍙橀噺
CodeArray: [],
+ lcstatusArray:[],
+ islcstatusPushed:false,
// 鐘舵�佹悳绱�
statusSelect: "all",
// 鍏抽敭瀛楁煡璇�
@@ -372,9 +381,24 @@
}
})
this.tableHeadFindDatas = newval;
+ console.log('new',newval)
if (!this.isCodeArrayPushed) {
- this.CodeArray.push(newval.find(item => item.prop === 'id'))
- this.isCodeArrayPushed = true
+ if (newval.find(item => item.prop === 'id')) {
+ this.CodeArray.push(newval.find(item => item.prop === 'id'));
+ } else {
+ this.CodeArray.push([]);
+ }
+ console.log('CodeArray', this.CodeArray);
+ this.isCodeArrayPushed = true;
+ }
+ if (!this.islcstatusPushed) {
+ if (newval.find(item => item.prop === 'lcstatus')) {
+ this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
+ } else {
+ this.lcstatusArray.push([]);
+ }
+ console.log('lcstatusArray', this.lcstatusArray);
+ this.islcstatusPushed = true;
}
// console.log('new',newval)
this.WupinFindValue = ''
@@ -750,7 +774,7 @@
},
// 鎺掑簭
sortChange(val) {
- console.log(val)
+ // console.log(val)
this.isLoading = true;
let order = "";
if (val.order == "ascending") {
--
Gitblit v1.9.3