Przeglądaj źródła

变更申请、变更立项,开放批量设置签名

MaiXinRong 10 miesięcy temu
rodzic
commit
75e288ca1f

+ 8 - 1
app/controller/report_controller.js

@@ -354,6 +354,7 @@ module.exports = app => {
                     bglObj: 'null',
                     changes: 'null',
                     otherChangeList: 'null',
+                    otherHintName: '',
                     advanceConst,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
@@ -514,6 +515,7 @@ module.exports = app => {
                     bglObj: 'null',
                     changes: 'null',
                     otherChangeList: 'null',
+                    otherHintName: '',
                 };
                 /*
                 //*/
@@ -665,6 +667,7 @@ module.exports = app => {
                     bglObj: 'null',
                     changes: 'null',
                     otherChangeList: 'null',
+                    otherHintName: '',
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
 
@@ -735,14 +738,17 @@ module.exports = app => {
                     }
                 }
 
-                let otherChangeList = [];
+                let otherChangeList = [], otherHintName = '';
                 switch (stage_id) {
                     case rptBusiness.BusinessStageId.change_plan:
                         otherChangeList = await ctx.service.changePlan.getListByStatus(tenderId, 0, 0, 0, 0, state);
+                        otherHintName = '变更方案';
                     case rptBusiness.BusinessStageId.change_project:
                         otherChangeList = await ctx.service.changeProject.getListByStatus(tenderId, 0, 0, 0, 0, state);
+                        otherHintName = '变更立项';
                     case rptBusiness.BusinessStageId.change_apply:
                         otherChangeList = await ctx.service.changeApply.getListByStatus(tenderId, 0, 0, 0, 0, state);
+                        otherHintName = '变更申请';
                 }
                 let archiveList = [];
                 const archives = await ctx.service.rptArchive.getArchiveByBzId(pid, stage_id, bglObj.BUSINESS_ID);
@@ -866,6 +872,7 @@ module.exports = app => {
                     bglObj: JSON.stringify(bglObj),
                     changes: JSON.stringify(changes),
                     otherChangeList: JSON.stringify(otherChangeList),
+                    otherHintName,
                     bizId: bglObj.BUSINESS_ID,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');

+ 8 - 5
app/view/report/rpt_all_popup.ejs

@@ -209,8 +209,11 @@
                 <% if (stg_id === -300) { %>
                     <button type="button" id="btn_cross_tender" class="btn btn-sm btn-link float-left" data-dismiss="modal" data-toggle="modal" data-target="#batch-eSignature" id="batch-setupChangeSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'batch-eSignatureBodyDiv', true); buildChangeTree();">批量设置其他变更令</button>
                 <% } %>
-                <% if (stg_id === -301) { %>
-                <button type="button" id="btn_cross_tender" class="btn btn-sm btn-link float-left" data-dismiss="modal" data-toggle="modal" data-target="#batch-eSignature" id="batch-setupChangePlanSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'batch-eSignatureBodyDiv', true); buildOtherTree(ALL_OTHER);">批量设置其他变更方案</button>
+                <% if ([-301, -302, -303].indexOf(stg_id) >= 0) { %>
+                    <button type="button" id="btn_cross_tender" class="btn btn-sm btn-link float-left" data-dismiss="modal" data-toggle="modal" data-target="#batch-eSignature"
+                            onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'batch-eSignatureBodyDiv', true); buildOtherTree(ALL_OTHER);">
+                        批量设置其他<%- otherHintName %>
+                    </button>
                 <% } %>
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptSignatureHelper.removeSelectSignature()">取消</button>
                 <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectSignature('eSignatureBodyDiv')" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
@@ -241,8 +244,8 @@
                 </div>
                 <% if (stg_id === -300) { %>
                     <div class="alert alert-warning">批量操作会覆盖已设置好的签字,请谨慎操作;<b>已选签名的审核时间只对当前变更令有效</b></div>
-                <% } else if (stg_id === -301) { %>
-                    <div class="alert alert-warning">批量操作会覆盖已设置好的签字,请谨慎操作;<b>已选签名的审核时间只对当前变更方案有效</b></div>
+                <% } else if ([-301, -302, -303].indexOf(stg_id) >= 0) { %>
+                    <div class="alert alert-warning">批量操作会覆盖已设置好的签字,请谨慎操作;<b>已选签名的审核时间只对当前<%- otherHintName %>有效</b></div>
                 <% } else { %>
                     <div class="alert alert-warning">批量操作会覆盖已设置好的签字,请谨慎操作。</div>
                 <% } %>
@@ -251,7 +254,7 @@
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
                 <% if (stg_id === -300) { %>
                     <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectMultiChanges(SELECTED_CHANGES, 'batch-eSignatureBodyDiv')" class="btn btn-sm btn-primary" data-dismiss="modal">确定</a>
-                <% } else if (stg_id === -301) { %>
+                <% } else if ([-301, -302, -303].indexOf(stg_id) >= 0) { %>
                     <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectMultiOther(SELECTED_OTHER, 'batch-eSignatureBodyDiv')" class="btn btn-sm btn-primary" data-dismiss="modal">确定</a>
                 <% } else { %>
                     <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectMultiTenders(SELECTED_TENDERS, 'batch-eSignatureBodyDiv')" class="btn btn-sm btn-primary" data-dismiss="modal">确定</a>