Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/schedule_controller.js

@@ -82,12 +82,12 @@ module.exports = app => {
         async loadLedgerData(ctx) {
             try {
                 const ledgerData = await ctx.service.ledger.getData(ctx.tender.id);
-                const posData = ctx.tender.data.measure_type === measureType.tz.value
-                    ? await ctx.service.pos.getPosData({ tid: ctx.tender.id }) : [];
-                const convert = new billsPosConvert(ctx);
-                convert.loadData(ledgerData, posData, []);
-                const result = await convert.convert();
-                ctx.body = { err: 0, msg: '', data: result };
+                // const posData = ctx.tender.data.measure_type === measureType.tz.value
+                //     ? await ctx.service.pos.getPosData({ tid: ctx.tender.id }) : [];
+                // const convert = new billsPosConvert(ctx);
+                // convert.loadData(ledgerData, posData, []);
+                // const result = await convert.convert();
+                ctx.body = { err: 0, msg: '', data: ledgerData };
             } catch (err) {
                 this.log(err);
                 ctx.body = { err: 1, msg: err.toString(), data: [] };

app/public/js/schedule_ledger.js

@@ -20,15 +20,11 @@ $(function () {
         level: 'level',
         rootId: -1,
         fullPath: 'full_path',
-        calcFields: ['total_price']
         //treeCacheKey: 'ledger_bills_fold' + '_' + getTenderId(),
         // markFoldKey: 'bills-fold',
         // markFoldSubKey: window.location.pathname.split('/')[2],
     };
-    treeSetting.calcFun = function (node) {
-        node.dgn_price = ZhCalc.round(ZhCalc.div(node.total_price, node.dgn_qty1), 2);
-    };
-    const ledgerTree = createNewPathTree('base', treeSetting);
+    const ledgerTree = createNewPathTree('filter', treeSetting);
 
     const ledgerSpreadSetting = {
         cols: [
@@ -59,10 +55,28 @@ $(function () {
     SpreadJsObj.selChangedRefreshBackColor(ledgerSpread.getActiveSheet());
 
     postData(window.location.pathname + '/load', {}, function (data) {
+        const baseLedgerTree = createNewPathTree('base', {
+            id: 'ledger_id',
+            pid: 'ledger_pid',
+            order: 'order',
+            level: 'level',
+            rootId: -1,
+            fullPath: 'full_path',
+            calcFields: ['total_price'],
+            calcFun: function (node) {
+                node.dgn_price = ZhCalc.round(ZhCalc.div(node.total_price, node.dgn_qty1), 2);
+            }
+        });
         data = addIsSelect(data);
-        ledgerTree.loadDatas(data);
-        treeCalc.calculateAll(ledgerTree);
-        // console.log(ledgerTree);
+        baseLedgerTree.loadDatas(data);
+        treeCalc.calculateAll(baseLedgerTree);
+        for (const d of baseLedgerTree.nodes) {
+            if (!d.b_code)
+                ledgerTree.addData(d, ['is_select', 'ledger_id', 'ledger_pid', 'order', 'level', 'tender_id', 'full_path',
+                    'code', 'name', 'unit', 'dgn_qty1', 'dgn_qty2', 'dgn_price', 'quantity', 'total_price']);
+        }
+        ledgerTree.sortTreeNode(true);
+
         SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Tree, ledgerTree);
     }, null, true);
 
@@ -225,8 +239,12 @@ $(function () {
     // })('a[name=showLevel]', ledgerSpread.getActiveSheet());
 });
 function addIsSelect(datas) {
+    // const newDatas = [];
     for (const d of datas) {
-        d.is_select = selectedLedgerList.length === 0 ? 1: selectedLedgerList.indexOf(d.ledger_id) !== -1 ? 1 : 0;
+        if (!d.b_code) {
+            d.is_select = selectedLedgerList.length === 0 ? 1: selectedLedgerList.indexOf(d.ledger_id) !== -1 ? 1 : 0;
+            // newDatas.push(d);
+        }
     }
     return datas;
 }

app/public/js/shenpi.js

@@ -1055,7 +1055,7 @@ function setParentCanEdit(datas, id, flag) {
 function setAllChildrenCanEdit(ledgerInfo, flag) {
     if (ledgerInfo.children && ledgerInfo.children.length > 0) {
         for(const li of ledgerInfo.children) {
-            if (li.pwd === undefined || li.pwd === null) {
+            if (li.pwd === undefined || li.pwd === null || li.pwd === '') {
                 li.can_edit = flag;
                 selects.push(li);
                 setAllChildrenCanEdit(li, flag);