ERP商品选择页面，左侧树调整

a7977efd · Skyeye云 · ffb57350 · a7977efd · a7977efd · a7977efd
5 changed file
--- a/common/src/main/resources/template/tpl/sysDictData/sysDictDataList.html
+++ b/common/src/main/resources/template/tpl/sysDictData/sysDictDataList.html
@@ -25,8 +25,8 @@
        </div>
    </div>

-    <div class="layui-row">
-        <div style="width: 240px; float: left; height: 750px; overflow: auto; padding: 5px;">
+    <div class="layui-row" style="height: calc(100% - 50px);">
+        <div style="width: 240px; float: left; height: 100%; overflow: auto; padding: 5px;">
            <input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
            <ul id="treeDemo" class="ztree fsTree" method="get" isRoot="1"
                treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name"></ul>

--- a/erp/src/main/resources/template/js/material/materialChoose.js
+++ b/erp/src/main/resources/template/js/material/materialChoose.js
@@ -5,14 +5,12 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'tableCheckBoxUtil', 'fsCommon', 'fsTree'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'tableCheckBoxUtil'], function (exports) {
 	winui.renderColor();
 	var index = parent.layer.getFrameIndex(window.name);
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table,
-		fsTree = layui.fsTree,
-		fsCommon = layui.fsCommon,
 		tableCheckBoxUtil = layui.tableCheckBoxUtil;

 	var checkType = '1';//商品选择类型：1.单选；2.多选
@@ -20,8 +18,7 @@ layui.config({
 	if (!isNull(parent.erpOrderUtil.productCheckType)){
 		checkType = parent.erpOrderUtil.productCheckType;
 	}
-	
-	//设置提示信息
+
 	var s = "商品选择规则：";
 	if(checkType == "1"){
 		s += '1.单选，双击指定行数据即可选中；';
@@ -32,55 +29,15 @@ layui.config({
 	}
 	s += '如没有查到要选择的商品，请检查商品信息是否满足当前规则。';
 	$("#showInfo").html(s);
-	
-	/********* tree 处理   start *************/
-	//初始商品分类类型
-    var materialCategoryType;
-    fsTree.render({
-		id: "materialCategoryType",
-		url: flowableBasePath + "materialcategory008",
-		checkEnable: false,
-		loadEnable: false,//异步加载
-		showLine: false,
-		showIcon: true,
-		expandSpeed: 'fast',
-		clickCallback: zTreeOnClick
-	}, function(id){
-		materialCategoryType = $.fn.zTree.getZTreeObj(id);
-		//加载商品列表
+
+	var categoryId = "";
+	sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["erpMaterialCategory"]["key"], 'selectTree', "materialCategoryType", '', form, function () {
 		initTable();
-	});
-	
-	//节点点击事件
-	function zTreeOnClick(event, treeId, treeNode) {
-		categoryId = treeNode.id == 0 ? '' : treeNode.id;
+	}, function (chooseId) {
+		categoryId = chooseId;
 		refreshTable();
-	}
-	
-	$("body").on("input", "#name", function() {
-		searchZtree(materialCategoryType, $("#name").val());
 	});
-	//ztree查询
-	var hiddenNodes = [];
-	function searchZtree(ztreeObj, ztreeInput) {
-		//显示上次搜索后隐藏的结点
-		ztreeObj.showNodes(hiddenNodes);
-		function filterFunc(node) {
-			var keyword = ztreeInput;
-			//如果当前结点，或者其父结点可以找到，或者当前结点的子结点可以找到，则该结点不隐藏
-			if(searchParent(keyword, node) || searchChildren(keyword, node.children)) {
-				return false;
-			}
-			return true;
-		};
-		//获取不符合条件的叶子结点
-		hiddenNodes = ztreeObj.getNodesByFilter(filterFunc);
-		//隐藏不符合条件的叶子结点
-		ztreeObj.hideNodes(hiddenNodes);
-	}
-	/********* tree 处理   end *************/
-	//树节点选中的商品类型id
-	var categoryId = "";
+	
 	function initTable(){
 		if(checkType == '2'){
 			//初始化值

--- a/erp/src/main/resources/template/tpl/material/materialChoose.html
+++ b/erp/src/main/resources/template/tpl/material/materialChoose.html
@@ -5,8 +5,6 @@
    <title></title>
    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-    <link href="../../assets/lib/layui/lay/modules/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
-    <link href="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.css" rel="stylesheet" />
 </head>
 <body>
    <div class="winui-toolbar">
@@ -15,17 +13,9 @@
            <button class="layui-btn layui-btn-sm layui-btn-normal search-table-btn-right" type="button" id="saveCheckBox" style="display: none;"><i class="fa fa-save" aria-hidden="true"></i>保存</button>
        </div>
    </div>
-    <div style="margin:auto 10px;">
-        <div style="width: 200px; float: left;">
-    		<div class="layui-inline" style="width: 100%">
-                <div class="layui-input-inline" style="width: 100%">
-                    <input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
-                </div>
-            </div>
-            <div class="layui-inline" style="width: 100%">
-            	<ul id="materialCategoryType" class="ztree fsTree" method="get" isRoot="1"
- 							treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
-            </div>
+    <div style="margin: auto 10px; height: calc(100% - 50px);">
+        <div style="width: 200px; float: left; height: 100%; overflow-y: auto;" id="materialCategoryType">
+
    	</div>
    	<div style="width: calc(100% - 200px); float: left;">
 	    	<div style="margin:auto 10px;">
@@ -35,11 +25,6 @@
    </div>
    <script src="../../assets/lib/layui/layui.js"></script>
    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/jquery-min.js"></script>
-   	<script type="text/javascript" src="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.js"></script>
-    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script>
-    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script>
-    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/fuzzysearch.js"></script>
    <script type="text/javascript">
        layui.config({base: '../../js/material/'}).use('materialChoose');
    </script>

--- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/sysDictDataUtil.js
+++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/sysDictDataUtil.js
@@ -145,7 +145,7 @@ var sysDictDataUtil = {
                            <input type="hidden" id="${showBoxId}Choose" name="${showBoxId}Choose" class="layui-input" />
                        </div>
                    </div>
-                    <div class="layui-inline" style="max-height: 200px; width: 100%; overflow-y: auto;">
+                    <div class="layui-inline" style="width: 100%;">
                    <ul id="${showBoxId}Tree" class="ztree fsTree" method="get" isRoot="${isRoot}" isLoad="0" treeIdKey="id" inputs="parentId" treePIdKey="parentId" 
                        clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
                    </div>

--- a/web/src/main/resources/template/json/sysDictData.json
+++ b/web/src/main/resources/template/json/sysDictData.json
@@ -48,6 +48,9 @@

    "erpMaterialCategory": {"name": "ERP-商品类型", "key": "ERP_MATERIAL_CATEGORY"},

-    "teamRole": {"name": "团队-团队角色", "key": "TEAM_ROLE"}
+    "teamRole": {"name": "团队-团队角色", "key": "TEAM_ROLE"},

+    "knowledgeType": {"name": "知识库-知识类型", "key": "KNOWLEDGE_TYPE"},
+
+    "ifsOrderType": {"name": "IFS-财务单据类型", "key": "IFS_ORDER_TYPE"}
 }