Merge remote-tracking branch 'remotes/origin/dev' into uat

app/controller/stage_extra_controller.js

@@ -203,13 +203,13 @@ module.exports = app => {
                 const parts = ctx.multipart({ autoFields: true });
                 let index = 0;
                 const create_time = Date.parse(new Date()) / 1000;
-                let bonus;
-                while ((stream = await parts()) !== undefined) {
+                let stream = await parts();
+                const bonus = await ctx.service.stageBonus.getStageDataById(parts.field.bonus_id);
+                if (!bonus || bonus.sid !== ctx.stage.id) throw '该奖罚金，当前不允许上传附件';
+                while (stream !== undefined) {
                     if (!stream.filename) {
                         throw '未发现上传文件!';
                     }
-                    if (!bonus) bonus = await ctx.service.stageBonus.getStageDataById(parts.field.bonus_id);
-                    if (!bonus || bonus.sid !== ctx.stage.id) throw '该奖罚金，当前不允许上传附件';
 
                     const fileInfo = path.parse(stream.filename);
                     const dirName = 'app/public/upload/extra/' + moment().format('YYYYMMDD');
@@ -229,6 +229,11 @@ module.exports = app => {
                         in_time: moment(create_time * 1000).format('YYYY-MM-DD'),
                     });
                     ++index;
+                    if (Array.isArray(parts.field.size) && index < parts.field.size.length) {
+                        stream = await parts();
+                    } else {
+                        stream = undefined;
+                    }
                 }
                 const result = await ctx.service.stageBonus.updateDatas({
                     update: [
@@ -315,4 +320,4 @@ module.exports = app => {
     }
 
     return StageExtraController;
-};
+};

app/view/report/rpt_all_popup.ejs

@@ -203,7 +203,9 @@
             <div class="modal-body" id="eSignatureBodyDiv">
             </div>
             <div class="modal-footer">
-                <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-setupProjSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'batch-eSignatureBodyDiv'); buildTendersTree();">批量设置其他标段</button>
+                <% if ((pageShow !== null) && (parseInt(pageShow.openSign) === 1)) { %>
+                    <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-setupProjSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'batch-eSignatureBodyDiv'); buildTendersTree();">批量设置其他标段</button>
+                <% } %>
                 <!--
 
                 <button type="button" class="btn btn-sm btn-link float-left" data-toggle="modal" data-target="#batch-eSignature" id="hidden_show_batch_eSignature" style="display:none"></button>