Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

web/maintain/report/js/cfg_const.js

@@ -74,6 +74,7 @@ let setting = {
     },
     callback:{
         onClick: zTreeOprObj.onClick,
+        beforeEditName: zTreeOprObj.beforeEditName,
         beforeRename: zTreeOprObj.beforeRename,
         beforeRemove: zTreeOprObj.onBeforeRemove,
         onRemove: zTreeOprObj.onRemove,

web/maintain/report/js/rpt_tpl_main.js

@@ -20,6 +20,7 @@ let rptTplObj = {
         calculationTreeOprObj.buildRunType();
         calculationTreeOprObj.buildExprTemplates();
         preHandleObj.buildTypeData();
+        userListObj.bindEvent();
     }
 }
 
@@ -331,6 +332,9 @@ let zTreeOprObj = {
                 me.copyReportTemplate(orgID, newNodeID, true, function(goodResult){
                     me.updateTreeRootNode(newTopNode, false, function(goodRst){
                         canContinue = true;
+                        if (treeNodes[0].rptTpl) {
+                            treeNodes[0].rptTpl.ID = newNodeID;
+                        }
                         me.currentNode = treeNodes[0];
                     }, function(badRst){
                         displayMessage("更新模板节点失败!", "red", 2000);
@@ -362,8 +366,8 @@ let zTreeOprObj = {
         }
     },
     changeUser: function (dom) {
-        if (dom.id === "custRptOpt") {
-            //用户定制
+        if (dom.checked) {
+            //用户定制打开
             $("#rpt_user_input")[0].disabled = false;
             $("#rpt_user_find_btn")[0].disabled = false;
         } else {
@@ -375,11 +379,7 @@ let zTreeOprObj = {
     getReportTemplateTree: function(compilationSelect) {
         let me = zTreeOprObj, params = {};
         params.compilationId = compilationSelect.value;
-        if ($("#custRptOpt")[0].checked) {
-            params.userId = (userAccount ===  'admin')?("-100"):userID;
-        } else {
-            params.userId = (userAccount ===  'admin')?("-100"):userID;
-        }
+        params.userId = (userAccount ===  'admin')?("-100"):userID;
         let allEngIds = [];
         for (let item of engineeringList) {
             allEngIds.push(item.value);
@@ -535,6 +535,23 @@ let zTreeOprObj = {
         }
         me.refreshNodes();
     },
+    beforeEditName: function (treeId, treeNode) {
+        setTimeout(function(){
+            let ip = $("#" + treeNode.tId + IDMark_Input);
+            if (ip.length > 0) {
+                ip[0].className = "individualRename";
+            } else {
+                setTimeout(function(){
+                    let ip = $("#" + treeNode.tId + IDMark_Input);
+                    if (ip.length > 0) {
+                        ip[0].className = "individualRename";
+                    } else {
+                        console.log("sorry!");
+                    }
+                }, 50);
+            }
+        }, 50);
+    },
     beforeRename: function(treeId, treeNode, newName, isCancel) {
         if (newName.length === 0) {
             return false;
@@ -689,6 +706,30 @@ let zTreeOprObj = {
     }
 };
 
+let userListObj = {
+    bindEvent: function () {
+        // let me = userListObj;
+        // $("#rpt_user_input").change(me.onChange);
+    },
+    onSelect: function (dom) {
+        alert("on selection!");
+    },
+    onChange: function (dom) {
+        alert("on change!");
+    },
+    onKeyPress: function (dom) {
+        if (dom.value && dom.value.length >= 2) {
+            alert(dom.value);
+        }
+    },
+    findUser: function () {
+        let params = {};
+        CommonAjax.postEx("user/getRptTplTree", params, 20000, true, function(result){
+            //
+        }, null, null);
+    }
+};
+
 function displayMessage(message, color, disappearTime) {
     $("#id_after_saved_lbl")[0].style.color = color;
     $("#id_after_saved_lbl")[0].innerHTML = message;

web/maintain/report/rpt_tpl_main.html

@@ -16,6 +16,10 @@
     <!--zTree-->
     <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
     <style type="text/css">
+        .ztree li a input.individualRename {height:14px; width:260px; padding:0; margin:0;
+            font-size:12px; border:1px #7EC4CC solid; *border:0px}
+    </style>
+    <style type="text/css">
         .ztree li span.button.add{margin-right:2px;background-position:-144px 0;vertical-align:top;*vertical-align:middle}
     </style>
     <script>
@@ -48,21 +52,13 @@
                 </li>
             </ul>
             </div>
-            <div>
-                <label class="form-check-label">
-                    <input class="form-check-input" type="radio" name="rpt_templates_type_grp" id="commonRptOpt" checked="true" onchange="zTreeOprObj.changeUser(this)"> 公共类型
-                </label>
-                <label class="form-check-label"> </label>
-                <label class="form-check-label">
-                    <input class="form-check-input" type="radio" name="rpt_templates_type_grp" id="custRptOpt" onchange="zTreeOprObj.changeUser(this)"> 定制类型
-                </label>
-                <label class="form-check-label"> </label>
-            </div>
             <div class="btn-group">
                 <div class="input-group">
-                    <input type="text" class="form-control input-sm" id="rpt_user_input" placeholder="手机/邮箱/姓名/公司" disabled="true">
+                    <input type="text" class="form-control input-sm" id="rpt_user_input" placeholder="手机/邮箱/姓名/公司" list="users_list">
+                    <datalist id=users_list>
+                    </datalist>
                     <span class="input-group-btn">
-                        <button class="btn btn-primary" id="rpt_user_find_btn" onclick="" disabled="true">查询</button>
+                        <button class="btn btn-primary" id="rpt_user_find_btn" onclick="userListObj.findUser()">查询</button>
                     </span>
                 </div>
             </div>
@@ -72,10 +68,10 @@
         <div class="content">
             <div class="container-fluid">
                 <div class="row">
-                    <div class="main-side col-lg-2 p-0">
+                    <div class="main-side col-lg-3 p-0">
                         <%include ./rpt_tpl_tree.html %>
                     </div>
-                    <div class="main-content col-lg-10 p-0">
+                    <div class="main-content col-lg-9 p-0">
                         <div class="container-fluid">
                             <div class="row">
                                 <!-- 报表设置 -->

web/maintain/report/rpt_tpl_tree.html

@@ -4,6 +4,9 @@
     <a onclick="zTreeOprObj.moveDownNode()" class="btn btn-sm" id="downMove"><i class="fa fa-arrow-down" aria-hidden="true"></i>下移</a>
     <a onclick="zTreeOprObj.moveUpNode()" class="btn btn-sm" id="upMove"><i class="fa fa-arrow-up" aria-hidden="true"></i>上移</a>
 </div>
-<div class="tab-content">
+<div class="tab-content" id="rptTplTreeDiv">
     <ul id="rptTplTree" class="ztree"></ul>
 </div>
+<div class="tab-content" id="customizedRptTplTreeDiv" style="display: none">
+    <ul id="customizedRptTplTree" class="ztree"></ul>
+</div>