计量台账，结算清单颜色标记

app/controller/stage_controller.js

@@ -436,7 +436,7 @@ module.exports = app => {
                         checkData.checkMinusChangeBills(change, changeBills, endStageChange);
                     }
                 }
-                checkData.checkSettle();
+                if (ctx.stage.readySettle) checkData.checkSettle();
                 ctx.body = { err: 0, msg: '', data: checkData.checkResult };
             } catch (err) {
                 this.log(err);

app/lib/ledger.js

@@ -1084,8 +1084,11 @@ class checkData {
         const settleStatus = this.ctx.service.settle.settleStatus;
         for (const b of this.checkBills.nodes) {
             if (b.children && b.children.length > 0) continue;
+            if (!b.settleStatus) continue;
+
             const pr = this.checkPos.getLedgerPos(b.id);
             if (!pr || pr.length === 0) {
+                if (b.settleStatus !== settleStatus.finish) continue;
                 if (b.contract_qty || b.contract_tp || b.qc_qty || b.qc_minus_qty || b.positive_qc_qty || b.negative_qc_qty) {
                     this.checkResult.error.push({
                         ledger_id: b.ledger_id,

app/public/js/global.js

@@ -1195,6 +1195,7 @@ const spreadColor = {
     stage: {
         over: '#FF9595', //'#ff6f5c', '#f8d7da'
         differ: '#FF9595', // '#F2DEDE',
+        settle: '#f2f2f2',
     },
     gcl: {
         differ: '#FFE699', // 同编号时，名称、单位、单价存在不同

app/public/js/stage.js

@@ -734,6 +734,10 @@ $(document).ready(() => {
                 if (def && def.color) return def.color;
             }
 
+
+            if (data.settle_status === settleStatus.finish) {
+                return spreadColor.stage.settle;
+            }
             return hintOver && checkUtils.billsOver(data, checkTzMeasureType(), stagePos) ? spreadColor.stage.over : defaultColor;
         } else {
             return defaultColor;
@@ -825,6 +829,9 @@ $(document).ready(() => {
                 if (def && def.color) return def.color;
             }
         }
+        if (data.settle_status === settleStatus.finish) {
+            return spreadColor.stage.settle;
+        }
         if (checkTzMeasureType()) {
             return hintOver && checkUtils.posOver(data)  ? spreadColor.stage.over : defaultColor;
         }
@@ -1300,10 +1307,10 @@ $(document).ready(() => {
                 case 'contract_qty':
                 case 'qc_qty':
                 case 'qc_minus_qty':
-                    info.cancel = node.is_tp || node.settle_status !== settleStatus.finish;
+                    info.cancel = node.is_tp || node.settle_status === settleStatus.finish;
                     break;
                 case 'contract_tp':
-                    info.cancel = !node.is_tp || node.settle_status !== settleStatus.finish;
+                    info.cancel = !node.is_tp || node.settle_status === settleStatus.finish;
                     break;
                 case 'is_tp':
                     info.cancel = true;
@@ -1975,7 +1982,7 @@ $(document).ready(() => {
                 case 'contract_qty':
                 case 'qc_qty':
                 case 'qc_minus_qty':
-                    info.cancel = node.settle_status !== settleStatus.finish;
+                    info.cancel = node.settle_status === settleStatus.finish;
                     break;
             }
         },