清单汇总处理

app/public/js/change_information.js

@@ -526,21 +526,20 @@ $(document).ready(() => {
             SpreadJsObj.initSheet(hzSpread.getActiveSheet(), hzSpreadSetting);
         }
         const hzList = [];
-        const newChangeList = _.cloneDeep(changeList);
+        const newChangeList = _.cloneDeep(changeSpreadSheet.zh_data);
         for (const cl of newChangeList) {
             const hzIndex = _.findIndex(hzList, { code: cl.code, name: cl.name, unit: cl.unit, unit_price: cl.unit_price});
-            const audit_amount = cl.audit_amount ? cl.audit_amount.split(',') : '';
-            const amount = audit_amount ? parseFloat(audit_amount[audit_amount.length - 1]) : 0;
-            cl.ca_tp = ZhCalc.round(ZhCalc.mul(ZhCalc.round(cl.unit_price, unitPriceUnit), ZhCalc.round(cl.camount, findDecimal(cl.unit))), totalPriceUnit);
+            const count4Amount = cl.audit_amount ? cl.audit_amount.split(',').length : 0;
             cl.spa_tp = ZhCalc.round(ZhCalc.mul(ZhCalc.round(cl.unit_price, unitPriceUnit), ZhCalc.round(cl.spamount, findDecimal(cl.unit))), totalPriceUnit);
-            cl.amount = amount;
+            // 根据count4Amoun得出audit_amount_X值
+            cl.amount = count4Amount ? cl['audit_amount_' + count4Amount + ''] : 0;
             cl.a_tp = ZhCalc.round(ZhCalc.mul(ZhCalc.round(cl.unit_price, unitPriceUnit), ZhCalc.round(cl.amount, findDecimal(cl.unit))), totalPriceUnit);
             if (hzIndex !== -1) {
                 hzList[hzIndex].camount = ZhCalc.add(hzList[hzIndex].camount, cl.camount);
                 hzList[hzIndex].ca_tp = ZhCalc.add(hzList[hzIndex].ca_tp, cl.ca_tp);
                 hzList[hzIndex].spamount = ZhCalc.add(hzList[hzIndex].spamount, cl.spamount);
                 hzList[hzIndex].spa_tp = ZhCalc.add(hzList[hzIndex].spa_tp, cl.spa_tp);
-                hzList[hzIndex].amount = ZhCalc.add(hzList[hzIndex].amount, amount);
+                hzList[hzIndex].amount = ZhCalc.add(hzList[hzIndex].amount, cl.amount);
                 hzList[hzIndex].a_tp = ZhCalc.add(hzList[hzIndex].a_tp, cl.a_tp);
             } else {
                 hzList.push(cl);