更改支付审批tender值为paymentTender

app/controller/payment_controller.js

@@ -379,7 +379,7 @@ module.exports = app => {
                     moment,
                     whiteList: ctx.app.config.multipart.whitelist,
                     uidList,
-                    preUrl: '/payment/' + ctx.tender.id + '/detail/' + ctx.detail.id,
+                    preUrl: '/payment/' + ctx.paymentTender.id + '/detail/' + ctx.detail.id,
                     OSS_PATH: ctx.app.config.fujianOssPath,
                 };
                 renderData.nextDetail = await ctx.service.paymentDetail.getDataByCondition({ tr_id: ctx.trInfo.id, order: ctx.detail.order + 1 });
@@ -573,7 +573,7 @@ module.exports = app => {
                 if (!result) {
                     throw '删除报表表单详情失败，请重试';
                 }
-                ctx.redirect('/payment/' + ctx.tender.id + '/list/' + detailInfo.tr_id);
+                ctx.redirect('/payment/' + ctx.paymentTender.id + '/list/' + detailInfo.tr_id);
             } catch (err) {
                 this.log(err);
                 ctx.session.postError = err.toString();
@@ -616,19 +616,19 @@ module.exports = app => {
 
         async _returnRptProjectList(ctx, formProcess = false) {
             // 获取报表表单列表
-            if (ctx.payment.auditPermission.view_all || ctx.tender.uid === ctx.session.sessionUser.accountId || formProcess) {
+            if (ctx.payment.auditPermission.view_all || ctx.paymentTender.uid === ctx.session.sessionUser.accountId || formProcess) {
                 const rptProject = await ctx.service.rptTreeNode.getDataByCondition({ pid: ctx.session.sessionProject.id, name: '01.支付审批报表' });
                 const rptProjectList = [];
                 const newRptList = rptProject && rptProject.items ? JSON.parse(rptProject.items) : [];
                 ctx.rptListNum = 0;
                 await this.getNewRptProjectList(ctx, newRptList, rptProjectList, 1);
-                const tenderRptList = await ctx.service.paymentTenderRpt.getProcessList(ctx.tender.id);
+                const tenderRptList = await ctx.service.paymentTenderRpt.getProcessList(ctx.paymentTender.id);
                 if (tenderRptList === -1) {
                     throw '未配置表单设置，请联系管理员处理';
                 }
                 return await ctx.service.paymentTenderRpt.checkAndUpdateList(tenderRptList, rptProjectList, formProcess);
             }
-            return await ctx.service.paymentTenderRpt.getList(ctx.tender.id, ctx.session.sessionUser.accountId);
+            return await ctx.service.paymentTenderRpt.getList(ctx.paymentTender.id, ctx.session.sessionUser.accountId);
         }
         // 循环获取到到rptProject
         async getNewRptProjectList(ctx, newRptList, rptProjectList, level = 1) {
@@ -647,7 +647,7 @@ module.exports = app => {
 
         async process(ctx) {
             try {
-                if (!ctx.payment.auditPermission || !ctx.payment.auditPermission.admin || !(ctx.session.sessionUser.is_admin || ctx.tender.uid === ctx.session.sessionUser.accountId)) {
+                if (!ctx.payment.auditPermission || !ctx.payment.auditPermission.admin || !(ctx.session.sessionUser.is_admin || ctx.paymentTender.uid === ctx.session.sessionUser.accountId)) {
                     throw '权限不足';
                 }
                 let [tenderRptList, rptProjectList] = await this._returnRptProjectList(ctx, true);
@@ -670,7 +670,7 @@ module.exports = app => {
                     return { groupName: item.name, groupList };
                 });
                 const renderData = {
-                    tender: ctx.tender,
+                    tender: ctx.paymentTender,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.payment.process),
                     rptProjectList,
                     tenderRptList,
@@ -702,7 +702,7 @@ module.exports = app => {
                 }
                 switch (data.type) {
                     case 'add-rpt':
-                        responseData.data = await ctx.service.paymentTenderRpt.setRpt(ctx.tender.id, data.rpt_list);
+                        responseData.data = await ctx.service.paymentTenderRpt.setRpt(ctx.paymentTender.id, data.rpt_list);
                         break;
                     case 'change-status':
                         responseData.data = await ctx.service.paymentTenderRpt.setStatus(data.tr_id, data.status);
@@ -763,7 +763,7 @@ module.exports = app => {
                     trDetailList[0].emptySign = await ctx.service.paymentRptAudit.haveEmptySign(trDetailList[0].id);
                 }
                 const renderData = {
-                    tender: ctx.tender,
+                    tender: ctx.paymentTender,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.payment.list),
                     tenderRptList,
                     trInfo,
@@ -773,7 +773,7 @@ module.exports = app => {
                     accountGroup: [],
                     accountList: [],
                     paymentConst,
-                    preUrl: '/payment/' + ctx.tender.id + '/list/' + trInfo.id,
+                    preUrl: '/payment/' + ctx.paymentTender.id + '/list/' + trInfo.id,
                 };
                 // 获取报表信息，新增时及设置报表角色时使用
                 if (trInfo.uid === ctx.session.sessionUser.accountId && trInfo.is_del === 0 && trInfo.rpt_id) {
@@ -979,7 +979,7 @@ module.exports = app => {
                 let index = 0;
                 const extra_upload = ctx.detail.status === auditConst.status.checked;
                 const original_data = {
-                    tender_id: ctx.tender.id,
+                    tender_id: ctx.paymentTender.id,
                     tr_id: ctx.trInfo.id,
                     td_id: ctx.detail.id,
                 }

app/middleware/payment_tender_check.js

@@ -43,7 +43,7 @@ module.exports = options => {
                 auditPermission,
                 project_setting: modes,
             }
-            this.tender = tender;
+            this.paymentTender = tender;
             this.payment = payment;
             yield next;
         } catch (err) {

app/service/payment_detail.js

@@ -64,7 +64,7 @@ module.exports = app => {
                 const pageRst = this.ctx.service.jpcReport.getAllPreviewPagesCommon(rptTpl, 'A4');
                 const order = details.length + 1;
                 const newDetail = {
-                    tender_id: this.ctx.tender.id,
+                    tender_id: this.ctx.paymentTender.id,
                     tr_id: trInfo.id,
                     order,
                     times: 1,
@@ -85,7 +85,7 @@ module.exports = app => {
                 const insertRptAudit = [];
                 for (const [i, r] of trInfo.rpt_audit.entries()) {
                     insertRptAudit.push({
-                        tender_id: this.ctx.tender.id,
+                        tender_id: this.ctx.paymentTender.id,
                         tr_id: trInfo.id,
                         td_id: newDetail.id,
                         uid: r.uid,

app/service/payment_detail_audit.js

@@ -241,7 +241,7 @@ module.exports = app => {
                 newOrder = is_gdzs === 1 ? newOrder - 1 : newOrder;
                 if (is_gdzs) await this._syncOrderByDelete(transaction, detailId, newOrder, times, '+');
                 const data = {
-                    tender_id: this.ctx.tender.id,
+                    tender_id: this.ctx.paymentTender.id,
                     tr_id: this.ctx.trInfo.id,
                     td_id: detailId,
                     aid: auditorId,

app/service/payment_shenpi_audit.js

@@ -26,9 +26,9 @@ module.exports = app => {
 
         async getShenpiAudit(tr_id, status) {
             if (status === shenpiConst.sp_status.gdspl) {
-                return await this.getAuditList(this.ctx.tender.id, tr_id, status);
+                return await this.getAuditList(this.ctx.paymentTender.id, tr_id, status);
             } else if (status === shenpiConst.sp_status.gdzs) {
-                return await this.getAudit(this.ctx.tender.id, tr_id, status);
+                return await this.getAudit(this.ctx.paymentTender.id, tr_id, status);
             }
         }
 
@@ -50,7 +50,7 @@ module.exports = app => {
             const transaction = await this.db.beginTransaction();
             try {
                 const insertData = {
-                    tid: this.ctx.tender.id,
+                    tid: this.ctx.paymentTender.id,
                     tr_id: data.tr_id,
                     sp_status: data.status,
                     audit_id: data.audit_id,
@@ -68,7 +68,7 @@ module.exports = app => {
             const transaction = await this.db.beginTransaction();
             try {
                 const delData = {
-                    tid: this.ctx.tender.id,
+                    tid: this.ctx.paymentTender.id,
                     tr_id: data.tr_id,
                     sp_status: data.status,
                     audit_id: data.audit_id,

app/service/payment_tender_rpt.js

@@ -239,7 +239,7 @@ module.exports = app => {
                 const result2 = await this.ctx.service.paymentShenpiAudit.removeAuditByReport(transaction, tr_id, data.uid);
                 await this.ctx.service.paymentPermissionAudit.saveAudits(this.ctx.session.sessionProject.id, [userInfo], transaction);
                 await transaction.commit();
-                let tenderRptList = await this.getProcessList(this.ctx.tender.id);
+                let tenderRptList = await this.getProcessList(this.ctx.paymentTender.id);
                 tenderRptList = this._.filter(tenderRptList, { type: 0, is_del: 0 });
                 return { list: tenderRptList, updateRows: result2.affectedRows };
             } catch (err) {

app/view/payment/detail.ejs

@@ -10,7 +10,7 @@
 <div class="panel-content">
     <div class="panel-title fluid">
         <div class="title-main  d-flex justify-content-between">
-            <div><a class="mr-2" href="/payment/<%- ctx.tender.id %>/list/<%- trInfo.id %>"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.tender.name %> / <%- trInfo.rpt_name %> / <%- ctx.detail.code %></div>
+            <div><a class="mr-2" href="/payment/<%- ctx.paymentTender.id %>/list/<%- trInfo.id %>"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.paymentTender.name %> / <%- trInfo.rpt_name %> / <%- ctx.detail.code %></div>
             <div>
                 <% if ((ctx.detail.status == auditConst.status.uncheck || ctx.detail.status == auditConst.status.checkNo) && trInfo.is_change) { %>
                 <span class="text-danger pull-right">报表内容已发生变化，请删除并重新生成详情</span>
@@ -130,7 +130,7 @@
                                                         <td><a href="javascript: void(0);" class="file-atn" f-id="<%- att.id %>"><%- att.filename %><%- att.fileext %></a></td>
                                                         <td><%- moment(att.upload_time).format("YYYY-MM-DD HH:mm:ss") %><br><%- ctx.helper.bytesToSize(att.filesize) %></td>
                                                         <td>
-                                                            <a href="/payment/<%- ctx.tender.id %>/detail/<%- ctx.detail.id %>/file/<%- att.id %>/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>
+                                                            <a href="/payment/<%- ctx.paymentTender.id %>/detail/<%- ctx.detail.id %>/file/<%- att.id %>/download" class="mr-2" title="下载"><span class="fa fa-download text-primary"></span></a>
                                                             <% if (att.uid === ctx.session.sessionUser.accountId && (ctx.detail.status === auditConst.status.checked ? Boolean(att.extra_upload) : true )) { %>
                                                                 <a href="javascript:void(0)" class="mr-2 delete-file" data-attid="<%- att.id %>" title="删除附件"><span class="fa fa-trash text-danger"></span></a>
                                                             <% } %>
@@ -164,7 +164,7 @@
 
 <script type="text/javascript">
     const accountId = parseInt('<%- ctx.session.sessionUser.accountId %>');
-    const tenderId = parseInt('<%- ctx.tender.id %>');
+    const tenderId = parseInt('<%- ctx.paymentTender.id %>');
     const detailId = parseInt('<%- ctx.detail.id %>');
     const detailStatus = parseInt('<%- ctx.detail.status %>');
     const trName =  JSON.parse(unescape('<%- escape(JSON.stringify(trInfo.rpt_name)) %>'));

app/view/payment/list.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <div class="panel-title fluid">
         <div class="title-main  d-flex justify-content-between">
-            <div><a class="mr-2" href="/payment"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.tender.name %></div>
+            <div><a class="mr-2" href="/payment"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.paymentTender.name %></div>
             <div>
                 <% if (ctx.session.sessionUser.accountId === trInfo.uid && trInfo.is_del === 0 && rptMsg) { %>
                 <% if (trDetailList.length === 0 || (trDetailList.length !== 0 && trDetailList[0].status === auditConst.status.checked)) { %>
@@ -22,7 +22,7 @@
                     <div class="col-3">
                         <div class="list-group">
                             <% for (const tr of tenderRptList) { %>
-                            <a href="/payment/<%- ctx.tender.id %>/list/<%- tr.id %>"
+                            <a href="/payment/<%- ctx.paymentTender.id %>/list/<%- tr.id %>"
                                class="list-group-item list-group-item-action <% if (trInfo.id === tr.id) { %>active<% } %>">
                                 <%- tr.rpt_name %><% if (tr.have_notice) { %><i class="fa fa-bell text-warning float-right mt-1" data-toggle="tooltip" data-placement="bottom" title="待处理提醒"></i><% } %>
                             </a>
@@ -58,11 +58,11 @@
                                         </td>
                                         <td class="text-center">
                                             <% if (info.status === auditConst.status.uncheck && info.uid === ctx.session.sessionUser.accountId) { %>
-                                                <a href="<%- '/payment/' + ctx.tender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
+                                                <a href="<%- '/payment/' + ctx.paymentTender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
                                             <% } else if (info.status === auditConst.status.checkNo && info.curAuditor && info.uid === ctx.session.sessionUser.accountId) { %>
-                                                <a href="<%- '/payment/' + ctx.tender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
+                                                <a href="<%- '/payment/' + ctx.paymentTender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
                                             <% } else if (info.status === auditConst.status.checking && info.curAuditor && info.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
-                                                <a href="<%- '/payment/' + ctx.tender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
+                                                <a href="<%- '/payment/' + ctx.paymentTender.id + '/detail/' + info.id %>" class="btn <%- auditConst.statusButtonClass[info.status] %> btn-sm"><%- auditConst.statusButton[info.status] %></a>
                                             <% } else { %>
                                                 <span class="<%- auditConst.auditProgressClass[info.status] %>"><%- auditConst.auditProgress[info.status] %></span>
                                             <% } %>
@@ -83,7 +83,7 @@
     </div>
 </div>
 <script>
-    const tenderId = parseInt('<%- ctx.tender.id %>');
+    const tenderId = parseInt('<%- ctx.paymentTender.id %>');
     const trId = parseInt('<%- trInfo.id %>');
     const rptMsg = JSON.parse(unescape('<%- escape(JSON.stringify(rptMsg)) %>'));
     console.log(rptMsg);

app/view/payment/process.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <div class="panel-title fluid">
         <div class="title-main  d-flex justify-content-between">
-            <div><a class="mr-2" href="/payment"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.tender.name %> / 标段设置</div>
+            <div><a class="mr-2" href="/payment"><i class="fa fa-chevron-left"></i> 返回</a><%- ctx.paymentTender.name %> / 标段设置</div>
         </div>
     </div>
     <div class="content-wrap">
@@ -124,7 +124,7 @@
     </div>
 </div>
 <script>
-    const tenderId = parseInt('<%- ctx.tender.id %>');
+    const tenderId = parseInt('<%- ctx.paymentTender.id %>');
     const sp_status = JSON.parse('<%- JSON.stringify(shenpi.sp_status) %>');
     const sp_status_list = JSON.parse('<%- JSON.stringify(shenpi.sp_status_list) %>');
     const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));