修复查找定位显示bug

app/public/js/ledger.js

@@ -882,10 +882,10 @@ $(document).ready(function() {
             this.obj = obj;
             this.url = '/ledger/search';
             this.spreadSetting = spreadSetting;
-            this.spread = SpreadJsObj.createNewSpread($('div', this.obj)[0]);
+            this.spread = SpreadJsObj.createNewSpread($('#search-result', this.obj)[0]);
             SpreadJsObj.initSheet(this.spread.getActiveSheet(), this.spreadSetting);
 
-            $('a', this.obj).bind('click', function () {
+            $('#searchLedger', this.obj).bind('click', function () {
                 const data = { keyword: $('input', self.obj).val() };
                 postData('/ledger/search', data, function (result) {
                     SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'data', result);

app/public/js/path_tree.js

@@ -450,8 +450,7 @@ const createNewPathTree = function (type, setting) {
             for (const node of loadedData) {
                 const children = node.children;
                 if (!node.expanded && children.length > 0) {
-                    node.expaned = true;
-                    this._refreshChildrenVisible(node);
+                    this.setExpanded(node, true);
                 }
             }
             for (const node of existData) {
@@ -460,10 +459,10 @@ const createNewPathTree = function (type, setting) {
                     expandData.push(parent);
                     const children = parent.children;
                     if (!parent.expanded && children.length > 0) {
-                        parent.expanded = true;
-                        this._refreshChildrenVisible(parent);
+                        this.setExpanded(parent, true);
                     }
                 }
+                this.setExpanded(node, true);
             }
             console.log(expandData);
             return [loadedData, expandData];

app/service/ledger.js

@@ -1723,6 +1723,7 @@ module.exports = app => {
                 throw '查询数据有误'
             }
             const expandIds = node.full_path.split('.');
+            expandIds.pop();
             const expandData = await this.getChildrenByParentId(tenderId, expandIds);
             return { expand: expandData };
         }

app/view/ledger/explode.ejs

@@ -70,6 +70,18 @@
             </div>
             <div class="c-body col-0" style="display: none;">
                 <div class="tab-content">
+                    <div id="search" class="tab-pane active">
+                        <div class="side-bar">
+                            <div class="input-group input-group-sm">
+                                <input id="searchKeyword" type="text" class="form-control" placeholder="项目节编号/清单编号/名称" aria-label="Recipient's username" aria-describedby="button-addon2">
+                                <div class="input-group-append">
+                                    <button class="btn btn-outline-secondary" type="button" id="searchLedger">搜索</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="search-result" class="sjs-height-2">
+                        </div>
+                    </div>
                     <div id="std-chapter" class="tab-pane active">
                         <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
                         <div id="std-chapter-spread" class="sjs-height-2">
@@ -85,11 +97,6 @@
                         <div id="deal-bills-spread" class="sjs-height-2">
                         </div>
                     </div>
-                    <div id="search" class="tab-pane">
-                        <input id="searchKeyword">
-                        <a href="javascript: void(0);" class="btn btn-sm btn-primary">搜索</a>
-                        <div id="search-result" class="sjs-height-2"></div>
-                    </div>
                     <% if (tenderData.ledger_status !== auditConst.status.uncheck) { %>
                     <div id="opinion" class="tab-pane">
                         <div class="side-bar">
@@ -124,6 +131,9 @@
         <!--右侧菜单-->
         <div class="side-menu">
             <ul class="nav flex-column right-nav" id="side-menu">
+                <li>
+                    <a class="nav-link" content="#search" href="javascript: void(0);">查找定位</a>
+                </li>
                 <li class="nav-item">
                     <a class="nav-link" content="#std-chapter" href="javascript: void(0);">项目节</a>
                 </li>
@@ -133,9 +143,6 @@
                 <li class="nav-item">
                     <a class="nav-link" content="#deal-bills" href="javascript: void(0);">签约清单</a>
                 </li>
-                <li>
-                    <a class="nav-link" content="#search" href="javascript: void(0);">查找定位</a>
-                </li>
                 <% if (tenderData.ledger_status !== auditConst.status.uncheck) { %>
                 <li class="nav-item">
                     <a class="nav-link" content="#opinion" href="javascript: void(0);">清单意见</a>