1. 变更概况，变更提出单位、费用承担方显示问题

2. 变更概况，变更清单，计算金额

app/controller/stage_controller.js

@@ -752,6 +752,7 @@ module.exports = app => {
         async getChangeData(ctx) {
             try {
                 const data = {};
+                data.tenderInfo = ctx.tender.info;
                 data.ledger = await ctx.service.ledger.getDataByTenderId(ctx.tender.id, -1);
                 data.usedChangesId = await ctx.service.stageChange.getStageUsedChangeId(ctx.stage.id);
                 data.changes = await ctx.service.change.getChangeAndUsedInfo(ctx.tender.id);

app/public/js/stage_change.js

@@ -44,6 +44,7 @@ class ChangeAnalysis {
             }
             b.qty = _.toNumber(b.samount);
             b.valid_qty = ZhCalc.sub(b.qty, b.used_qty);
+            b.tp = ZhCalc.round(ZhCalc.mul(b.qty, b.unit_price), tenderInfo.decimal.tp);
             b.pos = _.filter(change.detail.curUsedBills, {cbid: b.id});
             b.cur_qty = 0;
             for (const p of b.pos) {
@@ -60,7 +61,7 @@ class ChangeAnalysis {
         }
     }
 }
-let changes, usedChangesId, ledger, analysis;
+let changes, usedChangesId, ledger, analysis, tenderInfo;
 
 
 $(document).ready(() => {
@@ -192,7 +193,7 @@ $(document).ready(() => {
             // 加载变更信息和附件
             const obj = $('.tab-content');
             if (change) {
-                const inputs = $('input[type!=checkbox]', obj);
+                const inputs = $('input[type!=checkbox][type!=radio]', obj);
                 for (const i of inputs) {
                     const field = $(i).attr('name');
                     const text = (field && change[field]) ? change[field] : '';
@@ -224,7 +225,7 @@ $(document).ready(() => {
                 // 变更性质
                 $('select[name=quality]').val(change.quality);
                 // 变更单位
-                $('select[name=company]').html('<option>' + change.company ? change.company : '' + '</option>');
+                $('select[name=company]').html('<option>' + (change.company ? change.company : '') + '</option>');
                 // 费用承担方
                 $('input[name=charge][value=' + change.charge + ']').prop('checked', true);
                 // 附件
@@ -266,6 +267,7 @@ $(document).ready(() => {
     // ------------end spread界面操作方法
 
     postData(window.location.pathname + '/data', null, function (result) {
+        tenderInfo = result.tenderInfo;
         changes = result.changes;
         usedChangesId = result.usedChangesId;
         ledger = result.ledger;

app/view/stage/change.ejs

@@ -135,9 +135,8 @@
                                     <label>费用承担方</label>
                                     <div class="radio">
                                         <% for (const c in changeConst.charge) { %>
-                                        <% const cCharge = changeConst.charge[c] %>
                                         <label class="radio-inline">
-                                            <input value="<%- cCharge.value %>" name="charge" type="radio" disabled> <%- cCharge.name %>
+                                            <input value="<%- changeConst.charge[c].value %>" name="charge" type="radio" disabled> <%- changeConst.charge[c].name %>
                                         </label>
                                         <% } %>
                                     </div>