1

app/public/js/measure_stage.js

@@ -45,7 +45,7 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                 </li>`);
             } else {
                 auditorsHTML.push(`<li class="list-group-item d-flex justify-content-between align-items-center">
-                    <span class="mr-1"><i class="fa fa fa-chevron-circle"></i></span>
+                    <span class="mr-1"><i class="fa fa fa-chevron-circle-down"></i></span>
                 <span class="text-muted">${getGroupAuditHtml(group)}</span>
                 <span class="badge badge-light badge-pill ml-auto"><small>${transFormToChinese(idx)}审</small></span>
                 ${getAuditTypeHtml(group[0].audit_type)}

app/public/js/shenpi.js

@@ -420,7 +420,7 @@ $(document).ready(function () {
                     }
                     addhtml += '<li class="pl-3"><a href="javascript:void(0);" class="add-audit"><i class="fa fa-plus"></i> 添加流程</a></li>';
                 } else {
-                    addhtml += auditUtils.getAuditGroupHtml(this_code, [], i + 1);
+                    addhtml += auditUtils.getAuditGroupHtml(this_code, [], 1);
                 }
                 addhtml += '</ul>\n';
                 _self.parents('.form-group').siblings('.lc-show').html(addhtml);

app/router.js

@@ -736,6 +736,7 @@ module.exports = app => {
     app.post('/sp/:id/filing/move', sessionAuth, subProjectCheck, 'fileController.moveFiling');
     app.post('/sp/:id/file/load', sessionAuth, subProjectCheck, 'fileController.loadFile');
     app.post('/sp/:id/file/upload', sessionAuth, subProjectCheck, 'fileController.uploadFile');
+    app.post('/sp/:id/file/upload/big', sessionAuth, subProjectCheck, 'fileController.uploadBigFile');
     app.post('/sp/:id/file/del', sessionAuth, subProjectCheck, 'fileController.delFile');
     app.post('/sp/:id/file/save', sessionAuth, subProjectCheck, 'fileController.saveFile');
     app.post('/sp/:id/file/rela', sessionAuth, subProjectCheck, 'fileController.relaFile');

app/service/tender_cache.js

@@ -202,7 +202,7 @@ module.exports = app => {
 
             const auditIds = auditors.map(x => { return x.aid; });
             data.stage_flow_cur_uid = auditIds.join(',');
-            const cur_flow_info = await this.ctx.service.projectAccount.getAccountCacheDatas(auditIds, {order: stage.order, status: auditConst.stage.status.checking});
+            const cur_flow_info = await this.ctx.service.projectAccount.getAccountCacheDatas(auditIds, {order: stage.order, audit_order: 1, status: auditConst.stage.status.checking});
             data.stage_flow_cur_info = JSON.stringify(cur_flow_info);
             data.stage_flow_cur_tp = JSON.stringify(tp);
             await transaction.update(this.tableName, data);
@@ -431,17 +431,17 @@ module.exports = app => {
                         name: curAuditor.name, company: curAuditor.company, role: curAuditor.role, mobile: curAuditor.mobile, telephone: curAuditor.telephone,
                     }}));
                     data.stage_flow_cur_tp = JSON.stringify(tp);
-                    const preAuditors = lastStage.curOrder > 1 ? await this.ctx.service.stageAudit.getAuditorsByOrder(lastStage.id, lastStage.times, lastStage.curOrder - 1) : null;
+                    const preAuditors = lastStage.curOrder > 1 ? await this.ctx.service.stageAudit.getAuditorsByOrder(lastStage.id, lastStage.times, lastStage.curOrder - 1) : [];
                     if (preAuditors.length > 0) {
                         const preAuditorIds = preAuditors.map(x => { return x.aid; });
                         data.stage_flow_pre_uid = preAuditorIds.join(',');
                         data.stage_flow_pre_info = JSON.stringify(preAuditors.map(preAuditor => { return {
-                            order: lastStage.order, audit_order: preAuditor.order, status: preAuditor.status, time: preAuditor.end_time,
+                            order: lastStage.order, audit_order: preAuditor.audit_order, status: preAuditor.status, time: preAuditor.end_time,
                             name: preAuditor.name, company: preAuditor.company, role: preAuditor.role, mobile: preAuditor.mobile, telephone: preAuditor.telephone,
                         }}));
                     } else {
                         data.stage_flow_pre_uid = lastStage.user_id;
-                        const preInfo = await this.ctx.service.projectAccount.getAccountCacheData(lastStage.user_id, { order: 0, status: auditConst.stage.status.uncheck, time: curAuditor.begin_time });
+                        const preInfo = await this.ctx.service.projectAccount.getAccountCacheData(lastStage.user_id, { order: 0, status: auditConst.stage.status.uncheck, time: curAuditors[0].begin_time });
                         data.stage_flow_pre_info = JSON.stringify(preInfo);
                     }
                     const his = preAuditors.length > 0