1. 批量删除问题

2. 报表数据，新增台账--数量

app/base/base_tree_service.js

@@ -579,7 +579,7 @@ class TreeService extends Service {
         const selects = await this.getDataByKidAndCount(mid, kid, count);
         const first = selects[0];
         const parent = await this.getDataByKid(mid, first[this.setting.pid]);
-        const childCount = parent ? this.count(this.getCondition({mid: mid, pid: parent[this.setting.id]})) : -1;
+        const childCount = parent ? await this.count(this.getCondition({mid: mid, pid: parent[this.setting.kid]})) : -1;
         let deleteData = [];
         for (const s of selects) {
             deleteData = deleteData.concat(await this.getDataByFullPath(mid, s[this.setting.fullPath] + '%'));
@@ -592,6 +592,8 @@ class TreeService extends Service {
                 const operate = await this._deleteNodeData(mid, s);
             }
             // 选中节点--父节点 只有一个子节点时，应升级is_leaf
+            console.log(childCount);
+            console.log(count);
             if (parent && childCount === count) {
                 const updateParent = {id: parent.id };
                 updateParent[this.setting.isLeaf] = true;
@@ -604,7 +606,7 @@ class TreeService extends Service {
 
             const updateData = await this.getNextsData(mid, first[this.setting.pid], first[this.setting.order] - 1);
             if (parent && childCount === count) {
-                const updateData1 = await this.getDataByKid(mid, parent[this.setting.id]);
+                const updateData1 = await this.getDataByKid(mid, parent[this.setting.kid]);
                 updateData.push(updateData1);
             }
             return { delete: deleteData, update: updateData };

app/lib/stage_im.js

@@ -320,6 +320,8 @@ class StageIm {
                     im.gclBills.push(b);
                     this.ImBillsData.push(b);
                 }
+                b.quantity = this.ctx.helper.add(b.quantity, p.quantity);
+
                 b.jl = this.ctx.helper.add(b.jl, p.gather_qty);
                 b.contract_jl = this.ctx.helper.add(b.contract_jl, p.contract_qty);
                 b.qc_jl = this.ctx.helper.add(b.qc_jl, p.qc_qty);
@@ -490,6 +492,7 @@ class StageIm {
                 im = {
                     id: this.ImData.length + 1,
                     lid: node.id, pid: '', code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price,
+                    quantity: 0,
                     jl: 0, contract_jl: 0, qc_jl: 0,
                     pre_jl: 0, pre_contract_jl: 0, pre_qc_jl: 0,
                     end_jl: 0, end_contract_jl: 0, end_qc_jl: 0,
@@ -514,6 +517,8 @@ class StageIm {
                 this._generateZlLeafXmjData(p, im, 'gather_qty');
             }
             this._generateZlChangeData(p, im);
+            im.quantity = this.ctx.helper.add(im.quantity, p.quantity);
+
             im.jl = this.ctx.helper.add(im.jl, p.gather_qty);
             im.contract_jl = this.ctx.helper.add(im.contract_jl, p.contract_qty);
             im.qc_jl = this.ctx.helper.add(im.qc_jl, p.qc_qty);
@@ -542,6 +547,7 @@ class StageIm {
                     const im = {
                         id: this.ImData.length + 1,
                         lid: node.id, code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price, pid: pp.id,
+                        quantity: pp.quantity,
                         jl: pp.gather_qty, contract_jl: pp.contract_qty, qc_jl: pp.qc_qty,
                         pre_jl: pp.pre_gather_qty, pre_contract_jl: pp.pre_contract_qty, pre_qc_jl: pp.pre_qc_qty,
                         end_jl: pp.end_gather_qty, end_contract_jl: pp.end_contract_qty, end_qc_jl: pp.end_qc_qty,
@@ -568,6 +574,7 @@ class StageIm {
                 const im = {
                     id: this.ImData.length + 1,
                     lid: node.id, code: p.b_code, name: p.name, unit: p.unit, unit_price: p.unit_price, pid: '',
+                    quantity: p.quantity,
                     jl: p.gather_qty, contract_jl: p.contract_qty, qc_jl: p.qc_qty,
                     pre_jl: p.pre_gather_qty, pre_contract_jl: p.pre_contract_qty, pre_qc_jl: p.pre_qc_qty,
                     end_jl: p.end_gather_qty, end_contract_jl: p.end_contract_qty, end_qc_jl: p.end_qc_qty,