Browse Source

1. 期非审批通过原报可编辑期
2. 调差计算保留2位小数

laiguoran 5 năm trước cách đây
mục cha
commit
02e341faa2

+ 1 - 1
app/public/js/material_list.js

@@ -42,7 +42,7 @@ function calcOneBQJC(xmj) {
     if (notx === undefined) {
         const list = xmj.mx_id !== undefined ? getMaterialListByLeafXmj(xmj.gcl_id, xmj.id, xmj.mx_id) : getMaterialListByLeafXmj(xmj.gcl_id, xmj.id);
         for (const l of list) {
-            jiacha = ZhCalc.add(jiacha, ZhCalc.mul(ZhCalc.mul(xmj.gather_qty, l.quantity), getMpSpreadByMBData(l.mb_id)));
+            jiacha = ZhCalc.round(ZhCalc.add(jiacha, ZhCalc.mul(ZhCalc.mul(xmj.gather_qty, l.quantity), getMpSpreadByMBData(l.mb_id))), 2);
         }
     }
     return jiacha;

+ 1 - 1
app/view/measure/stage.ejs

@@ -37,7 +37,7 @@
                     <tr>
                         <td>
                             <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>">第 <%- s.order %> 期</a>
-                            <% if (s.status === auditConst.status.uncheck && s.user_id === ctx.session.sessionUser.accountId) { %>
+                            <% if (s.status !== auditConst.status.checked && s.user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="#edit" data-toggle="modal" data-target="#edit"><i class="fa fa-pencil-square-o "></i></a>
                             <% } %>
                         </td>

+ 1 - 1
app/view/measure/stage_modal.ejs

@@ -112,7 +112,7 @@
         </div>
     </div>
 </div>
-<% if (stages.length > 0 && stages[0].status === auditConst.status.uncheck && stages[0].user_id === ctx.session.sessionUser.accountId) { %>
+<% if (stages.length > 0 && stages[0].status !== auditConst.status.checked && stages[0].user_id === ctx.session.sessionUser.accountId) { %>
 <!--设置-->
 <div class="modal fade" id="edit" data-backdrop="static">
     <div class="modal-dialog" role="document">