Merge branch 'apiupdate' into hjl

src/data/menus.js

@@ -297,20 +297,20 @@ export default [
 		}]
 	},
 	/******************** 通用字典 ***************************/
-	{
-		path: '/dictionaries',
-		name: '通用字典',
-		disabled: true,
-	},
-	// 厂家库
-	{
-		path: '/manufactor/supplier',
-		name: '厂家库',
-		icon: '',
-		opts: [{
-			name: '查看',
-			basic: true,
-			permission: 'system:role:query'
-		}]
-	}
+	// {
+	// 	path: '/dictionaries',
+	// 	name: '通用字典',
+	// 	disabled: true,
+	// },
+	// // 厂家库
+	// {
+	// 	path: '/manufactor/supplier',
+	// 	name: '厂家库',
+	// 	icon: '',
+	// 	opts: [{
+	// 		name: '查看',
+	// 		basic: true,
+	// 		permission: 'system:role:query'
+	// 	}]
+	// }
 ]

src/router/system.js

@@ -321,14 +321,14 @@ export default [
     },
     /******************** 通用字典 ***************************/
     //厂家库
-    {
-        path: '/manufactor',
-        name: 'LayoutMain',
-        component: LayoutMain,
-        children: [
-            { path: 'supplier', name: 'supplier', component: supplier, meta: { keepAlive: false, breadcrumbs: [{ label: '厂家库' }] }}
-        ] 
-    },
+    // {
+    //     path: '/manufactor',
+    //     name: 'LayoutMain',
+    //     component: LayoutMain,
+    //     children: [
+    //         { path: 'supplier', name: 'supplier', component: supplier, meta: { keepAlive: false, breadcrumbs: [{ label: '厂家库' }] }}
+    //     ] 
+    // },
 
     //业务空间管理
     // {

src/utils/handsontable/notShow.js

@@ -880,7 +880,7 @@ const showTools = {
      * @param {*} type 对应表格的模块类型
      * @param {*} onlyRead 是否只读
      * @param {*} showType 查看类型(全部;只看要采集的信息;隐藏部分信息)
-     * @param {*} taizhang 是否是台账类型
+     * @param {*} taizhang 是否是台账类型(默认为false)
      * 
      */
     headerTextFilter(arr, type, onlyRead, showType, taizhang = false) {
@@ -913,9 +913,9 @@ const showTools = {
                     return this.isUnit(item)
                 } else if (showType == "all") { //显示全部
                     return this.isUnit(item)
-                } else if (showType == "partInfo" && this.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
+                } else if (showType == "partInfo" && item.Visible && this.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
                     // if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
-                    if (item.FirstTag == "TechParam") {
+                    if (item.FirstTag == "TechParam") { //技术参数
                         return undefined
                     } else {
                         return this.isUnit(item)
@@ -958,9 +958,9 @@ const showTools = {
                     return this.inputModeFilter(item, onlyRead)
                 } else if (showType == "all") { //显示全部
                     return this.inputModeFilter(item, onlyRead)
-                } else if (showType == "partInfo" && this.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
+                } else if (showType == "partInfo" && item.Visible && this.isShow(item.InfoPointCode)) { //隐藏部分厂家信息(***需维护不显示列表***)
                     // if (item.FirstName == "控制参数" || item.FirstName == "设定参数" || item.FirstName == "运行参数") {
-                    if (item.FirstTag == "TechParam") {
+                    if (item.FirstTag == "TechParam") { //技术参数
                         return undefined
                     } else {
                         return this.inputModeFilter(item, onlyRead)

src/views/data_admin/buildData/index.vue

@@ -1652,7 +1652,6 @@
             },
             afterDocumentKeyDown(e) {
                 //   this.$nextTick(() => {
-                console.log(e, e.realTarget.value)
                 let activeEditer = this.myHotArr[this.tabChecked].getActiveEditor(), td, row, prop, 
                     val = e.realTarget.value,
                     infoArr = ["Brand", "Specification", "Manufacturer", "Supplier", "Maintainer", "Insurer", "SupplierContactor", "SupplierPhone", "SupplierEmail", "SupplierWeb", "SupplierFax", "MaintainerContactor", "MaintainerPhone", "MaintainerEmail", "MaintainerWeb", "MaintainerFax", "InsurerContactor", "InsurerPhone", "InsurerEmail", "InsurerWeb", "InsurerFax"];