清单汇总，标红判断调整

app/public/js/ledger.js

@@ -2049,7 +2049,7 @@ $(document).ready(function() {
             // 初始化 部位数量复核表 参数
             this.posSpreadSetting = {
                 cols: [
-                    {title: '名称', field: 'bw', hAlign: 0, width: 80, formatter: '@'},
+                    {title: '计量单元', field: 'bw', hAlign: 0, width: 80, formatter: '@'},
                     {title: '图册号', field: 'drawingCode', hAlign: 0, formatter: '@', width: 60},
                 ],
                 emptyRows: this.posCount,

app/public/js/stage_gather.js

@@ -102,12 +102,12 @@ $(document).ready(function () {
         const nPercent = Math.min(Math.max(ZhCalc.div(parseFloat($('#over-percent').val()), 100), 0.5), 1);
         for (const node of data) {
             if (node) {
-                const bOverRangeTz = node.end_gather_qty
-                    ? (node.quantity ? node.end_gather_qty > ZhCalc.mul(node.quantity, nPercent) : node.end_gather_qty)
-                    : (node.total_price ? node.end_gather_tp > ZhCalc.mul(node.total_price, nPercent) : node.end_gather_tp);
-                const bOverRangeDeal = node.end_gather_qty
-                    ? (node.deal_bills_qty ? node.end_gather_qty > ZhCalc.mul(node.deal_bills_qty, nPercent) : node.end_gather_qty)
-                    : (node.deal_bills_tp ? node.end_gather_tp > ZhCalc.mul(node.deal_bills_tp, nPercent) : node.end_gather_tp);
+                const bOverRangeTz = node.end_contract_qty
+                    ? (node.quantity ? node.end_contract_qty > ZhCalc.mul(node.quantity, nPercent) : node.end_contract_qty)
+                    : (node.total_price ? node.end_contract_tp > ZhCalc.mul(node.total_price, nPercent) : node.end_contract_tp);
+                const bOverRangeDeal = node.end_contract_qty
+                    ? (node.deal_bills_qty ? node.end_contract_qty > ZhCalc.mul(node.deal_bills_qty, nPercent) : node.end_contract_qty)
+                    : (node.deal_bills_tp ? node.end_contract_tp > ZhCalc.mul(node.deal_bills_tp, nPercent) : node.end_contract_tp);
                 node.overRange = bQty ? bOverRangeTz : (bDealQty ? bOverRangeDeal : bOverRangeTz || bOverRangeDeal);
             }
         }

app/service/deal_bills.js

@@ -40,7 +40,7 @@ module.exports = app => {
                         for (let iCol = 0; iCol < row.length; iCol++) {
                             const value = row[iCol];
                             if (typeof value !== "string") { continue }
-                            if (['清单编号', '子目号', '子目编号', '编号', '清单编号'].indexOf(value) >= 0) iCode = iCol;
+                            if (['清单编号', '子目号', '子目编号', '编号', '清单号'].indexOf(value) >= 0) iCode = iCol;
                             if (['清单名称', '名称', '子目名称'].indexOf(value) >= 0) iName = iCol;
                             if (value.indexOf('单位') >= 0) iUnit = iCol;
                             if (value.indexOf('单价') >= 0) iUp = iCol;

app/view/stage/gather.ejs

@@ -10,7 +10,7 @@
                             超计显示
                         </button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="width:290px">
-                            <span class="dropdown-item-text text-danger">累计完成合同计量 大于</span>
+                            <span class="dropdown-item-text text-danger">截止本期合同计量 大于</span>
                             <form class="px-4 py-3">
                                 <div class="form-group">
                                     <div class="custom-control custom-radio">