Przeglądaj źródła

成本报审,计算调整

MaiXinRong 1 dzień temu
rodzic
commit
015b16708a

+ 3 - 0
app/service/cost_stage_analysis_detail.js

@@ -68,6 +68,9 @@ module.exports = app => {
 
             const curCalcFields = costFields.selfCalcFields.filter(x => { return data[0][x] !== undefined; });
             const updateData = { id: ledger_id, update_user_id: this.ctx.session.sessionUser.accountId };
+            for (const prop of curCalcFields) {
+                updateData[prop] = 0;
+            }
             for (const d of data) {
                 for (const prop of curCalcFields) {
                     updateData[prop] = this.ctx.helper.add(updateData[prop], d[prop] || 0);

+ 3 - 0
app/service/cost_stage_book_detail.js

@@ -103,6 +103,9 @@ module.exports = app => {
             const detailDatas = details || await this.getAllDataByCondition({ columns: ['id', 'ledger_id', ...costFields.curFields], where: { ledger_id, stage_id: this.ctx.costStage.id } });
 
             const updateData = { id: ledger_id, update_user_id: this.ctx.session.sessionUser.accountId };
+            for (const prop of costFields.curFields) {
+                updateData[prop] = 0;
+            }
             for (const d of data) {
                 for (const prop of costFields.curFields) {
                     updateData[prop] = this.ctx.helper.add(updateData[prop], d[prop] || 0);

+ 3 - 0
app/service/cost_stage_detail.js

@@ -97,6 +97,9 @@ module.exports = app => {
             const detailDatas = details || await this.getAllDataByCondition({ columns: ['id', 'ledger_id', ...costFields.curFields], where: { ledger_id, stage_id: this.ctx.costStage.id } });
 
             const updateData = { id: ledger_id, update_user_id: this.ctx.session.sessionUser.accountId };
+            for (const prop of costFields.curFields) {
+                updateData[prop] = 0;
+            }
             for (const d of data) {
                 for (const prop of costFields.curFields) {
                     updateData[prop] = this.ctx.helper.add(updateData[prop], d[prop] || 0);

+ 2 - 2
app/view/cost/ledger_modal.ejs

@@ -22,7 +22,7 @@
                     <input class="datepicker-here form-control form-control-sm" readonly autocomplete="off" id="type-pay-date" placeholder="点击选择年月" data-view="months" data-range="true"  data-multiple-dates-separator=" ~ " data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
                 </div>
                 <div class="form-group form-group-sm">
-                    <label>选择用</label>
+                    <label>选择用</label>
                     <select class="form-control form-control-sm" id="type-contract-used">
                         <% for (const cu of contractUsed) { %>
                         <option value="<%- cu %>"><%- cu %></option>
@@ -51,7 +51,7 @@
                     <input class="datepicker-here form-control form-control-sm" readonly autocomplete="off" id="select-pay-date" placeholder="点击选择年月" data-view="months" data-range="true"  data-multiple-dates-separator=" ~ " data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
                 </div>
                 <div class="form-group form-group-sm">
-                    <label>选择用</label>
+                    <label>选择用</label>
                     <select class="form-control form-control-sm" id="select-contract-used">
                         <% for (const cu of contractUsed) { %>
                         <option value="<%- cu %>"><%- cu %></option>