From 80b00fc662651e4ee20507904364bfcebce2e4ac Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 02 八月 2023 18:23:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index b803ae6..b876bab 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -66,29 +66,31 @@
this.dialogPush = this.visible;
},
//琛ㄥご鏁版嵁 鐢ㄦ潵娓叉煋绌挎妗�
- tableHeadData:{
- handler(newval,oldval){
+ tableHeadData: {
+ handler(newval, oldval) {
console.log(newval)
- if(newval){
- //excel琛ㄥご鏁版嵁杞崲
- this.tableHeadFindData=newval.map(obj => obj.label);
- this.tableHeadFindData.forEach((city, index) => {
- this.data.push({
- label: city,
- key: index,
- });
- });
- console.log(this.data)
- //excel琛ㄦ牸鏁版嵁杞崲
- this.option.column[0].children=newval.map(obj => {
- return {
- label: obj.label,
- prop: obj.prop
- }
- })
- }
+ if (newval) {
+ // 娓呯┖data鏁扮粍
+ this.data = [];
+ // excel琛ㄥご鏁版嵁杞崲
+ this.tableHeadFindData = newval.map(obj => obj.label);
+ this.tableHeadFindData.forEach((city, index) => {
+ this.data.push({
+ label: city,
+ key: index,
+ });
+ });
+ console.log(this.data)
+ // excel琛ㄦ牸鏁版嵁杞崲
+ this.option.column[0].children = newval.map(obj => {
+ return {
+ label: obj.label,
+ prop: obj.prop
+ }
+ })
+ }
}
-},
+ },
tableData(){
// 灏嗗�奸噷闈㈢殑true鎴杅alse鏀瑰彉涓烘槸鎴栧惁
this.option.data = this.tableData.map(obj => {
--
Gitblit v1.9.3