瀏覽代碼

修改显示错位bug

chuwu 6 年之前
父節點
當前提交
a5dfb00e68
共有 1 個文件被更改,包括 11 次插入11 次删除
  1. 11 11
      src/utils/hansontable/notShow.js

+ 11 - 11
src/utils/hansontable/notShow.js

@@ -175,7 +175,7 @@ const showTools = {
             if (
                 (value.InfoPointName == "品牌" ||
                     value.InfoPointName == "设备型号" ||
-                    value.InfoPointName == "生产厂家") && !first
+                    value.InfoPointName == "生产厂家") && !first && value.Visible
             ) {
                 first = index
             }
@@ -185,7 +185,7 @@ const showTools = {
                     value.InfoPointName == "供应商电子邮件" ||
                     value.InfoPointName == "供应商网址" ||
                     value.InfoPointName == "供应商传真" ||
-                    value.InfoPointName == "供应商联系电话") && !scound
+                    value.InfoPointName == "供应商联系电话") && !scound && value.Visible
             ) {
                 scound = index
             }
@@ -195,7 +195,7 @@ const showTools = {
                     value.InfoPointName == "维修商联系电话" ||
                     value.InfoPointName == "维修商电子邮件" ||
                     value.InfoPointName == "维修商网址" ||
-                    value.InfoPointName == "维修商传真") && !three
+                    value.InfoPointName == "维修商传真") && !three && value.Visible
             ) {
                 three = index
             }
@@ -205,7 +205,7 @@ const showTools = {
                     value.InfoPointName == "保险公司联系电话" ||
                     value.InfoPointName == "保险公司电子邮件" ||
                     value.InfoPointName == "保险公司网址" ||
-                    value.InfoPointName == "保险公司传真") && !four
+                    value.InfoPointName == "保险公司传真") && !four && value.Visible
             ) {
                 four = index
             }
@@ -362,7 +362,10 @@ const showTools = {
         return data
     },
 
-    showTypes(arr, onlyRead, isWatch, allMess, falg = false, typeArr = false) {
+    showTypes(arr, onlyRead, isWatch, allMess, falg = false, typeArr = false, taizhang = false) {
+        if (!taizhang) {
+            arr = showTools.arrToArr(arr)
+        }
         let data = arr.map(item => {
             if (falg) {
                 if (item.FirstTag == "控制参数" ||
@@ -493,13 +496,13 @@ const showTools = {
             }
 
         }).filter(item => item);
-        if (!onlyRead) {
-            showTools.insertionType2(data, text.idType)
-        }
         return data
     },
 
     changeHeader(arr, readArr, onlyRead, isWatch, allMess, falg = false, taizhang = false) {
+        if (!taizhang) {
+            arr = showTools.arrToArr(arr)
+        }
         let data = arr.map(item => {
             if (falg) {
                 if (item.FirstTag == "控制参数" ||
@@ -537,9 +540,6 @@ const showTools = {
                 return undefined;
             }
         }).filter(d => d);
-        if (!onlyRead) {
-            showTools.insertionRea2(data)
-        }
         return data
     }
 }