From 7e01e4a05576d0178f1de6f99e675bd2a1147794 Mon Sep 17 00:00:00 2001
From: xuyucheng <Nd17cCxTS4SSDDh21SaA>
Date: Tue, 8 Mar 2022 14:00:56 +0800
Subject: [PATCH] mode

---
 src/components/FecrTranTable.vue |  4 ++--
 src/view/appraisal/esg/index.vue | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/FecrTranTable.vue b/src/components/FecrTranTable.vue
index 2c080f5..e3b941c 100644
--- a/src/components/FecrTranTable.vue
+++ b/src/components/FecrTranTable.vue
@@ -61,7 +61,7 @@ export default {
     //表格数据
     data: [Array],
     //表格序列
-    columns: [Array],
+    columns: [Array,Object],
     stripe: {
       type: Boolean,
       default: true,
@@ -155,7 +155,7 @@ export default {
           this.init();
         }
       },
-      immediate: true,
+      // immediate: true,
       deep: true,
     },
     height: {
diff --git a/src/view/appraisal/esg/index.vue b/src/view/appraisal/esg/index.vue
index aa46ed4..e3c34ff 100644
--- a/src/view/appraisal/esg/index.vue
+++ b/src/view/appraisal/esg/index.vue
@@ -430,9 +430,11 @@ export default {
     },
 
     getColumns(value) {
-      return Object.keys(value[0]).map((key) => {
-        return key;
-      });
+      if(value.length !== 0) {
+        return Object.keys(value[0]).map((key) => {
+          return key;
+        });
+      }
     },
 
     save() {
@@ -480,29 +482,29 @@ export default {
       handler(val) {
         const state = [];
         this.submitStatus = !val["所属行业"] ? true : false;
-        console.log(val)
         Object.keys(val["公司当年收入（万元）"]).forEach((key) => {
           state.push(
-            !val["公司当年收入（万元）"][key] && val["公司当年收入（万元）"][key] !== "" ? true : false
+            val["公司当年收入（万元）"][key]!==null &&
+              val["公司当年收入（万元）"][key] !== ""
+              ? true
+              : false
           );
         });
         const array = ["环境问卷", "社会问卷", "治理问卷"];
         array.forEach((key) => {
           val[key]["近三年公司数据"].forEach((item) => {
             Object.keys(item).forEach((keys) => {
-              state.push(!item[keys] && item[keys] !== "" ? true : false);
+              state.push(item[keys] !== null && item[keys] !== ""? true : false);
             });
           });
 
           val[key]["其他类型问卷"].forEach((item) => {
-            state.push(!item ? true : false);
+            state.push(item !== null && item !== "" ? true : false);
           });
         });
         this.submitStatus = state.every((item) => {
-          return !item;
+          return item;
         });
-
-        console.log(this.submitStatus);
       },
       // immediate: true,
       deep: true,