修改变更后数量及金额计算方式

app/controller/change_controller.js

@@ -714,7 +714,8 @@ module.exports = app => {
                                 cl['audit_amount_' + au.uid] = audit_amount[index - 1] ? audit_amount[index - 1] : null;
                             }
                         }
-                        cl.changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) && audit_amount !== '' ? audit_amount[audit_amount.length - 1] : cl.camount;
+                        const changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) && audit_amount !== '' ? audit_amount[audit_amount.length - 1] : cl.camount;
+                        cl.changed_amount = ctx.helper.add(cl.oamount ? parseFloat(cl.oamount) : 0, changed_amount ? parseFloat(changed_amount) : 0);
                     }
                     renderData.changeList = changeList;
                     renderData.auditList2 = auditList2;
@@ -764,7 +765,8 @@ module.exports = app => {
                                 cl['audit_amount_' + au.uid] = au.uid === ctx.session.sessionUser.accountId ? cl.spamount : (audit_amount[index - 1] ? audit_amount[index - 1] : null);
                             }
                         }
-                        cl.changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) && audit_amount !== '' ? audit_amount[audit_amount.length - 1] : cl.camount;
+                        const changed_amount = (change.status === audit.flow.status.backnew || change.status === audit.flow.status.checking || change.status === audit.flow.status.checked) && audit_amount !== '' ? audit_amount[audit_amount.length - 1] : cl.camount;
+                        cl.changed_amount = ctx.helper.add(cl.oamount ? parseFloat(cl.oamount) : 0, changed_amount ? parseFloat(changed_amount) : 0);
                     }
                     renderData.changeList = changeList;
                     renderData.changeLedgerList = await ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });

app/public/js/change_information_approval.js

@@ -99,10 +99,10 @@ $(document).ready(() => {
                 return ZhCalc.round(data.camount, findDecimal(data.unit));
             },
             changed_amount: function (data) {
-                return ZhCalc.round(data.spamount, findDecimal(data.unit));
+                return ZhCalc.round(ZhCalc.add(data.oamount, data.spamount), findDecimal(data.unit));
             },
             changed_tp: function (data) {
-                return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.spamount, findDecimal(data.unit))), totalPriceUnit);
+                return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(ZhCalc.add(data.oamount, data.spamount), findDecimal(data.unit))), totalPriceUnit);
             },
         },
     };
@@ -158,12 +158,16 @@ $(document).ready(() => {
             // changeSpreadSheet.setValue(row, col+1, sum !== 0 ? sum : null);
             const rowCount = changeSpreadSheet.getRowCount();
             // 用户的数据合计
+            // 变更后数据合计
             let audit_sum = 0;
+            let changed_sum = 0;
             for(let i = 0; i < rowCount - 1; i++){
                 audit_sum = ZhCalc.add(audit_sum, changeSpreadSheet.getValue(i, col+1));
+                changed_sum = ZhCalc.add(changed_sum, changeSpreadSheet.getValue(i, 11));
             }
+
             changeSpreadSheet.setValue(changeSpreadSheet.getRowCount() - 1, col+1, audit_sum !== 0 ? audit_sum : null);
-            changeSpreadSheet.setValue(changeSpreadSheet.getRowCount() - 1, 11, audit_sum !== 0 ? audit_sum : null);
+            changeSpreadSheet.setValue(changeSpreadSheet.getRowCount() - 1, 11, changed_sum !== 0 ? changed_sum : null);
         },
         countSum: function() {
             const rowCount = changeSpreadSheet.getRowCount();

app/public/js/change_information_set.js

@@ -156,10 +156,10 @@ $(document).ready(() => {
                 return ZhCalc.round(data.camount, findDecimal(data.unit));
             },
             changed_amount: function (data) {
-                return ZhCalc.round(data.camount, findDecimal(data.unit));
+                return ZhCalc.round(ZhCalc.add(data.oamount, data.camount), findDecimal(data.unit));
             },
             changed_tp: function (data) {
-                return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.camount, findDecimal(data.unit))), totalPriceUnit);
+                return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(ZhCalc.add(data.oamount, data.camount), findDecimal(data.unit))), totalPriceUnit);
             },
             del_list: function (data) {
                 return !_.find(changeUsedData, { cbid: data.id }) ? '移除' : '';