Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/se_bonus.js

@@ -9,7 +9,7 @@
  */
 
 const isPre = function (data) {
-    return data && data.sid !== stageId;
+    return data && data.sid !== stageId && !isA;
 };
 $(document).ready(() => {
     autoFlashHeight();

app/public/js/stage_gather.js

@@ -158,6 +158,10 @@ $(document).ready(function () {
                 return data[qtyField] > 0
                     ? data.end_contract_qty > ZhCalc.mul(data[qtyField], per)
                     : data.end_contract_qty < ZhCalc.mul(data[qtyField], per) || data.end_contract_qty > 0;
+            } else if (!data[qtyField]) {
+                return data[qtyField] > 0
+                    ? data.end_contract_qty > ZhCalc.mul(data[qtyField], per)
+                    : data.end_contract_qty < ZhCalc.mul(data[qtyField], per) || data.end_contract_qty > 0;
             } else {
                 if (!data[tpField]) return !!data.end_contract_tp;
                 return data[tpField] > 0
@@ -169,9 +173,9 @@ $(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) {
-                if (node.b_code === '103-4')console.log(node);
                 const bOverRangeTz = billsGatherOver(node, 'final_1_qty', 'final_1_tp', nPercent);
                 const bOverRangeDeal = billsGatherOver(node, 'deal_final_1_qty', 'deal_final_1_tp', nPercent);
+                if (node.b_code === '302-4-a') console.log(bOverRangeTz, bOverRangeDeal, node.final_1_qty, node.end_contract_qty);
                 node.overRange = bQty ? bOverRangeTz : (bDealQty ? bOverRangeDeal : bOverRangeTz || bOverRangeDeal);
             }
         }

app/view/stage_extra/bonus.ejs

@@ -47,9 +47,10 @@
 <script>
     const stageId = <%- ctx.stage.id %>;
     const stageUserId = <%- ctx.stage.user_id %>;
-    const readOnly = <%- ctx.stage.readOnly || ctx.stage.revising || (ctx.stage.order > 1 && (!ctx.stage.preCheckedStage || ctx.stage.preCheckedStage.order < ctx.stage.order - 1)) %>;
+    const readOnly = <%- (ctx.stage.readOnly && !ctx.session.sessionUser.is_admin) || ctx.stage.revising || (ctx.stage.order > 1 && (!ctx.stage.preCheckedStage || ctx.stage.preCheckedStage.order < ctx.stage.order - 1)) %>;
     const whiteList = JSON.parse('<%- JSON.stringify(ctx.app.config.multipart.whitelist) %>');
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const stageChecked = <%- ctx.stage.status === auditConst.status.checked %>;
     const deleteFilePermission = <%- deleteFilePermission %>;
+    const isA = <%- (ctx.session.sessionUser.is_admin ? 1 : 0) %>;
 </script>