Browse Source

重排子项编号,根据选中项目节编号无-不显示

MaiXinRong 4 years ago
parent
commit
93a48191c6
2 changed files with 2 additions and 4 deletions
  1. 2 2
      app/public/js/ledger.js
  2. 0 2
      app/service/report_memory.js

+ 2 - 2
app/public/js/ledger.js

@@ -1320,12 +1320,12 @@ $(document).ready(function() {
             icon: 'fa-sort-numeric-asc',
             disabled: function (key, opt) {
                 const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
-                return !node || !node.code || !node.children || node.children === 0;
+                return !node || !node.code || !node.children || node.children === 0 || node.code.indexOf('-') < 0;
             },
             callback: function (key, opt) {
                 treeOperationObj.sortCode(ledgerSpread.getActiveSheet());
             },
-            visible: function (key, opt) {
+            visible: function (key, opt) {;
                 return !readOnly;
             }
         };

+ 0 - 2
app/service/report_memory.js

@@ -405,7 +405,6 @@ module.exports = app => {
                     this._calcLeafXmjRela(billsTree);
                 }
 
-                console.log(billsTree.nodes.length);
                 return billsTree.getDatas([
                     'id', 'tender_id', 'ledger_id', 'ledger_pid', 'level', 'order', 'full_path', 'is_leaf',
                     'code', 'b_code', 'name', 'unit', 'unit_price',
@@ -424,7 +423,6 @@ module.exports = app => {
                     'deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2',
                 ]);
             } catch(err) {
-                console.log(err);
                 return []
             }
         }