ellisran 3 dienas atpakaļ
vecāks
revīzija
43821ba970

+ 2 - 0
app/controller/change_controller.js

@@ -482,6 +482,7 @@ module.exports = app => {
                     // throw '台账修订中,无法操作台账数据';
                     // throw '台账修订中,无法操作台账数据';
                     revising = true;
                     revising = true;
                 }
                 }
+                const isNewPriceLedgerData = await ctx.service.ledger.getAllDataByCondition({ where: { tender_id: ctx.tender.id, is_new_price: 1 } });
                 const renderData = {
                 const renderData = {
                     tender,
                     tender,
                     change,
                     change,
@@ -512,6 +513,7 @@ module.exports = app => {
                     deleteFilePermission,
                     deleteFilePermission,
                     changeMode: tenderData.c_mode,
                     changeMode: tenderData.c_mode,
                     revising,
                     revising,
+                    isNewPriceLedgerData,
                 };
                 };
                 // 获取是否已存在调用变更令
                 // 获取是否已存在调用变更令
                 let changeUsedData = await ctx.service.stageChange.getAllFinalUsedData(ctx.tender.id, change.cid);
                 let changeUsedData = await ctx.service.stageChange.getAllFinalUsedData(ctx.tender.id, change.cid);

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

@@ -911,7 +911,7 @@ $(document).ready(() => {
                         node.is_add_list = 1;
                         node.is_add_list = 1;
                         node.is_new_price = changeLedgerInfo ? changeLedgerInfo.is_new_price : 0;
                         node.is_new_price = changeLedgerInfo ? changeLedgerInfo.is_new_price : 0;
                     } else {
                     } else {
-                        const ledgerInfo = _.find(ledgerList, { id: node.gcl_id });
+                        const ledgerInfo = _.find(isNewPriceLedgerData, { id: node.gcl_id });
                         node.is_new_price = ledgerInfo ? ledgerInfo.is_new_price : 0;
                         node.is_new_price = ledgerInfo ? ledgerInfo.is_new_price : 0;
                     }
                     }
                 }
                 }

+ 1 - 0
app/view/change/information.ejs

@@ -629,6 +629,7 @@
     changeUnits.push('');
     changeUnits.push('');
     let changeUsedData = JSON.parse(unescape('<%- escape(JSON.stringify(changeUsedData)) %>'));
     let changeUsedData = JSON.parse(unescape('<%- escape(JSON.stringify(changeUsedData)) %>'));
     const change = JSON.parse(unescape('<%- escape(JSON.stringify(change)) %>'));
     const change = JSON.parse(unescape('<%- escape(JSON.stringify(change)) %>'));
+    const isNewPriceLedgerData = JSON.parse(unescape('<%- escape(JSON.stringify(isNewPriceLedgerData)) %>'));
 </script>
 </script>
 <% if (!change.readOnly || change.shenpiPower) { %>
 <% if (!change.readOnly || change.shenpiPower) { %>
 <script>
 <script>