Przeglądaj źródła

模板copy引用rptTpl问题

TonyKang 7 lat temu
rodzic
commit
8a9573ef21

+ 6 - 7
web/maintain/report/js/rpt_tpl_main.js

@@ -332,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);
@@ -363,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 {
@@ -376,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);

+ 2 - 12
web/maintain/report/rpt_tpl_main.html

@@ -52,23 +52,13 @@
                 </li>
             </ul>
             </div>
-            <div>
-                <label class="form-check-label">
-                    <input class="form-check-input" type="checkbox" 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="checkbox" 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="手机/邮箱/姓名/公司" list="users_list" 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" disabled="true" onclick="userListObj.findUser()">查询</button>
+                        <button class="btn btn-primary" id="rpt_user_find_btn" onclick="userListObj.findUser()">查询</button>
                     </span>
                 </div>
             </div>