Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js

@@ -40,7 +40,6 @@ layui.config({
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
 			}},
 			{ field: 'state1', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
-				// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
 				if (isNull(d.state)) {
 					return '未入库';
 				} else {

erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js

@@ -10,7 +10,6 @@ layui.config({
         fsTree = layui.fsTree,
         form = layui.form,
         table = layui.table;
-    // tableTree = layui.tableTreeDj;
     var ztree;
     var id = GetUrlParam("id");
     var objectKey = GetUrlParam("objectKey")
@@ -20,7 +19,7 @@ layui.config({
     var dropdown = new Dropdown();
     dropdown.render();
 
-    //获取所有仓库queryAllStoreHouseList       queryDepotLevelValList
+    //获取所有仓库
     /********* tree 处理   start *************/
     fsTree.render({
         id: "treeDemo",

web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js

@@ -442,6 +442,7 @@ var dsFormUtil = {
             content = dsFormUtil.getContentLinkedData(content);
         }
         content.title = dsFormUtil.getLable(content);
+        content.maxLength = dsFormUtil.getMaxLength(content);
         if (isNull(content.attrDefinition)) {
             content.attrDefinition = {};
         }
@@ -598,6 +599,16 @@ var dsFormUtil = {
         return content.title;
     },
 
+    getMaxLength: function (content) {
+        var attr = content.attrDefinition;
+        if (!isNull(attr) && !$.isEmptyObject(attr)) {
+            if (!isNull(attr.attrDefinitionCustom)) {
+                return attr.attrDefinitionCustom.maxLength;
+            }
+        }
+        return null;
+    },
+
     // 获取属性关联的数据值来源信息
     getContentLinkedData: function (content) {
         if (isNull(content.attrDefinition) || isNull(content.attrDefinition.attrDefinitionCustom)) {