章节合计调整

app/public/js/stage_gather.js

@@ -15,8 +15,7 @@ function generateChapterHtml(data) {
             if (['1000', '1100', '1200', '1300'].indexOf(d.code) >= 0) {
                 if (checkZero(d.total_price) && checkZero(d.deal_bills_tp) &&
                     checkZero(d.contract_tp) && checkZero(d.qc_tp) && checkZero(d.gather_tp) &&
-                    checkZero(d.end_contract_tp) && checkZero(d.end_qc_tp) && checkZero(d.end_gather_tp) &&
-                    checkZero(d.end_final_tp)) {
+                    checkZero(d.end_contract_tp) && checkZero(d.end_qc_tp) && checkZero(d.end_gather_tp)){
                     continue;
                 }
             }
@@ -35,7 +34,7 @@ function generateChapterHtml(data) {
             html.push('<td class="text-right">', d.end_contract_tp ? d.end_contract_tp : '', '</td>');
             html.push('<td class="text-right">', d.end_qc_tp ? d.end_qc_tp : '', '</td>');
             html.push('<td class="text-right">', d.end_gather_tp ? d.end_gather_tp : '', '</td>');
-            html.push('<td class="text-right">', d.end_final_tp ? d.end_final_tp : '', '</td>');
+            html.push('<td class="text-right">', d.end_final_ratio ? d.end_final_ratio : '', '</td>');
             html.push('</tr>');
         }
     }
@@ -142,6 +141,7 @@ $(document).ready(function () {
         c.end_qc_tp = ZhCalc.add(c.qc_tp, c.pre_qc_tp);
         c.end_gather_tp = ZhCalc.add(c.end_contract_tp, c.end_qc_tp);
         c.end_final_tp = ZhCalc.add(c.end_qc_tp, c.total_price);
+        c.end_final_ratio = ZhCalc.mul(ZhCalc.div(c.end_gather_tp, c.end_final_tp), 100, 2);
     }
     generateChapterHtml(chapterData);