From 930766d03537d803cea4bf468ab2abc44ff42645 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 19 七月 2023 14:51:29 +0800
Subject: [PATCH] 1、主要解决 mybatis返回map时value值为null，属性和value都不显示问题

---
 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue |   54 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 186a952..9341b92 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -1,6 +1,8 @@
 <template>
 <el-dialog :visible.sync="dialogPush" append-to-body  :close-on-click-modal="false"  @close="recoverPage" title="瀵煎嚭">
   <div style="margin-bottom: 10px">
+    <el-button type="success"
+               @click="handleExcel">涓嬭浇 澶氱骇琛ㄥごexcel</el-button>
     <el-radio-group v-model="radio">
       <el-radio :label="0">閫夋嫨</el-radio>
       <el-radio :label="1">鍏ㄩ儴</el-radio>
@@ -24,7 +26,7 @@
 <script>
 export default {
 name: "MasterTransfer",
-  props:['visible','tableHeadData','codeClassifyOid'],
+  props:['visible','tableHeadData','codeClassifyOid','tableData'],
   data(){
     return {
       data: [],
@@ -43,13 +45,7 @@
           prop: 'header',
           children: []
         }],
-        data: [{
-          title1: "娴嬭瘯鏁版嵁1",
-          title2: "娴嬭瘯鏁版嵁2"
-        }, {
-          title1: "娴嬭瘯鏁版嵁2",
-          title2: "娴嬭瘯鏁版嵁2"
-        }]
+        data: []
       }
     };
   },
@@ -61,7 +57,9 @@
     //琛ㄥご鏁版嵁 鐢ㄦ潵娓叉煋绌挎妗�
     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({
@@ -69,13 +67,31 @@
              key: index,
            });
          });
-         return 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 => {
+          for (let prop in obj) {
+            if (obj[prop] === "true") {
+              obj[prop] = "鏄�";
+            } else if (obj[prop] === "false") {
+              obj[prop] = "鍚�";
+            }
+          }
+        return obj;
+      });
+    },
     codeClassifyOid:{
       handler(newval,oldval){
-        console.log('daochu',newval,oldval)
       }
     }
   },
@@ -83,23 +99,19 @@
 
   },
   mounted() {
-  this.ExportRend()
   },
   methods:{
     //鍏抽棴椤甸潰
     recoverPage(){
       this.$emit('update:visible', false);
     },
-    //瀵煎嚭琛ㄦ牸鏁版嵁杞崲琛ㄥご淇℃伅
-    ExportRend(){
-      this.tableExportData=this.tableHeadData.map(obj => {
-        return {
-          label: obj.label,
-          prop: obj.prop
-        }
-      })
-      console.log(this.tableExportData)
-    }
+    handleExcel(){
+      this.$Export.excel({
+        title: this.option.title,
+        columns: this.option.column,
+        data: this.option.data
+      });
+    },
   }
 }
 </script>

--
Gitblit v1.9.3