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 | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 9907cf6..9ca0d57 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -43,7 +43,7 @@
<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">
@@ -61,7 +61,7 @@
:width="item.width"
align="center">
</el-table-column>
- <el-table-column v-for="item in lcstatusArray" v-if="!item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
+ <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">
@@ -381,14 +381,25 @@
}
})
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) {
- this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'))
- this.islcstatusPushed = true
- };
+ 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 = ''
},
--
Gitblit v1.9.3