Bladeren bron

名称修正

ellisran 3 weken geleden
bovenliggende
commit
fd6e01aa3a

+ 49 - 45
app/controller/financial_controller.js

@@ -569,17 +569,18 @@ module.exports = app => {
          * @param {Object} ctx - egg全局变量
          * @return {void}
          */
-        async pay(ctx) {
+        async payStage(ctx) {
             try {
                 const company = ctx.query.company || null;
-                await this._filterPay(ctx, company);
+                const qi = parseInt(ctx.query.qi) || null;
+                await this._filterPayStage(ctx, company, qi);
             } catch (err) {
                 this.log(err);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
 
-        async _filterPay(ctx, company = null) {
+        async _filterPayStage(ctx, company = null, qi = null) {
             const financialPermission = await ctx.service.subProjPermission.getFinancailPermission(ctx.subProject.permission.fund_trans_permission, ctx.subProject.permission.fund_pay_permission);
             if (!financialPermission.pay_show) {
                 throw '没有查看权限';
@@ -607,10 +608,11 @@ module.exports = app => {
             if (!userCompany) {
                 throw '请联系管理员添加用户所在单位信息';
             }
-            const userCompanyList = await ctx.service.financialPayCompany.getUserCompanyList(ctx.subProject.id, userCompany ? userCompany.id : 0, unitList);
+            const userOrderList = await ctx.service.financialPayStage.getUserOrderList(ctx.subProject.id, userCompany ? userCompany.id : 0);
+            const userCompanyList = await ctx.service.financialPayStage.getUserCompanyList(ctx.subProject.id, userCompany ? userCompany.id : 0, unitList);
             const companyInfo = company ? ctx.helper._.find(unitList, { name: company }) : null;
-            const payList = await ctx.service.financialPayCompany.getListByStatus(ctx.subProject.id, companyInfo ? companyInfo.id : null, userCompany ? userCompany.id : 0);
-            const total = await ctx.service.financialPayCompany.getCountByStatus(ctx.subProject.id, companyInfo ? companyInfo.id : null, userCompany ? userCompany.id : 0);
+            const payList = await ctx.service.financialPayStage.getListByStatus(ctx.subProject.id, companyInfo ? companyInfo.id : null, userCompany ? userCompany.id : 0, qi);
+            const total = await ctx.service.financialPayStage.getCountByStatus(ctx.subProject.id, companyInfo ? companyInfo.id : null, userCompany ? userCompany.id : 0, qi);
             // 分页相关
             const page = ctx.page;
             const pageSize = ctx.pageSize;
@@ -658,15 +660,17 @@ module.exports = app => {
                 usedList: financialConst.used,
                 auditConst: auditConst.financial,
                 company,
+                qi,
                 payList,
                 fptAuditTids,
                 fptReportTids,
                 userCompanyList,
+                userOrderList,
                 unitList,
                 moment,
                 user,
                 auditType: auditConst.auditType,
-                jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.pay),
+                jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.payStage),
                 pageInfo,
             };
             if (ctx.session.sessionUser.is_admin) {
@@ -678,10 +682,10 @@ module.exports = app => {
                 renderData.auditType = auditConst.auditType;
                 renderData.shenpi = shenpiConst;
             }
-            await this.layout('financial/pay.ejs', renderData, 'financial/pay_modal.ejs');
+            await this.layout('financial/pay_stage.ejs', renderData, 'financial/pay_stage_modal.ejs');
         }
 
-        async paySave(ctx) {
+        async payStageSave(ctx) {
             try {
                 const responseData = {
                     err: 0, msg: '', data: {},
@@ -736,11 +740,11 @@ module.exports = app => {
                     case 'copy-tender-bank':
                         responseData.data = await ctx.service.financialPayTender.copyBank2otherTender(ctx.subProject.id, data.tenders, data.this_tender);
                         break;
-                    case 'add-pay-company':
-                        responseData.data = await ctx.service.financialPayCompany.addPayCompany(ctx.subProject.id, data.updateData);
+                    case 'add-pay-stage':
+                        responseData.data = await ctx.service.financialPayStage.addPayStage(ctx.subProject.id, data.updateData);
                         break;
-                    case 'del-pay-company':
-                        responseData.data = await ctx.service.financialPayCompany.delPayCompany(data.postData.node);
+                    case 'del-pay-stage':
+                        responseData.data = await ctx.service.financialPayStage.delPayStage(data.postData.node);
                         break;
                     case 'set-pay-tender':
                         responseData.data = await ctx.service.financialPayTender.savePayTender(ctx.subProject.id, data.updateData);
@@ -766,25 +770,25 @@ module.exports = app => {
          * @param {Object} ctx - egg全局变量
          * @return {void}
          */
-        async payCompany(ctx) {
+        async pay(ctx) {
             try {
                 const status = parseInt(ctx.query.status) || 0;
                 const tid = parseInt(ctx.query.tid) || null;
                 const used = ctx.query.used || null;
-                await this._filterPayCompany(ctx, status, tid, used);
+                await this._filterPay(ctx, status, tid, used);
             } catch (err) {
                 this.log(err);
                 ctx.redirect(`/sp/${ctx.subProject.id}/dashboard`);
             }
         }
 
-        async _filterPayCompany(ctx, status = 0, tid = null, used = null) {
+        async _filterPay(ctx, status = 0, tid = null, used = null) {
             const financialPermission = await ctx.service.subProjPermission.getFinancailPermission(ctx.subProject.permission.fund_trans_permission, ctx.subProject.permission.fund_pay_permission);
             if (!financialPermission.pay_show) {
                 throw '没有查看权限';
             }
-            const payCompany = await ctx.service.financialPayCompany.getOnePayCompany(ctx.params.fpcid);
-            if (!payCompany) {
+            const payStage = await ctx.service.financialPayStage.getOnePayStage(ctx.params.fpsid);
+            if (!payStage) {
                 throw '该支付单位期不存在';
             }
             const fptAudits = await ctx.service.financialPayTenderAudit.getAllDataByCondition({ where: { spid: ctx.subProject.id, uid: ctx.session.sessionUser.accountId } });
@@ -807,12 +811,12 @@ module.exports = app => {
             const tenders = hadTender ? await ctx.service.tender.getAllDataByCondition({ where: tenderCondition, columns: ['id', 'name', 'category'] }) : [];
             const filter = JSON.parse(JSON.stringify(auditConst.financial.filter));
             filter.count = [];
-            filter.count[filter.status.pending] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payCompany.id, filter.status.pending, filterTids, used);// await ctx.service.change.pendingDatas(tender.id, ctx.session.sessionUser.accountId);
-            filter.count[filter.status.uncheck] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payCompany.id, filter.status.uncheck, filterTids, used);// await ctx.service.change.checkingDatas(tender.id, ctx.session.sessionUser.accountId);
-            filter.count[filter.status.checking] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payCompany.id, filter.status.checking, filterTids, used);// await ctx.service.change.checkedDatas(tender.id, ctx.session.sessionUser.accountId);
-            filter.count[filter.status.checked] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payCompany.id, filter.status.checked, filterTids, used);// await ctx.service.change.pendingDatas(tender.id, ctx.session.sessionUser.accountId);
-            const payList = await ctx.service.financialPay.getListByStatus(ctx.subProject.id, payCompany.id, status, filterTids, used, 1);
-            const total = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payCompany.id, status, filterTids, used);
+            filter.count[filter.status.pending] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payStage.id, filter.status.pending, filterTids, used);// await ctx.service.change.pendingDatas(tender.id, ctx.session.sessionUser.accountId);
+            filter.count[filter.status.uncheck] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payStage.id, filter.status.uncheck, filterTids, used);// await ctx.service.change.checkingDatas(tender.id, ctx.session.sessionUser.accountId);
+            filter.count[filter.status.checking] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payStage.id, filter.status.checking, filterTids, used);// await ctx.service.change.checkedDatas(tender.id, ctx.session.sessionUser.accountId);
+            filter.count[filter.status.checked] = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payStage.id, filter.status.checked, filterTids, used);// await ctx.service.change.pendingDatas(tender.id, ctx.session.sessionUser.accountId);
+            const payList = await ctx.service.financialPay.getListByStatus(ctx.subProject.id, payStage.id, status, filterTids, used, 1);
+            const total = await ctx.service.financialPay.getCountByStatus(ctx.subProject.id, payStage.id, status, filterTids, used);
             // 分页相关
             const page = ctx.page;
             const pageSize = ctx.pageSize;
@@ -874,8 +878,8 @@ module.exports = app => {
                     t.auditGroupList = ctx.helper._.find(allAuditGroupList, { tid: t.id }) ? ctx.helper._.find(allAuditGroupList, { tid: t.id }).audits : [];
                 }
             }
-            const notCompanyPays = await ctx.service.financialPay.getAllDataByCondition({ where: { spid: ctx.subProject.id, fpcid: null } });
-            for (const pay of notCompanyPays) {
+            const notStagePays = await ctx.service.financialPay.getAllDataByCondition({ where: { spid: ctx.subProject.id, fpsid: null } });
+            for (const pay of notStagePays) {
                 const t = ctx.helper._.find(tenders, { id: pay.tid });
                 pay.tenderName = t ? t.name : '';
                 const userInfo = ctx.helper._.find(accountList, { id: pay.uid });
@@ -892,15 +896,15 @@ module.exports = app => {
                 status,
                 used,
                 payList,
-                payCompany,
-                notCompanyPays,
+                payStage,
+                notStagePays,
                 fptAuditTids,
                 fptReportTids,
                 unitList,
                 moment,
                 auditType: auditConst.auditType,
                 // preUrl: '/financial',
-                jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.payCompany),
+                jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.financial.pay),
                 pageInfo,
             };
             if (ctx.session.sessionUser.is_admin) {
@@ -912,10 +916,10 @@ module.exports = app => {
                 renderData.auditType = auditConst.auditType;
                 renderData.shenpi = shenpiConst;
             }
-            await this.layout('financial/pay_company.ejs', renderData, 'financial/pay_company_modal.ejs');
+            await this.layout('financial/pay.ejs', renderData, 'financial/pay_modal.ejs');
         }
 
-        async payCompanySave(ctx) {
+        async paySave(ctx) {
             try {
                 const responseData = {
                     err: 0, msg: '', data: {},
@@ -924,19 +928,19 @@ module.exports = app => {
                 if (!data.type) {
                     throw '提交数据错误';
                 }
-                const payCompany = await ctx.service.financialPayCompany.getDataById(ctx.params.fpcid);
-                if (!payCompany) {
+                const payStage = await ctx.service.financialPayStage.getDataById(ctx.params.fpsid);
+                if (!payStage) {
                     throw '资金支付单位期不存在';
                 }
                 switch (data.type) {
                     case 'batch-old-pays':
-                        await ctx.service.financialPay.batchOldPays(ctx.subProject.id, payCompany, data.postData.payIds);
+                        await ctx.service.financialPay.batchOldPays(ctx.subProject.id, payStage, data.postData.payIds);
                         break;
                     case 'add-pay':
-                        responseData.data = await ctx.service.financialPay.addPay(ctx.subProject.id, payCompany, data.updateData);
+                        responseData.data = await ctx.service.financialPay.addPay(ctx.subProject.id, payStage, data.updateData);
                         break;
                     case 'del-pay':
-                        responseData.data = await ctx.service.financialPay.delPay(payCompany, data.postData.node);
+                        responseData.data = await ctx.service.financialPay.delPay(payStage, data.postData.node);
                         break;
                     default: throw '参数有误';
                 }
@@ -1000,7 +1004,7 @@ module.exports = app => {
                 if (!ctx.financialPay) {
                     throw '数据错误';
                 }
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 if (ctx.financialPay.uid !== ctx.session.sessionUser.accountId) {
@@ -1030,7 +1034,7 @@ module.exports = app => {
                 if (!ctx.financialPay || ctx.financialPay.status !== auditConst.financial.status.checking) {
                     throw '当前资金支付数据有误';
                 }
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 if (ctx.financialPay.curAuditorIds.length === 0 || ctx.financialPay.curAuditorIds.indexOf(ctx.session.sessionUser.accountId) === -1) {
@@ -1060,7 +1064,7 @@ module.exports = app => {
          */
         async checkPayAgain(ctx) {
             try {
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 // 获取终审
@@ -1111,7 +1115,7 @@ module.exports = app => {
                 const responseData = {
                     err: 0, msg: '', data: {},
                 };
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 const data = JSON.parse(ctx.request.body.data);
@@ -1144,13 +1148,13 @@ module.exports = app => {
                         responseData.data = await ctx.service.financialPayContract.addContracts(ctx.financialPay, data.contract_ids);
                         break;
                     case 'contract_del':
-                        responseData.data = await ctx.service.financialPayContract.delContract(ctx.financialPay.id, ctx.financialPay.payCompany, data.ids);
+                        responseData.data = await ctx.service.financialPayContract.delContract(ctx.financialPay.id, ctx.financialPay.payStage, data.ids);
                         break;
                     case 'contract_update':
-                        responseData.data = await ctx.service.financialPayContract.updateContract(ctx.financialPay.id, ctx.financialPay.payCompany, data.updateData);
+                        responseData.data = await ctx.service.financialPayContract.updateContract(ctx.financialPay.id, ctx.financialPay.payStage, data.updateData);
                         break;
                     case 'contract_paste':
-                        responseData.data = await ctx.service.financialPayContract.updateContracts(ctx.financialPay.id, ctx.financialPay.payCompany, data.updateData);
+                        responseData.data = await ctx.service.financialPayContract.updateContracts(ctx.financialPay.id, ctx.financialPay.payStage, data.updateData);
                         break;
                     case 'file_bill':
                         responseData.data = await ctx.service.financialPayAtt.updateBill(data.id, data.bill);
@@ -1174,7 +1178,7 @@ module.exports = app => {
                 const parts = this.ctx.multipart({
                     autoFields: true,
                 });
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 const files = [];
@@ -1236,7 +1240,7 @@ module.exports = app => {
          */
         async payDeleteFile(ctx) {
             try {
-                if (!ctx.financialPay.fpcid || !ctx.financialPay.payCompany) {
+                if (!ctx.financialPay.fpsid || !ctx.financialPay.payStage) {
                     throw '未关联资金支付单位期无法进行任何操作';
                 }
                 const { fpcid, id } = JSON.parse(ctx.request.body.data);

File diff suppressed because it is too large
+ 247 - 756
app/public/js/financial_pay.js


+ 0 - 325
app/public/js/financial_pay_company.js

@@ -1,325 +0,0 @@
-'use strict';
-let auditUtils;
-$(function () {
-    autoFlashHeight();
-
-    $('#tid_select').select2({
-        language: 'zh-CN',
-        theme: 'bootstrap4',
-        selectOnClose: true,
-        // width: '150',
-    });
-
-    $('#tid_select').change(function () {
-        const tid = parseInt($(this).val()) || 0;
-        setSelectValue('tid', tid);
-    });
-
-    $('#status_select .to-log-link').click(function () {
-        const status = parseInt($(this).data('val')) || null;
-        setSelectValue('status', status);
-    });
-
-    $('#used_select .to-log-link').click(function () {
-        const used = $(this).data('val') || null;
-        setSelectValue('used', used);
-    });
-
-    function setSelectValue(select, value) {
-        const routes = [];
-        const tid = select === 'tid' ? value : $('#tid_select').val();
-        if (tid) {
-            routes.push('tid=' + tid);
-        }
-        const status = select === 'status' ? value : $('#status_selected').data('value');
-        if (status) {
-            routes.push('status=' + status);
-        }
-        const used = select === 'used' ? value : $('#used_selected').data('value');
-        if (used) {
-            routes.push('used=' + used);
-        }
-        if (getLocalCache('account-pageSize')) {
-            routes.push('pageSize=' + getLocalCache('account-pageSize'));
-        }
-        window.location.href = `/sp/${spid}/financial/pay/company/${fpcid}` + (routes.length ? '?' + routes.join('&') : '');
-    }
-
-    $('#add-pay').on('show.bs.modal', function () {
-        let t = null;
-        if (tenders.length > 0) {
-            if (is_admin) {
-                t = tenders[0];
-            } else {
-                const filterTender = tenders.filter(t => _.includes(fptReportTids, t.id));
-                if (filterTender.length > 0) {
-                    t = filterTender[0];
-                }
-            }
-        }
-        $('#add-pay-tender').val(t ? t.id : '');
-        changeTender(t);
-    });
-
-    $('#add-pay-tender').on('change', function () {
-        const tender = tenders.find(t => t.id === parseInt($(this).val()));
-        changeTender(tender);
-    });
-
-    $('#add-pay-btn').on('click', function () {
-        const tid = $('#add-pay-tender').val();
-        const tender = tenders.find(t => t.id === parseInt(tid));
-        if (!tender) {
-            toastr.error('请选择支付标段');
-            return;
-        }
-        const code = $('#add-pay-code').val();
-        if (!code) {
-            toastr.error('请先去标段属性,填写合同编号');
-            return;
-        }
-        const prop = {
-            tid: tender.id,
-            code: code,
-            used: $('#add-pay-used').val(),
-        };
-        postData(`/sp/${spid}/financial/pay/company/${fpcid}/save`, { type: 'add-pay', updateData: prop }, function (result) {
-            window.location.href = `/sp/${spid}/financial/pay/${result.id}/detail`;
-        });
-    });
-
-    $('body').on('click', '#pay-list .del-pay-btn', function () {
-        const fpid = $(this).data('id');
-        deleteAfterHint(function () {
-            postData(`/sp/${spid}/financial/pay/company/${fpcid}/save`, {type: 'del-pay', postData: { node: fpid }}, function (result) {
-                window.location.reload();
-            })
-        }, '确认删除该资金支付?');
-    });
-
-    $('#batch-old-pays').click(function () {
-        const pays = [];
-        $('#contract-old-pay input[type="checkbox"]:checked').each(function () {
-            const fpid = parseInt($(this).val());
-            pays.push(fpid);
-        });
-        if (pays.length === 0) {
-            toastr.error('请选择关联的旧数据');
-            return;
-        }
-        console.log(pays);
-        postData(`/sp/${spid}/financial/pay/company/${fpcid}/save`, {type: 'batch-old-pays', postData: { payIds: pays }}, function (result) {
-            window.location.reload();
-        });
-    });
-
-    function changeTender(tender) {
-        $('#add-pay-tender').val(tender ? tender.id : '');
-        if (!tender) {
-            toastr.warning('请先为项目添加标段再申请支付');
-            return;
-        }
-        if (tender.dealCode) {
-            $('#add-pay-code').val(tender.dealCode + '-' + moment().format('YYYYMMDD') + '-' + makeNum(tender.startNum));
-            $('#add-pay-code').siblings('span').text('');
-        } else {
-            $('#add-pay-code').val('');
-            $('#add-pay-code').siblings('span').html('请先去<a href="/tender/' + tender.id + '" target="_blank">标段属性</a>,填写合同编号');
-        }
-    }
-
-    function makeNum(num) {
-        let str = num.toString();
-        while (str.length < 3) {
-            str = '0' + str;
-        }
-        return str;
-    }
-
-    $('#audit-list').on('click', 'a', function() {
-        const type = $(this).data('target')
-        const auditCard = $(this).parent().parent()
-        if (type === 'show') {
-            $(this).data('target', 'hide')
-            auditCard.find('.fold-card').slideDown('swing', () => {
-                auditCard.find('#end-target').text($(this).data('idx') + '#')
-                auditCard.find('#fold-btn').text('收起历史审核记录')
-            })
-        } else {
-            $(this).data('target', 'show')
-            auditCard.find('.fold-card').slideUp('swing', () => {
-                auditCard.find('#end-target').text('1#')
-                auditCard.find('#fold-btn').text('展开历史审核记录')
-            })
-        }
-    });
-
-    // 获取审批流程
-    $('a[data-target="#sp-list" ]').on('click', function () {
-        const data = {
-            type: 'get-auditors',
-            id: $(this).attr('c-id'),
-        };
-        postData(`/sp/${spid}/financial/pay/save`, data, function (result) {
-            const { auditHistory, auditors2, user } = result;
-            let auditorsHTML = [];
-            auditors2.forEach((group, idx) => {
-                if (idx === 0) {
-                    auditorsHTML.push(`<li class="list-group-item d-flex justify-content-between align-items-center">
-                        <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
-                    <span class="text-muted">${getGroupAuditHtml(group)}</span>
-                    <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
-                    </li>`);
-                } else if(idx === auditors2.length -1 && idx !== 0) {
-                    auditorsHTML.push(`<li class="list-group-item d-flex justify-content-between align-items-center">
-                        <span class="mr-1"><i class="fa fa fa-stop-circle fa-rotate-90"></i></span>
-                    <span class="text-muted">${getGroupAuditHtml(group)}</span>
-                    <div class="d-flex ml-auto">
-                    ${getAuditTypeHtml(group[0].audit_type)}
-                    <span class="badge badge-light badge-pill ml-auto"><small>终审</small></span>
-                    </div>
-                    </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-down"></i></span>
-                    <span class="text-muted">${getGroupAuditHtml(group)}</span>
-                    <div class="d-flex ml-auto">
-                    ${getAuditTypeHtml(group[0].audit_type)}
-                    <span class="badge badge-light badge-pill"><small>${transFormToChinese(idx)}审</small></span>
-                    </div>
-                    </li>`);
-                }
-            });
-            $('#auditor-list').empty();
-            $('#auditor-list').append(auditorsHTML.join(''));
-
-            let historyHTML = [];
-            auditHistory.forEach((his, idx) => {
-                if (idx === auditHistory.length - 1 && auditHistory.length !== 1) {
-                    historyHTML.push(`<div class="text-right"><a href="javascript: void(0);" id="fold-btn" data-target="show">展开历史审批流程</a></div>`);
-                }
-                historyHTML.push(`<div class="${idx < auditHistory.length - 1 ? 'fold-card' : ''}">`);
-                historyHTML.push(`<div class="text-center text-muted">${idx+1}#</div>`);
-                historyHTML.push(`<ul class="timeline-list list-unstyled mt-2 ${ idx === auditHistory.length - 1 && auditHistory.length !== 1 ? 'last-auditor-list' : '' }">`);
-                his.forEach((group, index) => {
-                    if (index === 0) {
-                        historyHTML.push(`<li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">
-                                                ${group.beginYear}
-                                                <span>${group.beginDate}</span>
-                                                <span>${group.beginTime}</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-success text-light"><i class="fa fa-caret-down"></i></div>
-                                            <div class="timeline-item-content">
-                                                <div class="py-1">
-                                                    <span class="text-black-50">原报</span>
-                                                    <span class="pull-right text-success">${idx !== 0 ? '重新' : '' }上报审批</span>
-                                                </div>
-                                                <div class="card">
-                                                    <div class="card-body px-3 py-0">
-                                                        <div class="card-text p-2 py-3 row">
-                                                            <div class="col">
-                                                                <span class="h6">${user.name}</span>
-                                                                <span class="text-muted ml-1">${user.role}</span>
-                                                            </div>
-                                                            <div class="col">
-                                                                <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>`);
-                    }
-                    historyHTML.push(`<li class="timeline-list-item pb-2 ${ group.status === auditConst.status.uncheck && idx === auditHistory.length - 1 && auditHistory.length !== 1 ? 'is_uncheck' : ''}">`);
-                    if (group.endYear) {
-                        historyHTML.push(`<div class="timeline-item-date">${group.endYear}<span>${group.endDate}</span><span>${group.endTime}</span></div>`);
-                    }
-                    if (index < his.length - 1) {
-                        historyHTML.push('<div class="timeline-item-tail"></div>');
-                    }
-                    if (group.status === auditConst.status.checked) {
-                        historyHTML.push('<div class="timeline-item-icon bg-success text-light"><i class="fa fa-check"></i></div>');
-                    } else if (group.status === auditConst.status.checkNo) {
-                        historyHTML.push('<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-level-up"></i></div>');
-                    } else if (group.status === auditConst.status.checking) {
-                        historyHTML.push('<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-ellipsis-h"></i></div>');
-                    } else if (group.status === auditConst.status.checkAgain) {
-                        historyHTML.push('<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-check"></i></div>');
-                    } else {
-                        historyHTML.push('<div class="timeline-item-icon bg-secondary text-light"></div>');
-                    }
-
-                    historyHTML.push('<div class="timeline-item-content">');
-                    historyHTML.push('<div class="py-1">');
-                    const statuStr = group.status !== auditConst.status.uncheck ?
-                        `<span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>` : '';
-                    historyHTML.push(`
-                    <span class="text-black-50">
-                    ${ group.audit_order === 0 ? '原报' : !group.is_final ? group.audit_order + '审' : '终审' } ${getAuditTypeText(group.audit_type)}
-                    </span>
-                    ${statuStr}`);
-                    historyHTML.push('</div>');
-                    historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
-                    for (const [i, auditor] of group.auditors.entries()) {
-                        historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
-                        historyHTML.push('<div class="col">');
-                        if (auditor.status === auditConst.status.checked) {
-                            historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');
-                        } else if (auditor.status === auditConst.status.checkNo) {
-                            historyHTML.push('<span class="pull-right text-warning"><i class="fa fa-share-square fa-rotate-270"></i></span>');
-                        } else if (auditor.status === auditConst.status.checking) {
-                            historyHTML.push('<span class="pull-right text-warning"><i class="fa fa-commenting"></i></span>');
-                        } else if (auditor.status === auditConst.status.checkAgain) {
-                            historyHTML.push('<span class="pull-right text-warning"><i class="fa fa-check"></i></span>');
-                        }
-                        historyHTML.push('</div>');
-                        if (auditor.opinion) {
-                            historyHTML.push(`<div class="col-12 py-1 bg-light"><i class="fa fa-commenting-o mr-1"></i>${auditor.opinion}</div>`);
-                        }
-                        historyHTML.push('</div>');
-                    }
-                    historyHTML.push('</div></div>');
-                    historyHTML.push('</div>');
-                    historyHTML.push('</li>');
-                });
-                historyHTML.push('</div>');
-                historyHTML.push('</ul>');
-            });
-            $('#audit-list').empty();
-            $('#audit-list').append(historyHTML.join(''));
-        });
-    });
-
-    $.subMenu({
-        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
-        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
-        key: 'menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
-        callback: function (info) {
-            if (info.mini) {
-                $('.panel-title').addClass('fluid');
-                $('#sub-menu').removeClass('panel-sidebar');
-            } else {
-                $('.panel-title').removeClass('fluid');
-                $('#sub-menu').addClass('panel-sidebar');
-            }
-            autoFlashHeight();
-        }
-    });
-});
-const getGroupAuditHtml = function (group) {
-    return group.map(u => { return `<small class="d-inline-block text-dark mx-1" title="${u.role}" data-auditorId="${u.aid}">${u.name}</small>`; }).join('');
-};
-
-const getAuditTypeHtml = function (type) {
-    if (type === auditType.key.common) return '';
-    return `<div class="li-subscript"><span class="badge badge-pill badge-${auditType.info[type].class} p-1 badge-bg-small"><small>${auditType.info[type].short}</small></span></div>`;
-};
-
-const getAuditTypeText = function (type) {
-    if (type === auditType.key.common) return '';
-    return `<span class="text-${auditType.info[type].class}">${auditType.info[type].long}</span>`;
-};

+ 848 - 0
app/public/js/financial_pay_stage.js

@@ -0,0 +1,848 @@
+'use strict';
+
+const tenderListSpec = (function(){
+    function getTenderNodeHtml(node, arr, pid) {
+        const html = [];
+        html.push('<tr pid="' + pid + '" data-tid="'+ (!node.cid ? node.id : -1) +'"' + (!node.cid ? 'class="change-tender" style="cursor: pointer;"' : '') + '>');
+        html.push('<td style="width: 60px" class="text-center">');
+        if (!node.cid) {
+            html.push(`<input type="checkbox" class="tender-check" name="tender_id[]" value="${node.id}" ${_.findIndex(tenders, { tid: node.id }) !== -1 ? 'checked disabled' : ''} ${is_admin || (fptReportTids && _.includes(fptReportTids, node.id)) ? '' : 'disabled' } />`);
+        }
+        html.push('</td>');
+        // 名称
+        html.push('<td class="in-' + node.level + '">');
+        if (node.cid) {
+            html.push('<span onselectstart="return false" style="{-moz-user-select:none}" class="fold-switch mr-1" title="收起" cid="'+ node.sort_id +'"><i class="fa fa-minus-square-o"></i></span> <i class="fa fa-folder-o"></i> ');
+            html.push((node.level === 1 ? '<b>' : ''), node.name, (node.level === 1 ? '</b>' : ''));
+        } else {
+            html.push('<span class="text-muted mr-2">');
+            html.push(arr.indexOf(node) === arr.length - 1 ? '└' : '├');
+            html.push('</span>');
+            html.push(node.name);
+        }
+        html.push('</td>');
+        html.push('</tr>');
+        return html.join('');
+    }
+    function getTenderTreeHeaderHtml() {
+        const html = [];
+        const left = $('#sub-menu').css('display') === 'none' ? 56 : 176;
+        html.push('<table class="table table-hover table-bordered" id="progress-table">')
+        html.push('<thead style="position: sticky;left:'+ left +'px;top: 0;">', '<tr>');
+        html.push('<th class="text-center" style="width: 60px;">', '选择', '</th>');
+        html.push('<th class="text-center">', '标段名称', '</th>');
+        html.push('</tr>', '</thead>');
+        return html.join('');
+    }
+    return { getTenderNodeHtml, getTenderTreeHeaderHtml }
+})();
+
+
+
+let auditUtils;
+$(function () {
+    autoFlashHeight();
+
+    $('#liucheng').on('shown.bs.modal', function () {
+        tenderListOrder.reOrderTenders();
+        initTenderTree();
+        $('#shenpi-tender-list').html(getTenderTreeHtml());
+        localHideList();
+        $('#shenpi-tender-list tr').removeClass('bg-warning');
+        if (tenders.length > 0) {
+            $('#shenpi-tender-list tr.change-tender').eq(0).addClass('bg-warning');
+            auditUtils.makeReportListHtml(tenders[0]);
+            auditUtils.makeShenpiListHtml(tenders[0]);
+        }
+    });
+
+    $('#payaccount').on('shown.bs.modal', function () {
+        tenderListOrder.reOrderTenders();
+        initTenderTree();
+        $('#pay-tender-list').html(getTenderTreeHtml());
+        localHideList();
+        $('#pay-tender-list tr').removeClass('bg-warning');
+        if (tenders.length > 0) {
+            $('#pay-tender-list tr.change-tender').eq(0).addClass('bg-warning');
+            auditUtils.makeBankHtml(tenders[0]);
+        }
+    });
+
+    $('#company_select').change(function () {
+        const company_id = parseInt($(this).val()) || 0;
+        setSelectValue('company', company_id);
+    });
+
+    $('#order_select').change(function () {
+        const qi = parseInt($(this).val()) || 0;
+        setSelectValue('qi', qi);
+    });
+
+    function setSelectValue(select, value) {
+        const routes = [];
+        const company_id = select === 'company' ? value : parseInt($('#company_select').val());
+        if (company_id) {
+            const companyInfo = _.find(userCompanyList, { id: company_id });
+            if (companyInfo) routes.push('company=' + companyInfo.name);
+        }
+        const qi = select === 'qi' ? value : parseInt($('#order_select').val());
+        if (qi) {
+            routes.push('qi=' + qi);
+        }
+        if (getLocalCache('account-pageSize')) {
+            routes.push('pageSize=' + getLocalCache('account-pageSize'));
+        }
+        window.location.href = `/sp/${spid}/financial/pay/stage` + (routes.length ? '?' + routes.join('&') : '');
+    }
+
+    let timer = null
+    let oldSearchVal = null
+    $('#liucheng').on('input propertychange', '.gr-search', function(e) {
+        oldSearchVal = e.target.value;
+        timer && clearTimeout(timer);
+        timer = setTimeout(() => {
+            const newVal = $(this).val();
+            const code = $(this).attr('data-code');
+            let html = '';
+            if (newVal && newVal === oldSearchVal) {
+                accountList.filter(item => item && (item.name.indexOf(newVal) !== -1 || (item.mobile && item.mobile.indexOf(newVal) !== -1))).forEach(item => {
+                    html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >
+                        <p class="mb-0 d-flex"><span class="text-primary">${item.name}</span><span
+                                class="ml-auto">${item.mobile || ''}</span></p>
+                        <span class="text-muted">${item.role || ''}</span>
+                    </dd>`
+                });
+                $('#' + code + '_dropdownMenu .book-list').empty();
+                $('#' + code + '_dropdownMenu .book-list').append(html);
+            } else {
+                if (!$('#' + code + '_dropdownMenu .acc-btn').length) {
+                    accountGroup.forEach((group, idx) => {
+                        if (!group) return;
+                        html += `<dt><a href="javascript: void(0);" class="acc-btn" data-groupid="${idx}" data-type="hide"><i class="fa fa-plus-square"></i>
+                        </a> ${group.groupName}</dt>
+                        <div class="dd-content" data-toggleid="${idx}">`;
+                        group.groupList.forEach(item => {
+                            html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >
+                                <p class="mb-0 d-flex"><span class="text-primary">${item.name}</span><span
+                                        class="ml-auto">${item.mobile || ''}</span></p>
+                                <span class="text-muted">${item.role || ''}</span>
+                            </dd>`;
+                        });
+                        html += '</div>';
+                    });
+                    $('#' + code + '_dropdownMenu .book-list').empty();
+                    $('#' + code + '_dropdownMenu .book-list').append(html);
+                }
+            }
+        }, 400);
+    });
+
+    $('body').on('click', '#shenpi-tender-list .change-tender', function () {
+        if ($(this).hasClass('bg-warning')) {
+            return;
+        }
+        $('#shenpi-tender-list tr').removeClass('bg-warning');
+        $(this).addClass('bg-warning');
+        const tid = parseInt($(this).data('tid')) || 0;
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        auditUtils.makeReportListHtml(tender);
+        auditUtils.makeShenpiListHtml(tender);
+    });
+
+    $('body').on('click', '#pay-tender-list .change-tender', function () {
+        if ($(this).hasClass('bg-warning')) {
+            return;
+        }
+        $('#pay-tender-list tr').removeClass('bg-warning');
+        $(this).addClass('bg-warning');
+        const tid = parseInt($(this).data('tid')) || 0;
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        auditUtils.makeBankHtml(tender);
+    });
+    auditUtils = {
+        makeReportListHtml: function (flow) {
+            let addHtml = '';
+            $('#select-all-ptAudits').prop('checked', false);
+            for (const pl of flow.permissionList) {
+                addHtml += `<tr>
+                                <td class="text-center"><input type="checkbox" class="select-ptAudit" data-id="${pl.id}"></td><td>${pl.name}</td><td>${pl.company}</td>
+                                <td class="text-center"><input type="checkbox" class="save-report" data-id="${pl.id}" ${pl.is_report ? 'checked' : ''}></td><td class="text-center"><a href="javascript:void(0);" class="text-danger remove-audit" data-id="${pl.id}">移除</a></td>
+                            </tr>`;
+            }
+            $('#report-list').html(addHtml);
+        },
+        makeShenpiListHtml: function (flow) {
+            let addhtml = '<ul class="list-unstyled">\n';
+            addhtml += this.getgdsplHtml(flow, 'financial');
+            addhtml += '</ul>\n';
+            $('#shenpi-list').html(addhtml);
+        },
+        makeBankHtml: function (tender) {
+            $('#payaccount input[name="name"]').val('');
+            $('#payaccount input[name="bank"]').val('');
+            $('#payaccount input[name="bank_account"]').val('');
+            $('#payaccount input[name="contact"]').val('');
+            $('#payaccount input[name="phone"]').val('');
+            if (tender) {
+                $('#payaccount input[name="name"]').val(tender.pt.name);
+                $('#payaccount input[name="bank"]').val(tender.pt.bank);
+                $('#payaccount input[name="bank_account"]').val(tender.pt.bank_account);
+                $('#payaccount input[name="contact"]').val(tender.pt.contact);
+                $('#payaccount input[name="phone"]').val(tender.pt.phone);
+                if (is_admin || (fptReportTids && _.includes(fptReportTids, tender.id))) {
+                    $('#payaccount table input[type="text"]').attr('readonly', false);
+                    $('#get-form-tender').show();
+                    $('#batch-other-bank').show();
+                } else {
+                    $('#payaccount table input[type="text"]').attr('readonly', true);
+                    $('#get-form-tender').hide();
+                    $('#batch-other-bank').hide();
+                }
+            }
+        },
+        getAuditHtml: function(audit, is_report = 0) {
+            return '<span class="d-inline-block"><span class="badge badge-light">'+ audit.name +' <span class="dropdown">\n' +
+                '                                                            <a href="javascript:void(0);" class="btn-sm text-danger px-1" title="移除" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-remove"></i></a>\n' +
+                '                                                            <div class="dropdown-menu">\n' +
+                '                                                                <a class="dropdown-item" href="javascript:void(0);">确认移除' + ( is_report ? '填报人' : '审批人') + '?</a>\n' +
+                '                                                                <div class="dropdown-divider"></div>\n' +
+                '                                                                <div class="px-2 py-1 text-center">\n' +
+                '                                                                    <button class="remove-audit btn btn-sm btn-danger" data-id="' + (is_report ? audit.id : audit.audit_id) + '">移除</button>\n' +
+                '                                                                    <button class="btn btn-sm btn-secondary">取消</button>\n' +
+                '                                                                </div>\n' +
+                '                                                            </div>\n' +
+                '                                                        </span> ' +
+                '                                            </span></span>\n'
+        },
+        getAuditTypeHtml: function(code, type) {
+            const html = [];
+            html.push(`<span class="d-inline-block"><select class="form-control form-control-sm audit-type-key" data-type="${type}">`);
+            for (const t of auditType.types) {
+                if (t.valid && t.valid.indexOf(code) < 0) continue;
+                html.push(`<option value="${t.value}" ${t.value === type ? 'selected' : ''}>${t.name}</option>`);
+            }
+            html.push('</select></span> ');
+            return html.join('');
+        },
+        getSelectAuditHtml: function (code, is_report = 0) {
+            let divhtml = '';
+            accountGroup.forEach((group, idx) => {
+                let didivhtml = '';
+                if(group) {
+                    group.groupList.forEach(item => {
+                        didivhtml += '<dd class="border-bottom p-2 mb-0 " data-id="' + item.id + '" >\n' +
+                            '<p class="mb-0 d-flex"><span class="text-primary">' + item.name + '</span><span\n' +
+                            '                                                                                class="ml-auto">' + item.mobile + '</span></p>\n' +
+                            '                                                                    <span class="text-muted">' + item.role + '</span>\n' +
+                            '                                                                    </dd>\n';
+                    });
+                    divhtml += '<dt><a href="javascript: void(0);" class="acc-btn" data-groupid="' + idx + '" data-type="hide"><i class="fa fa-plus-square"></i></a> ' + group.groupName + '</dt>\n' +
+                        '                                                                <div class="dd-content" data-toggleid="' + idx + '">\n' + didivhtml +
+                        '                                                                </div>\n';
+                }
+            });
+            const html =
+                '                                            <span class="d-inline-block">\n' +
+                '                                                <div class="dropdown text-right">\n' +
+                '                                                    <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="' + code + '_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">\n' +
+                '                                                        ' + (is_report ? '添加填报人' : '选择审批人') + '\n' +
+                '                                                    </button>\n' +
+                '                                                    <div class="dropdown-menu dropdown-menu-right" id="' + code + '_dropdownMenu" aria-labelledby="' + code + '_dropdownMenuButton" style="width:220px">\n' +
+                '                                                        <div class="mb-2 p-2"><input class="form-control form-control-sm gr-search"\n' +
+                '                                                                                     placeholder="姓名/手机 检索" autocomplete="off" data-code="' + code + '"></div>\n' +
+                '                                                        <dl class="list-unstyled book-list">\n' + divhtml +
+                '                                                        </dl>\n' +
+                '                                                    </div>\n' +
+                '                                                </div>\n' +
+                '                                            </span>\n';
+            return html;
+        },
+        // 以下i从1开始
+        getAuditGroupInnerHtml: function(code, auditGroup, i) {
+            const html = [];
+            const type = auditGroup.length > 0 ? auditGroup[0].audit_type : auditType.key.common;
+            html.push(`<span class="col-auto">${transFormToChinese(i)}审</span><span class="col-10 spr-span">`);
+            html.push(this.getAuditTypeHtml(code, type));
+            for (const audit of auditGroup) {
+                html.push(this.getAuditHtml(audit));
+            }
+            if (type !== auditType.key.common || auditGroup.length === 0) {
+                html.push(this.getSelectAuditHtml(code));
+            }
+            if (type === auditType.key.union && auditGroup.length > 0) {
+                html.push(`<button class="btn btn-sm btn-outline-primary" sp_type="${code}" audit_order="${i}" name="union-set">协同设置</button>`);
+            }
+            html.push('</span>');
+            return html.join('');
+        },
+        getAuditGroupHtml: function (code, auditGroup, i) {
+            return `<li class="d-flex justify-content-start align-items-center mb-3">${this.getAuditGroupInnerHtml(code, auditGroup, i)}</li>`;
+        },
+        getgdsplHtml(flow, this_code) {
+            let addhtml = '';
+            if (flow.auditGroupList.length !== 0) {
+                for(const [i, auditGroup] of flow.auditGroupList.entries()) {
+                    addhtml += this.getAuditGroupHtml(this_code, auditGroup, i + 1);
+                }
+                const addGroupHtml = this_code === 'change' && (!flow.groupList || (flow.groupList && flow.groupList.length === 0)) ?
+                    `<span class="pl-3"><a href="javascript:void(0);" class="show-spzsave" data-code="${this_code}"><i class="fa fa-save"></i> 存为审批组</a></span>\n` : '';
+                addhtml += '<li>\n' +
+                    '                                            <span class="pl-3"><a href="javascript:void(0);" class="add-audit" ><i class="fa fa-plus"></i> 添加流程</a></span>\n' + addGroupHtml +
+                    '                                        </li>';
+            } else {
+                addhtml += this.getAuditGroupHtml(this_code, [], 1);
+            }
+            return addhtml;
+        },
+        // 以下i从0开始
+        addAudit: function (tender, user, i) {
+            const flow = tender;
+            if (!flow.auditGroupList) flow.auditGroupList = [];
+            if (!flow.auditGroupList[i]) flow.auditGroupList[i] = [];
+            flow.auditGroupList[i].push(user);
+            return flow.auditGroupList[i];
+        },
+        removeAudit: function (tender, audit_id, i) {
+            const flow = tender;
+            if (flow.auditGroupList[i].length === 1) {
+                flow.auditGroupList.splice(i, 1);
+                return null;
+            }
+            flow.auditGroupList[i].splice(flow.auditGroupList[i].findIndex(x => { return x.audit_id === audit_id; }), 1);
+            return flow.auditGroupList[i];
+        },
+        setAuditType: function (tender, audit_type, i) {
+            const flow = tender;
+            if (!flow || !flow.auditGroupList || !flow.auditGroupList[i]) return;
+            flow.auditGroupList[i].forEach(x => { x.audit_type = audit_type});
+            return flow.auditGroupList[i];
+        }
+    };
+
+    // 选中填报人
+    $('body').on('click', 'div[id="report_audit_dropdownMenu"] dl dd', function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const id = parseInt($(this).data('id'));
+        if (!id) return;
+        if (!isNaN(id) && id !== 0) {
+            postData(`/sp/${spid}/financial/pay/stage/save`, {type: 'add-tender-audit', id: id, tid: tender.id }, function (result) {
+                tender.permissionList = result;
+                auditUtils.makeReportListHtml(tender);
+            })
+        }
+    });
+
+    // 移除填报人
+    $('body').on('click', '#report-list .remove-audit', function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const id = parseInt($(this).data('id'));
+        deleteAfterHint(function () {
+            postData(`/sp/${spid}/financial/pay/stage/save`, {type: 'del-tender-audit', id, tid: tender.id }, function (result) {
+                tender.permissionList = result.permissionList;
+                tender.auditGroupList = result.auditGroupList;
+                auditUtils.makeReportListHtml(tender);
+                auditUtils.makeShenpiListHtml(tender);
+            });
+        }, '确认删除该标段用户?');
+    });
+
+    // 勾选是否为填报人
+    $('body').on('click', '#report-list .save-report', function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const id = parseInt($(this).data('id'));
+        const isReport = $(this).prop('checked');
+        const permission = tender.permissionList.find(p => p.id === id);
+        if (!permission) {
+            toastr.error('该用户不存在');
+            return;
+        }
+        postData(`/sp/${spid}/financial/pay/stage/save`, {type: 'save-permission', updateData: { id, is_report: isReport } }, function (result) {
+            permission.is_report = isReport;
+        });
+    });
+
+    $('#select-all-ptAudits').click(function () {
+        $('#report-list .select-ptAudit').prop('checked', $(this).prop('checked'));
+    });
+
+    $('#batch-del-ptAudit').click(function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const ids = [];
+        $('#report-list .select-ptAudit:checked').each(function () {
+            ids.push(parseInt($(this).data('id')));
+        });
+        if (ids.length === 0) {
+            toastr.warning('请勾选要删除的用户');
+            return;
+        }
+        deleteAfterHint(function () {
+            postData(`/sp/${spid}/financial/pay/stage/save`, {type: 'del-tender-audit', id: ids, tid: tender.id }, function (result) {
+                tender.permissionList = result.permissionList;
+                tender.auditGroupList = result.auditGroupList;
+                auditUtils.makeReportListHtml(tender);
+                auditUtils.makeShenpiListHtml(tender);
+            });
+        }, '确认删除已勾选的标段用户?');
+    });
+
+    $('#batch-other-ptAudit').click(function () {
+        const cur_tenderid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === cur_tenderid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const ids = [];
+        $('#report-list .select-ptAudit:checked').each(function () {
+            ids.push(parseInt($(this).data('id')));
+        });
+        if (ids.length === 0) {
+            toastr.warning('请勾选要同步的用户');
+            return;
+        }
+        const num = $('#shenpi-tender-list input:checked').length;
+        if (num === 0 || (num === 1 && parseInt($('#shenpi-tender-list input:checked').eq(0).parents('tr').data('tid')) === cur_tenderid)) {
+            toastr.warning('请选择需要设置审批同步的标段');
+            return;
+        }
+        const tenderList = [];
+        for (let i = 0; i < num; i++) {
+            const tid = parseInt($('#shenpi-tender-list input:checked').eq(i).parents('tr').data('tid'));
+            if (tid !== cur_tenderid) {
+                tenderList.push(tid);
+            }
+        }
+        const data = {
+            type: 'copy-tender-audit',
+            id: ids,
+            this_tid: tender.id,
+        }
+        data.tidList = tenderList.join(',');
+        postData(`/sp/${spid}/financial/pay/stage/save`,  data, function (result) {
+            toastr.success('已同步到其它勾选标段');
+            for (let i = 0; i < num; i++) {
+                const tid = parseInt($('#shenpi-tender-list input:checked').eq(i).parents('tr').data('tid'));
+                if (tid !== cur_tenderid) {
+                    const other_tender = tenders.find(t => t.id === tid);
+                    const permissionList = _.filter(result.otherPermissionList, { tid: tid });
+                    other_tender.permissionList = permissionList;
+                }
+            }
+        });
+    });
+
+    $('#batch-other-bank').click(function () {
+        const cur_tenderid = parseInt($('#pay-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === cur_tenderid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const copyTenders = [];
+        $('#pay-tender-list input:checked').each(function () {
+            if (cur_tenderid !== parseInt($(this).val())) {
+                const one = tenders.find(t => t.id === parseInt($(this).val()));
+                copyTenders.push(one.pt);
+            }
+        });
+        if (copyTenders.length === 0) {
+            toastr.warning('请勾选要同步的标段');
+            return;
+        }
+        const data = {
+            type: 'copy-tender-bank',
+            tenders: copyTenders,
+            this_tender: tender.pt,
+        }
+        postData(`/sp/${spid}/financial/pay/stage/save`,  data, function (result) {
+            toastr.success('已同步信息到其它勾选标段');
+            $('#pay-tender-list input:checked').each(function () {
+                if (cur_tenderid !== parseInt($(this).val())) {
+                    const one = tenders.find(t => t.id === parseInt($(this).val()));
+                    const newOne = result.find(t => t.tid === one.id);
+                    if (newOne) {
+                        one.pt = newOne;
+                    }
+                }
+            });
+        });
+    });
+
+    // 选中审批人
+    $('body').on('click', '#shenpi-list div[id$="_dropdownMenu"] dl dd', function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const id = parseInt($(this).data('id'));
+        if (!id) return;
+
+        let this_code = 'financial';
+        const user = _.find(accountList, function (item) {
+            return item.id === id;
+        });
+        // 判断是否已存在审批人
+        const aid_num = $(this).parents('ul').find('.remove-audit').length;
+        for (let i = 0; i < aid_num; i++) {
+            const aid = parseInt($(this).parents('ul').find('.remove-audit').eq(i).data('id'));
+            if (aid === id) {
+                toastr.warning('该审核人已存在,请勿重复添加');
+                return;
+            }
+        }
+        const prop = {
+            status: sp_status.gdspl,
+            code: sp_type[this_code],
+            audit_id: id,
+            type: 'add',
+            audit_type: parseInt($(this).parents('li').find('select[class*="audit-type-key"]')[0].value),
+            audit_order: $(this).parents('li').index() + 1,
+        };
+        const _self = $(this);
+        postData(`/sp/${spid}/financial/pay/stage/save`, { type: 'add-shenpi-audit', shenpi: prop, tid }, function (result) {
+            const data = result.shenpi;
+            const auditGroup = auditUtils.addAudit(tender, { audit_id: data.audit_id, name: user.name, audit_type: data.audit_type, audit_order: data.audit_order }, prop.audit_order - 1);
+            if (_self.parents('ul').find('.add-audit').length === 0) {
+                _self.parents('ul').append('<li>\n' +
+                    '                                            <span class="pl-3"><a href="javascript:void(0);" class="add-audit" ><i class="fa fa-plus"></i> 添加流程</a></span>\n' +
+                    '                                        </li>');
+            }
+            _self.parents('li').html(auditUtils.getAuditGroupInnerHtml(this_code, auditGroup, prop.audit_order));
+            tender.permissionList = result.permissionList;
+            auditUtils.makeReportListHtml(tender);
+        });
+    });
+
+    // 移除审批人
+    $('body').on('click', '#shenpi-list .remove-audit', function () {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const id = parseInt($(this).data('id'));
+        const this_code = 'financial';
+        const prop = {
+            status: sp_status.gdspl,
+            code: sp_type[this_code],
+            audit_id: id,
+            type: 'del',
+        };
+        const _self = $(this);
+        postData('/tender/' + tid + '/shenpi/audit/save', prop, function (data) {
+            const index = _self.parents('li').index();
+            const auditGroup = auditUtils.removeAudit(tender, id, index);
+            if (auditGroup) {
+                _self.parents('li').html(auditUtils.getAuditGroupInnerHtml(this_code, auditGroup, index + 1));
+            } else {
+                const _selflc = _self.parents('#shenpi-list');
+                _self.parents('li').remove();
+                const aid_num = parseInt(_selflc.children('ul').find('li.d-flex').length);
+                if (aid_num === 0) {
+                    _selflc.children('ul').html(auditUtils.getAuditGroupHtml(this_code, [], 1));
+                } else {
+                    for (let i = 0; i < aid_num; i++) {
+                        _selflc.find('li.d-flex').eq(i).find('.col-auto').text(transFormToChinese(i+1) + '审');
+                    }
+                }
+            }
+        })
+    });
+
+    $('body').on('click', '#shenpi-list .add-audit', function () {
+        const num = $(this).parents('ul').children('li').length;
+        const this_code = 'financial';
+        const addhtml = auditUtils.getAuditGroupHtml(this_code, [], num);
+        $(this).parents('ul').append(addhtml);
+        $(this).parents('li').remove();
+    });
+
+    // 设置会签、或签
+    $('body').on('change', 'select[class*="audit-type-key"]', function() {
+        const tid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === tid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        const removes = $(this).parents('.d-flex').find('.remove-audit');
+        if (removes.length === 0) return;
+
+        const this_status = sp_status.gdspl;
+        const this_code = 'financial';
+        const ids = [];
+        const liParent = $(this).parents('li');
+        removes.each((i, r) => { ids.push(parseInt(r.getAttribute('data-id'))); });
+        const prop = {
+            status: this_status,
+            code: sp_type[this_code],
+            audit_id: ids,
+            audit_type: parseInt(this.value),
+            type: 'audit-type',
+        };
+        if (prop.audit_type === auditType.key.common && ids.length > 1) {
+            toastr.warning('设置个人审批前请先删除多余的审批人');
+            this.value = this.getAttribute('data-type');
+            return;
+        }
+        const _self = this;
+        postData('/tender/'+ tid +'/shenpi/audit/save', prop, function () {
+            _self.setAttribute('data-type', _self.value);
+            const auditGroup = auditUtils.setAuditType(tender, prop.audit_type, liParent.index());
+            liParent.html(auditUtils.getAuditGroupInnerHtml(this_code, auditGroup, liParent.index() + 1));
+        });
+    });
+
+    $('#set-other-tenders').on('click', function () {
+        const cur_tenderid = parseInt($('#shenpi-tender-list tr.bg-warning').data('tid'));
+        const tender = tenders.find(t => t.id === cur_tenderid);
+        if (!tender) {
+            toastr.error('请选择标段');
+            return;
+        }
+        if (tender.auditGroupList.length === 0) {
+            toastr.warning('请先设置审批流程再同步到其它标段');
+            return;
+        }
+        const this_code = 'financial';
+        const num = $('#shenpi-tender-list input:checked').length;
+        if (num === 0 || (num === 1 && parseInt($('#shenpi-tender-list input:checked').eq(0).parents('tr').data('tid')) === cur_tenderid)) {
+            toastr.warning('请选择需要设置审批同步的标段');
+            return;
+        }
+        const data = {
+            type: 'copy-shenpi-audit',
+            status: sp_status.gdspl,
+            code: this_code,
+            this_tid: cur_tenderid,
+        };
+        // 二维数组变一维
+        data.auditList = [];
+        for (const auditGroup of tender.auditGroupList) {
+            data.auditList.push(...auditGroup);
+        }
+        const tenderList = [];
+        for (let i = 0; i < num; i++) {
+            const tid = parseInt($('#shenpi-tender-list input:checked').eq(i).parents('tr').data('tid'));
+            if (tid !== cur_tenderid) {
+                tenderList.push(tid);
+            }
+        }
+        data.tidList = tenderList.join(',');
+        console.log(data);
+        postData(`/sp/${spid}/financial/pay/stage/save`, data, function (result) {
+            toastr.success('已同步到其它勾选标段');
+            for (let i = 0; i < num; i++) {
+                const tid = parseInt($('#shenpi-tender-list input:checked').eq(i).parents('tr').data('tid'));
+                if (tid !== cur_tenderid) {
+                    const other_tender = tenders.find(t => t.id === tid);
+                    other_tender.auditGroupList = tender.auditGroupList;
+                    const permissionList = _.filter(result.otherPermissionList, { tid: tid });
+                    other_tender.permissionList = permissionList;
+                }
+            }
+        });
+    });
+
+    // 添加到成员中
+    $('body').on('click', '.book-list dt', function () {
+        const idx = $(this).find('.acc-btn').attr('data-groupid')
+        const type = $(this).find('.acc-btn').attr('data-type')
+        if (type === 'hide') {
+            $(this).parent().find(`div[data-toggleid="${idx}"]`).show(() => {
+                $(this).children().find('i').removeClass('fa-plus-square').addClass('fa-minus-square-o')
+                $(this).find('.acc-btn').attr('data-type', 'show')
+
+            })
+        } else {
+            $(this).parent().find(`div[data-toggleid="${idx}"]`).hide(() => {
+                $(this).children().find('i').removeClass('fa-minus-square-o').addClass('fa-plus-square')
+                $(this).find('.acc-btn').attr('data-type', 'hide')
+            })
+        }
+        return false
+    });
+
+
+    $('#add-company-select').on('change', function () {
+        const company = userCompanyList.find(t => t.name === $(this).val());
+        $('#company_order').val(company ? company.count + 1 : 0);
+    });
+
+    $('#add-qi-btn').on('click', function () {
+        const companyName = $('#add-company-select').val();
+        const company = userCompanyList.find(t => t.name === companyName);
+        if (!company) {
+            toastr.error('单位不存在');
+            return;
+        }
+        const order = parseInt($('#company_order').val());
+        if (!order || order < 1) {
+            toastr.error('期数有误');
+            return;
+        }
+        const prop = {
+            company_id: company.id,
+            order,
+        };
+        postData(`/sp/${spid}/financial/pay/stage/save`, { type: 'add-pay-stage', updateData: prop }, function (result) {
+            window.location.href = `/sp/${spid}/financial/pay/stage/${result.id}`;
+        });
+    });
+
+    $('body').on('click', '#pay-list .del-pay-btn', function () {
+        const fpsid = $(this).data('id');
+        deleteAfterHint(function () {
+            postData(`/sp/${spid}/financial/pay/stage/save`, {type: 'del-pay-stage', postData: { node: fpsid }}, function (result) {
+                window.location.reload();
+            })
+        }, '确认删除该资金支付单位期?');
+    });
+
+    $('#get-form-tender').on('click', function () {
+        const tid = $('#pay-tender-list tr.bg-warning').data('tid');
+        const tender = tenders.find(t => t.id === parseInt(tid));
+        if (!tid || !tender) {
+            toastr.error('标段不存在');
+            return;
+        }
+        if (is_admin || (fptReportTids && _.includes(fptReportTids, tender.id))) {
+            console.log(tender);
+            if (tender.pay_account && (tender.pay_account.name || tender.pay_account.bank || tender.pay_account.account || tender.pay_account.contact || tender.pay_account.phone)) {
+                $('#payaccount input[name="name"]').val(tender.pay_account.name);
+                $('#payaccount input[name="bank"]').val(tender.pay_account.bank);
+                $('#payaccount input[name="bank_account"]').val(tender.pay_account.account);
+                $('#payaccount input[name="contact"]').val(tender.pay_account.contact);
+                $('#payaccount input[name="phone"]').val(tender.pay_account.phone);
+                const data = {
+                    id: tender.pt.id,
+                    tid: tender.id,
+                    name: tender.pay_account.name,
+                    bank: tender.pay_account.bank,
+                    bank_account: tender.pay_account.account,
+                    contact: tender.pay_account.contact,
+                    phone: tender.pay_account.phone,
+                }
+                postData(`/sp/${spid}/financial/pay/stage/save`, { type: 'set-pay-tender', updateData: data }, function (result) {
+                    toastr.success('已同步');
+                    tender.pt = result;
+                });
+            } else {
+                toastr.success('已同步');
+            }
+        } else {
+            toastr.error('无权限操作');
+            return;
+        }
+    });
+
+    $('#payaccount input[type="text"]').on('change', function () {
+        const tid = $('#pay-tender-list tr.bg-warning').data('tid');
+        const tender = tenders.find(t => t.id === parseInt(tid));
+        if (!tid || !tender) {
+            toastr.error('标段不存在');
+            return;
+        }
+        if (is_admin || (fptReportTids && _.includes(fptReportTids, tender.id))) {
+            const data = {
+                id: tender.pt.id,
+                tid: tender.id,
+                name: $('#payaccount input[name="name"]').val(),
+                bank: $('#payaccount input[name="bank"]').val(),
+                bank_account: $('#payaccount input[name="bank_account"]').val(),
+                contact: $('#payaccount input[name="contact"]').val(),
+                phone: $('#payaccount input[name="phone"]').val(),
+            }
+            postData(`/sp/${spid}/financial/pay/stage/save`, { type: 'set-pay-tender', updateData: data }, function (result) {
+                tender.pt = result;
+            });
+        }
+    });
+
+    $('#set-pay-btn').on('click', function () {
+        const tid = $('#payaccount input[name="tid"]').val();
+        const tender = tenders.find(t => t.id === parseInt(tid));
+        if (!tid || !tender) {
+            toastr.error('标段不存在');
+            return;
+        }
+        if (is_admin || (fptReportTids && _.includes(fptReportTids, tender.id))) {
+            const data = {
+                id: parseInt($('#payaccount input[name="id"]').val()),
+                tid: tender.id,
+                name: $('#payaccount input[name="name"]').val(),
+                bank: $('#payaccount input[name="bank"]').val(),
+                bank_account: $('#payaccount input[name="bank_account"]').val(),
+                contact: $('#payaccount input[name="contact"]').val(),
+                phone: $('#payaccount input[name="phone"]').val(),
+            }
+            if (!data.name) {
+                toastr.error('请填写开户名称');
+                return;
+            }
+            if (!data.bank) {
+                toastr.error('请填写开户银行');
+                return;
+            }
+            if (!data.bank_account) {
+                toastr.error('请填写开户账号');
+                return;
+            }
+            postData(`/sp/${spid}/financial/pay/stage/save`, { type: 'set-pay-tender', updateData: data }, function (result) {
+                toastr.success('保存成功');
+                tender.pt = result;
+            });
+        } else {
+            toastr.error('无权限操作');
+            return;
+        }
+    });
+
+    $.subMenu({
+        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+        key: 'menu.1.0.0',
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+        callback: function (info) {
+            if (info.mini) {
+                $('.panel-title').addClass('fluid');
+                $('#sub-menu').removeClass('panel-sidebar');
+            } else {
+                $('.panel-title').removeClass('fluid');
+                $('#sub-menu').addClass('panel-sidebar');
+            }
+            autoFlashHeight();
+        }
+    });
+});

+ 6 - 4
app/router.js

@@ -438,10 +438,10 @@ module.exports = app => {
     app.post('/sp/:id/financial/transfer/:trid/tender/:ttid/file/upload', sessionAuth, subProjectCheck, financialCheck, 'financialController.transferTenderUploadFile');
     app.post('/sp/:id/financial/transfer/:trid/tender/:ttid/file/delete', sessionAuth, subProjectCheck, financialCheck, 'financialController.transferTenderDeleteFile');
     app.get('/sp/:id/financial/transfer/:trid/tender/:ttid/file/:fid/download', sessionAuth, subProjectCheck, financialCheck, 'financialController.transferTenderDownloadFile');
-    app.get('/sp/:id/financial/pay', sessionAuth, subProjectCheck, financialCheck, 'financialController.pay');
-    app.post('/sp/:id/financial/pay/save', sessionAuth, subProjectCheck, financialCheck, 'financialController.paySave');
-    app.get('/sp/:id/financial/pay/company/:fpcid', sessionAuth, subProjectCheck, financialCheck, 'financialController.payCompany');
-    app.post('/sp/:id/financial/pay/company/:fpcid/save', sessionAuth, subProjectCheck, financialCheck, 'financialController.payCompanySave');
+    app.get('/sp/:id/financial/pay/stage', sessionAuth, subProjectCheck, financialCheck, 'financialController.payStage');
+    app.post('/sp/:id/financial/pay/stage/save', sessionAuth, subProjectCheck, financialCheck, 'financialController.payStageSave');
+    app.get('/sp/:id/financial/pay/stage/:fpsid', sessionAuth, subProjectCheck, financialCheck, 'financialController.pay');
+    app.post('/sp/:id/financial/pay/stage/:fpsid/save', sessionAuth, subProjectCheck, financialCheck, 'financialController.paySave');
     app.get('/sp/:id/financial/pay/:fpid/detail', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.payDetail');
     app.post('/sp/:id/financial/pay/:fpid/save', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, 'financialController.payDetailSave');
     app.post('/sp/:id/financial/pay/:fpid/file/upload', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, 'financialController.payUploadFile');
@@ -450,6 +450,8 @@ module.exports = app => {
     app.post('/sp/:id/financial/pay/:fpid/audit/start', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.startPayAudit');
     app.post('/sp/:id/financial/pay/:fpid/audit/check', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, 'financialController.checkPayAudit');
     app.post('/sp/:id/financial/pay/:fpid/audit/check/again', sessionAuth, subProjectCheck, financialCheck, financialPayCheck, 'financialController.checkPayAgain');
+    // app.get('/sp/:id/financial/pay/field', sessionAuth, subProjectCheck, financialCheck, 'financialController.payCompany');
+    // app.post('/sp/:id/financial/pay/field/save', sessionAuth, subProjectCheck, financialCheck, 'financialController.payCompanySave');
     app.get('/sp/:id/financial/summary', sessionAuth, subProjectCheck, financialCheck, 'financialController.summary');
     app.post('/sp/:id/financial/summary/load', sessionAuth, subProjectCheck, financialCheck, 'financialController.summaryLoad');
 

+ 22 - 22
app/service/financial_pay.js

@@ -28,8 +28,8 @@ module.exports = app => {
             const pay = await this.getDataById(id);
             const tender = await this.ctx.service.tender.getDataById(pay.tid);
             pay.tenderName = tender.name;
-            const payCompany = pay.fpcid ? await this.ctx.service.financialPayCompany.getOnePayCompany(pay.fpcid) : null;
-            pay.payCompany = payCompany ? payCompany : null;
+            const payStage = pay.fpsid ? await this.ctx.service.financialPayStage.getOnePayStage(pay.fpsid) : null;
+            pay.payStage = payStage ? payStage : null;
             return pay;
         }
 
@@ -40,10 +40,10 @@ module.exports = app => {
          * @param {int} hadlimit - 分页
          * @return {object} list - 列表
          */
-        async getListByStatus(spid, fpcid = null, status = 0, tid = null, used = null, hadlimit = 0, sortBy = '', orderBy = '') {
+        async getListByStatus(spid, fpsid = null, status = 0, tid = null, used = null, hadlimit = 0, sortBy = '', orderBy = '') {
             let addSql = '';
-            if (fpcid) {
-                addSql += ' AND a.fpcid = ' + fpcid;
+            if (fpsid) {
+                addSql += ' AND a.fpsid = ' + fpsid;
             }
             if (tid !== null) {
                 if (tid.length === 0) {
@@ -115,10 +115,10 @@ module.exports = app => {
          * @param {int} status - 状态
          * @return {void}
          */
-        async getCountByStatus(spid, fpcid = null, status = 0, tid = null, used = null) {
+        async getCountByStatus(spid, fpsid = null, status = 0, tid = null, used = null) {
             let addSql = '';
-            if (fpcid) {
-                addSql += ' AND a.fpcid = ' + fpcid;
+            if (fpsid) {
+                addSql += ' AND a.fpsid = ' + fpsid;
             }
             if (tid !== null) {
                 if (tid.length === 0) {
@@ -170,7 +170,7 @@ module.exports = app => {
             }
         }
 
-        async addPay(spid, payCompany, data) {
+        async addPay(spid, payStage, data) {
             if (!data.tid || !data.code || !data.used) {
                 throw '参数错误';
             }
@@ -183,7 +183,7 @@ module.exports = app => {
                 }
                 const insertData = {
                     spid,
-                    fpcid: payCompany.id,
+                    fpsid: payStage.id,
                     tid: data.tid,
                     code: data.code,
                     used: data.used,
@@ -207,7 +207,7 @@ module.exports = app => {
                         spid,
                         tid: data.tid,
                         fpid: result.insertId,
-                        fpcid: payCompany.id,
+                        fpsid: payStage.id,
                         aid: audit.audit_id,
                         order: audit.audit_order,
                         times: 1,
@@ -217,7 +217,7 @@ module.exports = app => {
                     });
                 }
                 if (insertAuditDatas.length > 0) await transaction.insert(this.ctx.service.financialPayAudit.tableName, insertAuditDatas);
-                if (payCompany.can_del === 1) await transaction.update(this.ctx.service.financialPayCompany.tableName, { id: payCompany.id, can_del: 0 });
+                if (payStage.can_del === 1) await transaction.update(this.ctx.service.financialPayStage.tableName, { id: payStage.id, can_del: 0 });
                 await transaction.commit();
                 return { id: result.insertId };
             } catch (e) {
@@ -226,7 +226,7 @@ module.exports = app => {
             }
         }
 
-        async delPay(payCompany, fpid) {
+        async delPay(payStage, fpid) {
             if (!fpid) {
                 throw '参数有误';
             }
@@ -243,7 +243,7 @@ module.exports = app => {
                 await transaction.delete(this.ctx.service.financialPayAtt.tableName, { fpid });
                 await transaction.delete(this.ctx.service.financialPayAudit.tableName, { fpid });
                 await transaction.delete(this.ctx.service.financialPayContract.tableName, { fpid });
-                await this.ctx.service.financialPayCompany.updatePayCompanyAndAfter(transaction, payCompany.spid, payCompany);
+                await this.ctx.service.financialPayStage.updatePayStageAndAfter(transaction, payStage.spid, payStage);
                 await transaction.commit();
             } catch (err) {
                 console.log(err);
@@ -316,8 +316,8 @@ module.exports = app => {
             pay.finalAuditorIds = pay.userGroups[pay.userGroups.length - 1].map(x => { return x.aid; });
         }
 
-        async batchOldPays(spid, payCompany, payIds) {
-            if (!payCompany || !payIds || payIds.length === 0) {
+        async batchOldPays(spid, payStage, payIds) {
+            if (!payStage || !payIds || payIds.length === 0) {
                 throw '参数有误';
             }
             const transaction = await this.db.beginTransaction();
@@ -327,19 +327,19 @@ module.exports = app => {
                 const oldPays = await this.getAllDataByCondition({ where: { id: payIds } });
                 const oldPayAudits = await this.ctx.service.financialPayAudit.getAllDataByCondition({ where: { fpid: payIds } });
                 for (const node of oldPays) {
-                    if (node.fpcid) {
+                    if (node.fpsid) {
                         throw '该支付已绑定单位期';
                     }
                     updateDatas.push({
                         id: node.id,
-                        fpcid: payCompany.id,
+                        fpsid: payStage.id,
                     });
                     const oldPayAuditsByFpid = oldPayAudits.filter(x => { return x.fpid === node.id; });
                     for (const audit of oldPayAuditsByFpid) {
-                        if (!audit.fpcid) {
+                        if (!audit.fpsid) {
                             updateAuditDatas.push({
                                 id: audit.id,
-                                fpcid: payCompany.id,
+                                fpsid: payStage.id,
                             });
                         }
                     }
@@ -351,8 +351,8 @@ module.exports = app => {
                     await transaction.updateRows(this.ctx.service.financialPayAudit.tableName, updateAuditDatas);
                 }
                 // 更新本单位期金额和同单位的上期金额
-                await transaction.update(this.ctx.service.financialPayCompany.tableName, { id: payCompany.id, can_del: 0 });
-                await this.ctx.service.financialPayCompany.updatePayCompanyAndAfter(transaction, spid, payCompany);
+                await transaction.update(this.ctx.service.financialPayStage.tableName, { id: payStage.id, can_del: 0 });
+                await this.ctx.service.financialPayStage.updatePayStageAndAfter(transaction, spid, payStage);
                 await transaction.commit();
                 return true;
             } catch (err) {

+ 8 - 8
app/service/financial_pay_contract.js

@@ -97,7 +97,7 @@ module.exports = app => {
             }
         }
 
-        async delContract(fpid, payCompany, ids) {
+        async delContract(fpid, payStage, ids) {
             const transaction = await this.db.beginTransaction();
             try {
                 // 还要删除附件
@@ -107,7 +107,7 @@ module.exports = app => {
                 // 判断是否可删
                 await transaction.delete(this.tableName, { id: ids });
                 // 重新算资金支付总额
-                const tp = await this.calcCamountSum(fpid, payCompany, transaction);
+                const tp = await this.calcCamountSum(fpid, payStage, transaction);
                 await transaction.commit();
                 return { tp, contractList: await this.getContractList(fpid) };
             } catch (err) {
@@ -116,11 +116,11 @@ module.exports = app => {
             }
         }
 
-        async updateContract(fpid, payCompany, data) {
+        async updateContract(fpid, payStage, data) {
             const transaction = await this.db.beginTransaction();
             try {
                 await transaction.update(this.tableName, data);
-                const tp = await this.calcCamountSum(fpid, payCompany, transaction);
+                const tp = await this.calcCamountSum(fpid, payStage, transaction);
                 await transaction.commit();
                 return { tp };
             } catch (err) {
@@ -134,7 +134,7 @@ module.exports = app => {
          * @param {Object} datas 修改内容
          * @return {void}
          */
-        async updateContracts(fpid, payCompany, datas) {
+        async updateContracts(fpid, payStage, datas) {
             const transaction = await this.db.beginTransaction();
             try {
                 const updateArray = [];
@@ -144,7 +144,7 @@ module.exports = app => {
                     }
                 }
                 if (updateArray.length > 0) await transaction.updateRows(this.tableName, updateArray);
-                const tp = await this.calcCamountSum(fpid, payCompany, transaction);
+                const tp = await this.calcCamountSum(fpid, payStage, transaction);
                 await transaction.commit();
                 return { tp, contractList: await this.getContractList(fpid) };
             } catch (err) {
@@ -153,7 +153,7 @@ module.exports = app => {
             }
         }
 
-        async calcCamountSum(fpid, payCompany, transaction) {
+        async calcCamountSum(fpid, payStage, transaction) {
             // 防止小数位不精确,采用取值计算
             const sql = 'SELECT `small_expenses`, `pay_price` FROM ?? WHERE fpid = ?';
             const sqlParam = [this.tableName, fpid];
@@ -171,7 +171,7 @@ module.exports = app => {
                 small_expenses_tp,
             };
             await transaction.update(this.ctx.service.financialPay.tableName, updateData);
-            await this.ctx.service.financialPayCompany.updatePayCompanyAndAfter(transaction, payCompany.spid, payCompany);
+            await this.ctx.service.financialPayStage.updatePayStageAndAfter(transaction, payStage.spid, payStage);
             return total_price;
         }
 

+ 67 - 41
app/service/financial_pay_company.js

@@ -11,7 +11,7 @@ const shenpiConst = require('../const/shenpi');
 
 module.exports = app => {
 
-    class FinancialPayCompany extends BaseService {
+    class FinancialPayStage extends BaseService {
 
         /**
          * 构造函数
@@ -21,10 +21,10 @@ module.exports = app => {
          */
         constructor(ctx) {
             super(ctx);
-            this.tableName = 'financial_pay_company';
+            this.tableName = 'financial_pay_stage';
         }
 
-        async getOnePayCompany(id) {
+        async getOnePayStage(id) {
             const sql = 'SELECT a.*, pa.name as username, c.name as company FROM ?? As a LEFT JOIN ?? As pa ON a.uid = pa.id LEFT JOIN ?? As c ON a.company_id = c.id WHERE a.id = ?';
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, this.ctx.service.constructionUnit.tableName, id];
             return await this.db.queryOne(sql, sqlParam);
@@ -38,8 +38,8 @@ module.exports = app => {
                 let addSql = '';
                 let notAdminSql = '';
                 if (!this.ctx.session.sessionUser.is_admin) {
-                    notAdminSql += '(a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid)' +
-                        ' OR a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid))';
+                    notAdminSql += '(a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid)' +
+                        ' OR a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid))';
                     addSql += ' AND (a.company_id = ' + user_company_id + ' OR ' + notAdminSql + ')';
                 }
                 const sql = 'SELECT a.company_id FROM ?? As a' +
@@ -60,6 +60,24 @@ module.exports = app => {
             return userCompanyList;
         }
 
+        async getUserOrderList(spid, user_company_id) {
+            let addSql = '';
+            let notAdminSql = '';
+            if (!this.ctx.session.sessionUser.is_admin) {
+                notAdminSql += '(a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid)' +
+                    ' OR a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid))';
+                addSql += ' AND (a.company_id = ' + user_company_id + ' OR ' + notAdminSql + ')';
+            }
+            const sql = 'SELECT a.order FROM ?? As a' +
+                ' WHERE a.spid = ?' + addSql + ' GROUP BY a.order';
+            const sqlParam = [this.tableName, spid];
+            const list = await this.db.query(sql, sqlParam);
+            // 倒序
+            list.sort((a, b) => b.order - a.order);
+            const orderIds = list.map(item => item.order);
+            return orderIds;
+        }
+
         /**
          * 获取列表
          * @param {int} spid - 项目id
@@ -67,18 +85,22 @@ module.exports = app => {
          * @param {int} hadlimit - 分页
          * @return {object} list - 列表
          */
-        async getListByStatus(spid, company_id = null, user_company_id, hadlimit = 1) {
+        async getListByStatus(spid, company_id = null, user_company_id, qi = null, hadlimit = 1) {
             let addSql = '';
             let notAdminSql = '';
             if (!this.ctx.session.sessionUser.is_admin) {
-                notAdminSql += '(a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid)' +
-                    ' OR a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid))';
+                notAdminSql += '(a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid)' +
+                    ' OR a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid))';
             }
             if (company_id !== null) {
                 addSql += ' AND (a.company_id = ' + company_id + (!this.ctx.session.sessionUser.is_admin && company_id !== user_company_id ? ' AND ' + notAdminSql : '') + ')';
             } else if (company_id === null && !this.ctx.session.sessionUser.is_admin) {
                 addSql += ' AND (a.company_id = ' + user_company_id + ' OR ' + notAdminSql + ')';
             }
+            // 判断qi是否存在且是否是字符串数字
+            if (qi !== null && !isNaN(qi)) {
+                addSql += ' AND a.order = ' + qi;
+            }
             let sql = 'SELECT a.*, pa.name as username, c.name as company FROM ?? As a' +
                 ' LEFT JOIN ?? As pa ON a.uid = pa.id LEFT JOIN ?? As c ON a.company_id = c.id' +
                 ' WHERE a.spid = ?' + addSql + ' ORDER BY a.create_time DESC';
@@ -99,18 +121,22 @@ module.exports = app => {
          * @param {int} status - 状态
          * @return {void}
          */
-        async getCountByStatus(spid, company_id = null, user_company_id) {
+        async getCountByStatus(spid, company_id = null, user_company_id, qi = null) {
             let addSql = '';
             let notAdminSql = '';
             if (!this.ctx.session.sessionUser.is_admin) {
-                notAdminSql += '(a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid)' +
-                    ' OR a.id in (SELECT fpcid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpcid))';
+                notAdminSql += '(a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPay.tableName + ' WHERE uid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid)' +
+                    ' OR a.id in (SELECT fpsid FROM ' + this.ctx.service.financialPayAudit.tableName + ' WHERE aid = ' + this.ctx.session.sessionUser.accountId + ' GROUP BY fpsid))';
             }
             if (company_id !== null) {
                 addSql += ' AND (a.company_id = ' + company_id + (!this.ctx.session.sessionUser.is_admin && company_id !== user_company_id ? ' AND ' + notAdminSql : '') + ')';
             } else if (company_id === null && !this.ctx.session.sessionUser.is_admin) {
                 addSql += ' AND (a.company_id = ' + user_company_id + ' OR ' + notAdminSql + ')';
             }
+            // 判断qi是否存在且是否是字符串数字
+            if (qi !== null && !isNaN(qi)) {
+                addSql += ' AND a.order = ' + qi;
+            }
             const sql = 'SELECT count(*) AS count FROM ?? As a' +
                 ' LEFT JOIN ?? As pa ON a.uid = pa.id LEFT JOIN ?? As c ON a.company_id = c.id' +
                 ' WHERE a.spid = ?' + addSql + ' ORDER BY a.create_time DESC';
@@ -119,16 +145,16 @@ module.exports = app => {
             return result ? result.count : 0;
         }
 
-        async addPayCompany(spid, data) {
+        async addPayStage(spid, data) {
             if (!data.company_id || !data.order) {
                 throw '参数错误';
             }
             const times = new Date();
-            const info = await this.ctx.service.financialPayCompany.getDataByCondition({ spid, company_id: data.company_id, order: data.order });
+            const info = await this.getDataByCondition({ spid, company_id: data.company_id, order: data.order });
             if (info) {
                 throw '资金支付单位期已存在';
             }
-            const allCompanyList = await this.ctx.service.financialPayCompany.getAllDataByCondition({ where: { spid, company_id: data.company_id } });
+            const allStageList = await this.getAllDataByCondition({ where: { spid, company_id: data.company_id } });
             const transcation = await this.db.beginTransaction();
             try {
                 await transcation.update(this.tableName, { can_del: 0 }, { where: { spid, company_id: data.company_id } });
@@ -137,27 +163,27 @@ module.exports = app => {
                     company_id: data.company_id,
                     order: data.order,
                     uid: this.ctx.session.sessionUser.accountId,
-                    pre_tp: this.ctx.helper.sum(this._.map(allCompanyList, 'total_price')) || 0,
+                    pre_tp: this.ctx.helper.sum(this._.map(allStageList, 'total_price')) || 0,
                     create_time: times,
                 };
                 const result = await transcation.insert(this.tableName, insertData);
                 await transcation.commit();
-                return await this.getOnePayCompany(result.insertId);
+                return await this.getOnePayStage(result.insertId);
             } catch (err) {
                 await transcation.rollback();
                 throw err;
             }
         }
 
-        async delPayCompany(fpcid) {
-            if (!fpcid) {
+        async delPayStage(fpsid) {
+            if (!fpsid) {
                 throw '参数有误';
             }
-            const node = await this.getDataById(fpcid);
+            const node = await this.getDataById(fpsid);
             if (!node) {
                 throw '资金支付单位期不存在';
             }
-            const payCount = await this.ctx.service.financialPay.count({ fpcid }) || 0;
+            const payCount = await this.ctx.service.financialPay.count({ fpsid }) || 0;
             if (payCount > 0) {
                 throw '该资金支付单位期下存在资金支付记录,不能删除';
             }
@@ -167,11 +193,11 @@ module.exports = app => {
                 await transaction.delete(this.tableName, { id: node.id });
                 // 判断是否能删除上一期
                 if (node.order > 1) {
-                    const lastPayCompany = await this.getDataByCondition({ spid: node.spid, company_id: node.company_id, order: node.order - 1 });
-                    if (lastPayCompany) {
-                        const companyPays = await transaction.select(this.ctx.service.financialPay.tableName, { where: { fpcid: lastPayCompany.id } });
-                        if (companyPays.length === 0 && lastPayCompany.can_del === 0) {
-                            await transaction.update(this.tableName, { id: lastPayCompany.id, can_del: 1 });
+                    const lastPayStage = await this.getDataByCondition({ spid: node.spid, company_id: node.company_id, order: node.order - 1 });
+                    if (lastPayStage) {
+                        const stagePays = await transaction.select(this.ctx.service.financialPay.tableName, { where: { fpsid: lastPayStage.id } });
+                        if (stagePays.length === 0 && lastPayStage.can_del === 0) {
+                            await transaction.update(this.tableName, { id: lastPayStage.id, can_del: 1 });
                         }
                     }
                 }
@@ -184,13 +210,13 @@ module.exports = app => {
             return result;
         }
 
-        async savePayCompany(fpcid, postData) {
+        async savePayStage(fpsid, postData) {
             // 初始化事务
             const transaction = await this.db.beginTransaction();
             let result = false;
             try {
                 const updateData = {
-                    id: fpcid,
+                    id: fpsid,
                 };
                 updateData[postData.name] = postData.val;
                 await transaction.update(this.tableName, updateData);
@@ -203,26 +229,26 @@ module.exports = app => {
             return result;
         }
 
-        async updatePayCompanyAndAfter(transaction, spid, payCompany) {
+        async updatePayStageAndAfter(transaction, spid, payStage) {
             let total_price = 0;
-            const companyPays = await transaction.select(this.ctx.service.financialPay.tableName, { where: { fpcid: payCompany.id } });
-            for (const pay of companyPays) {
+            const stagePays = await transaction.select(this.ctx.service.financialPay.tableName, { where: { fpsid: payStage.id } });
+            for (const pay of stagePays) {
                 total_price = this.ctx.helper.add(total_price, pay.total_price);
             }
-            await transaction.update(this.tableName, { id: payCompany.id, total_price });
-            const allCompanyPays = await transaction.select(this.tableName, { where: { spid, company_id: payCompany.company_id } });
-            const highestOrder = this._.max(this._.map(allCompanyPays, 'order')) || 0;
-            if (companyPays.length === 0 && highestOrder === payCompany.order) {
+            await transaction.update(this.tableName, { id: payStage.id, total_price });
+            const allStagePays = await transaction.select(this.tableName, { where: { spid, company_id: payStage.company_id } });
+            const highestOrder = this._.max(this._.map(allStagePays, 'order')) || 0;
+            if (stagePays.length === 0 && highestOrder === payStage.order) {
                 // 如果当前支付单位期没有支付记录,并且是最高的order,则将其删除
-                await transaction.update(this.tableName, { id: payCompany.id, can_del: 1 });
+                await transaction.update(this.tableName, { id: payStage.id, can_del: 1 });
             }
-            const afterCompanyPays = allCompanyPays.filter(x => { return x.order > payCompany.order; });
-            if (afterCompanyPays && afterCompanyPays.length > 0) {
+            const afterStagePays = allStagePays.filter(x => { return x.order > payStage.order; });
+            if (afterStagePays && afterStagePays.length > 0) {
                 const pre_tps = [];
-                for (const companyPay of afterCompanyPays) {
-                    const beforeTotalPrice = this.ctx.helper.sum(this._.map(allCompanyPays.filter(x => { return x.order < companyPay.order; }), 'total_price')) || 0;
+                for (const stagePay of afterStagePays) {
+                    const beforeTotalPrice = this.ctx.helper.sum(this._.map(allStagePays.filter(x => { return x.order < stagePay.order; }), 'total_price')) || 0;
                     pre_tps.push({
-                        id: companyPay.id,
+                        id: stagePay.id,
                         pre_tp: beforeTotalPrice,
                     });
                 }
@@ -232,5 +258,5 @@ module.exports = app => {
             }
         }
     }
-    return FinancialPayCompany;
+    return FinancialPayStage;
 };

+ 80 - 29
app/view/financial/pay.ejs

@@ -4,33 +4,55 @@
         <div class="title-main  d-flex">
             <% include ./sub_mini_menu.ejs %>
             <div class="col-10 pl-0">
-<!--                <div class="btn-group group-tab">-->
-<!--                    <a class="btn btn-sm btn-light active" href="javascript:void(0);">支付列表</a>-->
-<!--                    <a class="btn btn-sm btn-light" href="/financial/pay">汇总列表</a>-->
-<!--                    <a class="btn btn-sm btn-light" href="/financial/pay">标段统计</a>-->
-<!--                </div>-->
-                <div class="d-inline-block col-sm-3">
+                <div class="d-inline-block"><a href="/sp/<%- ctx.subProject.id %>/financial/pay/stage" class="account-page-size"><i class="fa fa-chevron-left "></i> <span>返回</span></a><span class="text-muted mx-2">|</span><span>第<%- payStage.order %>期 <%- payStage.company %></span><span class="text-muted mx-2">|</span></div>
+                <div class="d-inline-block col-sm-3 pl-0">
                     <div class="input-group input-group-sm pr-1">
-                        <select class="form-control form-control-sm col-auto" id="company_select">
+                        <select class="form-control form-control-sm col-auto" id="tid_select">
                             <option value="0">全部</option>
-                            <% for (const c of userCompanyList) { %>
-                            <option value="<%- c.id %>" <% if (c.name === company) { %>selected<% } %>><%- c.name %></option>
+                            <% for (const t of tenders) { %>
+                            <option value="<%- t.id %>" <% if (t.id === tid) { %>selected<% } %> ><%- t.name %></option>
                             <% } %>
                         </select>
                     </div>
                 </div>
                 <div class="d-inline-block">
-                    <% if (ctx.session.sessionUser.is_admin || fptReportTids) { %>
-                    <a href="#payaccount" data-toggle="modal" data-target="#payaccount" class="btn btn-sm btn-primary mr-2">付款账号</a>
-                    <% } %>
-                    <% if (ctx.session.sessionUser.is_admin) { %>
-                    <a href="#liucheng" data-toggle="modal" data-target="#liucheng" class="btn btn-sm btn-primary mr-2">审批流程</a>
-                    <% } %>
+                    <div class="input-group input-group-sm pr-1">
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="used_selected" data-value="<%- used %>">资金用途:<%- used ? used : '全部' %></button>
+                            <div class="dropdown-menu" aria-labelledby="used_selected" id="used_select">
+                                <% if (used !== null) { %><a class="dropdown-item to-log-link" data-val="" href="javascript:void(0);">全部</a><% } %>
+                                <% for (const u of usedList) { %>
+                                <% if (used !== u) { %>
+                                <a class="dropdown-item to-log-link" href="javascript:void(0)" data-val="<%- u %>"><%- u %></a>
+                                <% } %>
+                                <% } %>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="d-inline-block">
+                    <div class="input-group input-group-sm pr-1">
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="status_selected" data-value="<%- status %>">审批状态:<% if (status !== 0) { %><%- filter.statusString[status] %>(<%- filter.count[status] %>)<% } else { %>全部<% } %></button>
+                            <div class="dropdown-menu" aria-labelledby="status_selected" id="status_select">
+                                <% if (status !== 0) { %><a class="dropdown-item to-log-link" data-val="0" href="javascript:void(0);">全部</a><% } %>
+                                <% for (const fs in filter.status) { %>
+                                    <% const f = filter.status[fs]; %>
+                                    <% if (f !== status) { %><a class="dropdown-item to-log-link" data-val="<%- f %>" href="javascript:void(0);"><%- filter.statusString[f] %>(<%- filter.count[f] %>)</a><% } %>
+                                <% } %>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <% if (notStagePays.length > 0 && (ctx.session.sessionUser.is_admin || fptReportTids.length > 0)) { %>
+                <div class="d-inline-block">
+                    <a href="#contract-old-pay" data-toggle="modal" data-target="#contract-old-pay" class="btn btn-sm btn-primary mr-2">关联旧数据</a>
                 </div>
+                <% } %>
             </div>
             <div class="d-inline-block ml-auto">
                 <% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
-                <a href="#add-payqi" data-toggle="modal" data-target="#add-payqi" class="btn btn-primary btn-sm pull-right">新建支付期</a>
+                <a href="#add-pay" data-toggle="modal" data-target="#add-pay" class="btn btn-primary btn-sm pull-right">申请支付</a>
                 <% } %>
 <!--                <a href="#batch-sp" data-toggle="modal" data-target="#batch-sp" class="btn btn-success btn-sm pull-right mr-2">批量审批</a>-->
             </div>
@@ -41,30 +63,55 @@
                 <table class="table table-bordered text-center">
                     <thead>
                     <tr>
-                        <th width="100px">期数</th>
-                        <th width="300px">申请单位</th>
+                        <th style="min-width: 150px;">标段名称</th>
+                        <th width="200px">支付编号</th>
                         <th width="150px">申请时间</th>
                         <th width="100px">申请人</th>
-                        <th width="150px">本期金额</th>
-                        <th width="150px">截止上期金额</th>
-                        <th width="150px">截止本期金额</th>
+                        <th width="200px">资金用途</th>
+                        <th width="300px">收款单位</th>
+                        <th width="150px">支付金额</th>
+                        <th width="200px">审批进度</th>
                         <th width="150px">操作</th>
                     </tr>
                     </thead>
                     <tbody id="pay-list">
                     <% for (const pay of payList) { %>
-                        <tr class="text-center" data-tid="<%- pay.order %>">
-                            <td class=""><a href="/sp/<%- ctx.subProject.id %>/financial/pay/company/<%- pay.id %>" class="account-page-size">第<%- pay.order %>期</a></td>
-                            <td class="text-left"><%- pay.company %></td>
+                        <tr class="text-center" data-tid="<%- pay.tid %>">
+                            <td class="text-left"><%- pay.tenderName %></td>
+                            <td class=""><a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail"><%- pay.code %></a></td>
                             <td class=""><%- moment(pay.create_time).format('YYYY-MM-DD') %></td>
                             <td class=""><%- pay.username %></td>
+                            <td class=""><%- pay.used %></td>
+                            <td class=""><%- pay.entities %></td>
                             <td class="text-right"><%- pay.total_price %></td>
-                            <td class="text-right"><%- pay.pre_tp %></td>
-                            <td class="text-right"><%- ctx.helper.add(pay.total_price, pay.pre_tp) %></td>
+                            <td class="text-left <%- auditConst.auditProgressClass[pay.status] %>">
+                                <% if (pay.status === auditConst.status.checked && pay.final_auditor_str) { %>
+                                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- pay.final_auditor_str %></a>
+                                <% } else if (pay.curAuditors.length > 0) { %>
+                                    <% if (pay.curAuditors[0].audit_type === auditType.key.common) { %>
+                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- pay.curAuditors[0].name %><%if (pay.curAuditors[0].role !== '' && pay.curAuditors[0].role !== null) { %>-<%- pay.curAuditors[0].role %><% } %></a>
+                                    <% } else { %>
+                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- ctx.helper.transFormToChinese(pay.curAuditors[0].audit_order) + '审' %></a>
+                                    <% } %>
+                                <% } %>
+                                <%- auditConst.auditProgress[pay.status] %>
+                            </td>
                             <td>
-                                <% if ((ctx.session.sessionUser.is_admin || pay.uid === ctx.session.sessionUser.accountId) && pay.can_del) { %>
-                                <a href="javascript:void(0);" data-id="<%- pay.id %>" class="text-danger del-pay-btn">删除</a>
+                                <% if (pay.status === auditConst.status.uncheck && pay.uid === ctx.session.sessionUser.accountId) { %>
+                                    <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
+                                <% } else if (pay.status === auditConst.status.checkNo && pay.curAuditors && pay.uid === ctx.session.sessionUser.accountId) { %>
+                                    <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
+                                <% } else if (pay.status === auditConst.status.checking && pay.curAuditors && pay.curAuditors.findIndex(x => { return x.aid === ctx.session.sessionUser.accountId; }) >= 0) { %>
+                                    <% const curAudit = pay.curAuditors.find(x => { return x.aid === ctx.session.sessionUser.accountId; }); %>
+                                    <% if (curAudit.status === auditConst.status.checking) { %>
+                                        <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
+                                    <% } else { %>
+                                        <span class="<%- auditConst.auditStringClass[curAudit.status] %>"><%- auditConst.auditString[curAudit.status] %></span>
+                                    <% } %>
+                                <% } else { %>
+                                    <span class="<%- auditConst.auditStringClass[pay.status] %>"><%- auditConst.auditString[pay.status] %></span>
                                 <% } %>
+                                <% if (pay.uid === ctx.session.sessionUser.accountId && (pay.status === auditConst.status.uncheck || pay.status === auditConst.status.checkNo)) { %><a href="javascript:void(0);" data-id="<%- pay.id %>" class="text-danger del-pay-btn">删除</a><% } %>
                             </td>
                         </tr>
                     <% } %>
@@ -75,12 +122,16 @@
             </div>
     </div>
 </div>
+<link href="/public/css/bootstrap/select2.min.css" rel="stylesheet" />
+<link rel="stylesheet" href="/public/css/bootstrap/select2-bootstrap4.min.css">
+<script src="/public/js/bootstrap/select2.min.js"></script>
 <script>
     const user_id = <%- ctx.session.sessionUser.accountId %>;
+    const fpsid = <%- payStage.id %>;
     const is_admin = <%- ctx.session.sessionUser.is_admin %>;
     const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
     const tenders = JSON.parse(unescape('<%- escape(JSON.stringify(tenders)) %>'));
-    const userCompanyList = JSON.parse(unescape('<%- escape(JSON.stringify(userCompanyList)) %>'));
+    console.log(tenders);
     const fptReportTids = JSON.parse(unescape('<%- escape(JSON.stringify(fptReportTids)) %>'));
     const auditConst = JSON.parse(unescape('<%- escape(JSON.stringify(auditConst)) %>'));
     const auditType = JSON.parse(unescape('<%- escape(JSON.stringify(auditType)) %>'));

+ 0 - 142
app/view/financial/pay_company.ejs

@@ -1,142 +0,0 @@
-<% include ./sub_menu.ejs %>
-<div class="panel-content">
-    <div class="panel-title">
-        <div class="title-main  d-flex">
-            <% include ./sub_mini_menu.ejs %>
-            <div class="col-10 pl-0">
-                <div class="d-inline-block"><a href="/sp/<%- ctx.subProject.id %>/financial/pay" class="account-page-size"><i class="fa fa-chevron-left "></i> <span>返回</span></a><span class="text-muted mx-2">|</span><span>第<%- payCompany.order %>期 <%- payCompany.company %></span><span class="text-muted mx-2">|</span></div>
-                <div class="d-inline-block col-sm-3 pl-0">
-                    <div class="input-group input-group-sm pr-1">
-                        <select class="form-control form-control-sm col-auto" id="tid_select">
-                            <option value="0">全部</option>
-                            <% for (const t of tenders) { %>
-                            <option value="<%- t.id %>" <% if (t.id === tid) { %>selected<% } %> ><%- t.name %></option>
-                            <% } %>
-                        </select>
-                    </div>
-                </div>
-                <div class="d-inline-block">
-                    <div class="input-group input-group-sm pr-1">
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="used_selected" data-value="<%- used %>">资金用途:<%- used ? used : '全部' %></button>
-                            <div class="dropdown-menu" aria-labelledby="used_selected" id="used_select">
-                                <% if (used !== null) { %><a class="dropdown-item to-log-link" data-val="" href="javascript:void(0);">全部</a><% } %>
-                                <% for (const u of usedList) { %>
-                                <% if (used !== u) { %>
-                                <a class="dropdown-item to-log-link" href="javascript:void(0)" data-val="<%- u %>"><%- u %></a>
-                                <% } %>
-                                <% } %>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="d-inline-block">
-                    <div class="input-group input-group-sm pr-1">
-                        <div class="btn-group">
-                            <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="status_selected" data-value="<%- status %>">审批状态:<% if (status !== 0) { %><%- filter.statusString[status] %>(<%- filter.count[status] %>)<% } else { %>全部<% } %></button>
-                            <div class="dropdown-menu" aria-labelledby="status_selected" id="status_select">
-                                <% if (status !== 0) { %><a class="dropdown-item to-log-link" data-val="0" href="javascript:void(0);">全部</a><% } %>
-                                <% for (const fs in filter.status) { %>
-                                    <% const f = filter.status[fs]; %>
-                                    <% if (f !== status) { %><a class="dropdown-item to-log-link" data-val="<%- f %>" href="javascript:void(0);"><%- filter.statusString[f] %>(<%- filter.count[f] %>)</a><% } %>
-                                <% } %>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <% if (notCompanyPays.length > 0 && (ctx.session.sessionUser.is_admin || fptReportTids.length > 0)) { %>
-                <div class="d-inline-block">
-                    <a href="#contract-old-pay" data-toggle="modal" data-target="#contract-old-pay" class="btn btn-sm btn-primary mr-2">关联旧数据</a>
-                </div>
-                <% } %>
-            </div>
-            <div class="d-inline-block ml-auto">
-                <% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
-                <a href="#add-pay" data-toggle="modal" data-target="#add-pay" class="btn btn-primary btn-sm pull-right">申请支付</a>
-                <% } %>
-<!--                <a href="#batch-sp" data-toggle="modal" data-target="#batch-sp" class="btn btn-success btn-sm pull-right mr-2">批量审批</a>-->
-            </div>
-        </div>
-    </div>
-    <div class="content-wrap">
-        <div class="sjs-height-0" style="background-color: #fff">
-                <table class="table table-bordered text-center">
-                    <thead>
-                    <tr>
-                        <th style="min-width: 150px;">标段名称</th>
-                        <th width="200px">支付编号</th>
-                        <th width="150px">申请时间</th>
-                        <th width="100px">申请人</th>
-                        <th width="200px">资金用途</th>
-                        <th width="300px">收款单位</th>
-                        <th width="150px">支付金额</th>
-                        <th width="200px">审批进度</th>
-                        <th width="150px">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="pay-list">
-                    <% for (const pay of payList) { %>
-                        <tr class="text-center" data-tid="<%- pay.tid %>">
-                            <td class="text-left"><%- pay.tenderName %></td>
-                            <td class=""><a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail"><%- pay.code %></a></td>
-                            <td class=""><%- moment(pay.create_time).format('YYYY-MM-DD') %></td>
-                            <td class=""><%- pay.username %></td>
-                            <td class=""><%- pay.used %></td>
-                            <td class=""><%- pay.entities %></td>
-                            <td class="text-right"><%- pay.total_price %></td>
-                            <td class="text-left <%- auditConst.auditProgressClass[pay.status] %>">
-                                <% if (pay.status === auditConst.status.checked && pay.final_auditor_str) { %>
-                                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- pay.final_auditor_str %></a>
-                                <% } else if (pay.curAuditors.length > 0) { %>
-                                    <% if (pay.curAuditors[0].audit_type === auditType.key.common) { %>
-                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- pay.curAuditors[0].name %><%if (pay.curAuditors[0].role !== '' && pay.curAuditors[0].role !== null) { %>-<%- pay.curAuditors[0].role %><% } %></a>
-                                    <% } else { %>
-                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- pay.id %>"><%- ctx.helper.transFormToChinese(pay.curAuditors[0].audit_order) + '审' %></a>
-                                    <% } %>
-                                <% } %>
-                                <%- auditConst.auditProgress[pay.status] %>
-                            </td>
-                            <td>
-                                <% if (pay.status === auditConst.status.uncheck && pay.uid === ctx.session.sessionUser.accountId) { %>
-                                    <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
-                                <% } else if (pay.status === auditConst.status.checkNo && pay.curAuditors && pay.uid === ctx.session.sessionUser.accountId) { %>
-                                    <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
-                                <% } else if (pay.status === auditConst.status.checking && pay.curAuditors && pay.curAuditors.findIndex(x => { return x.aid === ctx.session.sessionUser.accountId; }) >= 0) { %>
-                                    <% const curAudit = pay.curAuditors.find(x => { return x.aid === ctx.session.sessionUser.accountId; }); %>
-                                    <% if (curAudit.status === auditConst.status.checking) { %>
-                                        <a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" class="btn <%- auditConst.statusButtonClass[pay.status] %> btn-sm"><%- auditConst.statusButton[pay.status] %></a>
-                                    <% } else { %>
-                                        <span class="<%- auditConst.auditStringClass[curAudit.status] %>"><%- auditConst.auditString[curAudit.status] %></span>
-                                    <% } %>
-                                <% } else { %>
-                                    <span class="<%- auditConst.auditStringClass[pay.status] %>"><%- auditConst.auditString[pay.status] %></span>
-                                <% } %>
-                                <% if (pay.uid === ctx.session.sessionUser.accountId && (pay.status === auditConst.status.uncheck || pay.status === auditConst.status.checkNo)) { %><a href="javascript:void(0);" data-id="<%- pay.id %>" class="text-danger del-pay-btn">删除</a><% } %>
-                            </td>
-                        </tr>
-                    <% } %>
-                    </tbody>
-                </table>
-                <!--翻页-->
-                <% include ../layout/page.ejs %>
-            </div>
-    </div>
-</div>
-<link href="/public/css/bootstrap/select2.min.css" rel="stylesheet" />
-<link rel="stylesheet" href="/public/css/bootstrap/select2-bootstrap4.min.css">
-<script src="/public/js/bootstrap/select2.min.js"></script>
-<script>
-    const user_id = <%- ctx.session.sessionUser.accountId %>;
-    const fpcid = <%- payCompany.id %>;
-    const is_admin = <%- ctx.session.sessionUser.is_admin %>;
-    const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
-    const tenders = JSON.parse(unescape('<%- escape(JSON.stringify(tenders)) %>'));
-    console.log(tenders);
-    const fptReportTids = JSON.parse(unescape('<%- escape(JSON.stringify(fptReportTids)) %>'));
-    const auditConst = JSON.parse(unescape('<%- escape(JSON.stringify(auditConst)) %>'));
-    const auditType = JSON.parse(unescape('<%- escape(JSON.stringify(auditType)) %>'));
-    const selfCategoryLevel = '';
-    const pid = '<%- ctx.session.sessionProject.id %>';
-    const subProid = '<%- ctx.subProject.id %>';
-    const uphlname = 'user_' + user_id + '_pro_' + pid + '_sub_' + subProid + '_pay_category_hide_list';
-</script>

+ 0 - 163
app/view/financial/pay_company_modal.ejs

@@ -1,163 +0,0 @@
-<% include ../shares/delete_hint_modal.ejs %>
-<% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
-<!-- 申请支付 -->
-<div class="modal fade show" id="add-pay" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">申请支付</h5>
-            </div>
-            <div class="modal-body">
-                <style>
-                    .select2-container {
-                        /*display: inline-block!important;*/
-                        /*height: 27px;*/
-                        width: 100% !important;
-                    }
-                    .select2-container--bootstrap4 .select2-selection--single {
-                        height: calc(1.1em + .75rem + 2px) !important;
-                    }
-                    /*.select2-container--bootstrap4 .select2-selection {*/
-                    /*    background-color: #f8f9fa;*/
-                    /*    !*border-color: #f8f9fa;*!*/
-                    /*    border: 1px solid #f8f9fa;*/
-                    /*}*/
-                    /*.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered:focus{*/
-                    /*    box-shadow: 0 0 0 0.2rem rgba(216,217,219,.5);*/
-                    /*}*/
-                    /*.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered:hover {*/
-                    /*    background-color: #e2e6ea;*/
-                    /*    border-color: #dae0e5;*/
-                    /*}*/
-                    .select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
-                        line-height: calc(1.1em + .75rem);
-                        /*color: #007bff!important;*/
-                        border-radius: 0.2rem;
-                        /*background-color: #f8f9fa;*/
-                        /*border-color: #f8f9fa;*/
-                    }
-                    .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
-                        border-color: #007bff transparent transparent transparent;
-                        border-width: 4px 3.7px 0;
-                    }
-                    .select2-search--dropdown .select2-search__field {
-                        padding: 0.175rem 0.5rem;
-                    }
-                </style>
-                <div class="form-group mb-2">
-                    <label>支付标段<strong class="text-danger">*</strong></label>
-                    <select class="form-control form-control-sm" id="add-pay-tender">
-                        <% for (const t of tenders) { %>
-                        <% if (ctx.session.sessionUser.is_admin || ctx.helper._.includes(fptReportTids, t.id)) { %>
-                            <option value="<%- t.id %>"><%- t.name %></option>
-                        <% } %>
-                        <% } %>
-                    </select>
-                </div>
-                <div class="form-group mb-2">
-                    <label>支付编号</label>
-                    <input class="form-control form-control-sm" placeholder="标段编号-年月日-3位流水号" id="add-pay-code" type="text" readonly="">
-                    <span class="text-danger"></span>
-                </div>
-                <div class="form-group mb-2">
-                    <label>支付用途</label>
-                    <select class="form-control form-control-sm" id="add-pay-used">
-                        <% for (const used of usedList) { %>
-                            <option><%- used %></option>
-                        <% } %>
-                    </select>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-sm  btn-primary" id="add-pay-btn">确定添加</button>
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $(function () {
-        $('#add-pay-tender').select2({
-            language: 'zh-CN',
-            theme: 'bootstrap4',
-            selectOnClose: true,
-            // width: '150',
-        });
-    });
-</script>
-<% if (notCompanyPays.length > 0) { %>
-    <div class="modal fade" id="contract-old-pay" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">关联旧数据</h5>
-                </div>
-                <div class="modal-body" style="max-height: 800px;overflow: auto;">
-                    <table class="table table-bordered">
-                        <tr class="text-center"><th>选择</th><th>标段名称</th><th>支付编号</th><th>申请人</th></tr>
-                        <% for (const pay of notCompanyPays) { %>
-                        <tr>
-                            <td class="text-center"><input type="checkbox" name="pays[]" value="<%- pay.id %>"></td>
-                            <td><%- pay.tenderName %></td>
-                            <td><a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" target="_blank"><%- pay.code %></a></td>
-                            <td class="text-center"><%- pay.username %></td>
-                        <% } %>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-sm btn-primary" id="batch-old-pays">确定关联到本单位期</button>
-                </div>
-            </div>
-        </div>
-    </div>
-<% } %>
-<% } %>
-<!--批量审批-->
-<div class="modal fade" id="batch-sp" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">批量审批</h5>
-            </div>
-            <div class="modal-body">
-                <table class="table table-bordered">
-                    <tr><th>选择</th><th>标段名称</th><th>支付编号</th><th>收款单位</th><th>支付金额</th></tr>
-                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
-                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
-                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
-                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
-                </table>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-sm btn-success">审批</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--审批流程/结果-->
-<div class="modal fade" id="sp-list" data-backdrop="static">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">审批流程</h5>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-4 modal-height-500" style="overflow: auto">
-                        <div class="card mt-3">
-                            <ul class="list-group list-group-flush" id="auditor-list">
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="col-8 modal-height-500" style="overflow: auto" id="audit-list">
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>

+ 2 - 2
app/view/financial/pay_detail.ejs

@@ -4,8 +4,8 @@
         <div class="title-main  d-flex">
             <% include ./sub_mini_menu.ejs %>
             <div class="col-10 pl-0">
-                <% if (financialPay.payCompany) { %>
-                <div class="d-inline-block"><a href="/sp/<%- ctx.subProject.id %>/financial/pay/company/<%- financialPay.payCompany.id %>" class="account-page-size"><i class="fa fa-chevron-left "></i> <span>返回</span></a><span class="text-muted mx-2">|</span></div>
+                <% if (financialPay.payStage) { %>
+                <div class="d-inline-block"><a href="/sp/<%- ctx.subProject.id %>/financial/pay/stage/<%- financialPay.payStage.id %>" class="account-page-size"><i class="fa fa-chevron-left "></i> <span>返回</span></a><span class="text-muted mx-2">|</span></div>
                 <% } %>
 <!--                <div class="d-inline-block mr-3">-->
 <!--                    <div class="btn-group btn-group-toggle group-tab" data-toggle="buttons">-->

+ 103 - 105
app/view/financial/pay_modal.ejs

@@ -1,37 +1,117 @@
 <% include ../shares/delete_hint_modal.ejs %>
 <% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
 <!-- 申请支付 -->
-<div class="modal fade show" id="add-payqi" data-backdrop="static">
+<div class="modal fade show" id="add-pay" data-backdrop="static">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">新建支付期</h5>
+                <h5 class="modal-title">申请支付</h5>
             </div>
             <div class="modal-body">
+                <style>
+                    .select2-container {
+                        /*display: inline-block!important;*/
+                        /*height: 27px;*/
+                        width: 100% !important;
+                    }
+                    .select2-container--bootstrap4 .select2-selection--single {
+                        height: calc(1.1em + .75rem + 2px) !important;
+                    }
+                    /*.select2-container--bootstrap4 .select2-selection {*/
+                    /*    background-color: #f8f9fa;*/
+                    /*    !*border-color: #f8f9fa;*!*/
+                    /*    border: 1px solid #f8f9fa;*/
+                    /*}*/
+                    /*.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered:focus{*/
+                    /*    box-shadow: 0 0 0 0.2rem rgba(216,217,219,.5);*/
+                    /*}*/
+                    /*.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered:hover {*/
+                    /*    background-color: #e2e6ea;*/
+                    /*    border-color: #dae0e5;*/
+                    /*}*/
+                    .select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
+                        line-height: calc(1.1em + .75rem);
+                        /*color: #007bff!important;*/
+                        border-radius: 0.2rem;
+                        /*background-color: #f8f9fa;*/
+                        /*border-color: #f8f9fa;*/
+                    }
+                    .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+                        border-color: #007bff transparent transparent transparent;
+                        border-width: 4px 3.7px 0;
+                    }
+                    .select2-search--dropdown .select2-search__field {
+                        padding: 0.175rem 0.5rem;
+                    }
+                </style>
                 <div class="form-group mb-2">
-                    <label>申请单位<strong class="text-danger">*</strong></label>
-                    <% if (ctx.session.sessionUser.is_admin) { %>
-                    <select name="company" class="form-control form-control-sm" id="add-company-select">
-                        <% for (const c of userCompanyList) { %>
-                            <option value="<%- c.name %>" <% if (c.name === company) { %>selected<% } %>><%- c.name %></option>
+                    <label>支付标段<strong class="text-danger">*</strong></label>
+                    <select class="form-control form-control-sm" id="add-pay-tender">
+                        <% for (const t of tenders) { %>
+                        <% if (ctx.session.sessionUser.is_admin || ctx.helper._.includes(fptReportTids, t.id)) { %>
+                            <option value="<%- t.id %>"><%- t.name %></option>
+                        <% } %>
                         <% } %>
                     </select>
-                    <% } else { %>
-                    <input class="form-control form-control-sm" id="add-company-select" name="company" placeholder="创建人所属单位" value="<%- user.company %>" type="text" readonly="">
-                    <% } %>
                 </div>
                 <div class="form-group mb-2">
-                    <label>支付期数</label>
-                    <input class="form-control form-control-sm" id="company_order" placeholder="自动根据单位生成的期数" value="<%- (ctx.session.sessionUser.is_admin && company ? userCompanyList.find(item => item.name === company).count + 1 : (user.company ? userCompanyList.find(item => item.name === user.company).count + 1 : 0)) %>" type="text" readonly="">
+                    <label>支付编号</label>
+                    <input class="form-control form-control-sm" placeholder="标段编号-年月日-3位流水号" id="add-pay-code" type="text" readonly="">
+                    <span class="text-danger"></span>
+                </div>
+                <div class="form-group mb-2">
+                    <label>支付用途</label>
+                    <select class="form-control form-control-sm" id="add-pay-used">
+                        <% for (const used of usedList) { %>
+                            <option><%- used %></option>
+                        <% } %>
+                    </select>
                 </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-sm  btn-primary" id="add-qi-btn">确定</button>
+                <button type="button" class="btn btn-sm  btn-primary" id="add-pay-btn">确定添加</button>
             </div>
         </div>
     </div>
 </div>
+<script>
+    $(function () {
+        $('#add-pay-tender').select2({
+            language: 'zh-CN',
+            theme: 'bootstrap4',
+            selectOnClose: true,
+            // width: '150',
+        });
+    });
+</script>
+<% if (notStagePays.length > 0) { %>
+    <div class="modal fade" id="contract-old-pay" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">关联旧数据</h5>
+                </div>
+                <div class="modal-body" style="max-height: 800px;overflow: auto;">
+                    <table class="table table-bordered">
+                        <tr class="text-center"><th>选择</th><th>标段名称</th><th>支付编号</th><th>申请人</th></tr>
+                        <% for (const pay of notStagePays) { %>
+                        <tr>
+                            <td class="text-center"><input type="checkbox" name="pays[]" value="<%- pay.id %>"></td>
+                            <td><%- pay.tenderName %></td>
+                            <td><a href="/sp/<%- ctx.subProject.id %>/financial/pay/<%- pay.id %>/detail" target="_blank"><%- pay.code %></a></td>
+                            <td class="text-center"><%- pay.username %></td>
+                        <% } %>
+                    </table>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-sm btn-primary" id="batch-old-pays">确定关联到本单位期</button>
+                </div>
+            </div>
+        </div>
+    </div>
+<% } %>
 <% } %>
 <!--批量审批-->
 <div class="modal fade" id="batch-sp" data-backdrop="static">
@@ -56,110 +136,28 @@
         </div>
     </div>
 </div>
-<!--付款账号-->
-<div class="modal fade" id="payaccount" data-backdrop="static">
+<!--审批流程/结果-->
+<div class="modal fade" id="sp-list" data-backdrop="static">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">付款账号(标段名称)</h5>
-            </div>
-            <div class="modal-body">
-                <div class="row" style="min-height: 400px;max-height: 700px;">
-                    <div class="col-5" style="min-height: 400px;max-height: 700px;overflow:auto;">
-                        <div class="p-2">标段列表</div>
-                        <div id="pay-tender-list"></div>
-                    </div>
-                    <div class="col-7">
-                        <div class="d-flex">
-                            <a href="javascript:void(0);" class="btn btn-sm text-primary pl-0 mb-1" id="get-form-tender">从计量标段同步</a>
-                            <a href="javascript:void(0);" class="btn btn-sm text-primary mb-1" id="batch-other-bank">同步信息到所选标段</a>
-                        </div>
-                        <table class="table table-bordered">
-                            <tr><td>开户名称<b class="text-danger">*</b></td><td><input type="text" name="name" class="form-control form-control-sm"></td></tr>
-                            <tr><td>开户银行<b class="text-danger">*</b></td><td><input type="text" name="bank" class="form-control form-control-sm"></td></tr>
-                            <tr><td>开户账号<b class="text-danger">*</b></td><td><input type="text" name="bank_account" class="form-control form-control-sm"></td></tr>
-                            <tr><td>联系人</td><td><input type="text" name="contact" class="form-control form-control-sm"></td></tr>
-                            <tr><td>联系电话</td><td><input type="text" name="phone" class="form-control form-control-sm"></td></tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <input type="hidden" name="id" value="">
-                <input type="hidden" name="tid" value="">
-                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<% if (ctx.session.sessionUser.is_admin) { %>
-<div class="modal fade" id="liucheng" data-backdrop="static" style="z-index: 1049">
-    <div class="modal-dialog modal-xl" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
                 <h5 class="modal-title">审批流程</h5>
             </div>
-            <div class="modal-body pt-0">
-                <div class="row" style="min-height: 400px;max-height: 700px;">
-                    <div class="col-4" style="min-height: 400px;max-height: 700px;overflow:auto;">
-                        <div class="p-2">标段列表</div>
-                        <div id="shenpi-tender-list"></div>
-                    </div>
-                    <div class="col-4">
-                        <div class="d-flex flex-row bg-graye">
-                            <div class="px-2 pt-1 dropdown">
-                                <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="report_audit_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    添加用户
-                                </button>
-                                <div class="dropdown-menu dropdown-menu-right" id="report_audit_dropdownMenu" aria-labelledby="report_audit_dropdownMenuButton" style="width:220px">
-                                    <div class="mb-2 p-2"><input class="form-control form-control-sm gr-search" placeholder="姓名/手机 检索" data-code="report_audit" autocomplete="off"></div>
-                                    <dl class="list-unstyled book-list">
-                                        <% accountGroup.forEach((group, idx) => { %>
-                                            <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>" data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>
-                                            <div class="dd-content" data-toggleid="<%- idx %>">
-                                                <% group.groupList.forEach(item => { %>
-                                                    <dd class="border-bottom p-2 mb-0 " data-id="<%- item.id %>" >
-                                                        <p class="mb-0 d-flex"><span class="text-primary"><%- item.name %></span><span
-                                                                    class="ml-auto"><%- item.mobile %></span></p>
-                                                        <span class="text-muted"><%- item.role %></span>
-                                                    </dd>
-                                                <% });%>
-                                            </div>
-                                        <% }) %>
-                                    </dl>
-                                </div>
-                            </div>
-                            <div class="p-2"><a href="javascript:void(0);" class="text-danger" id="batch-del-ptAudit">批量删除</a></div>
-                            <div class="p-2"><a href="javascript:void(0);" id="batch-other-ptAudit">同步勾选用户至其他已勾选标段</a></div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-4 modal-height-500" style="overflow: auto">
+                        <div class="card mt-3">
+                            <ul class="list-group list-group-flush" id="auditor-list">
+                            </ul>
                         </div>
-                        <table class="table table-bordered">
-                            <thead>
-                            <tr class="text-center"><th><input type="checkbox" id="select-all-ptAudits"></th><th>用户名</th><th>单位</th><th>填报</th><th>操作</th></tr>
-                            </thead>
-                            <tbody id="report-list">
-                            </tbody>
-                        </table>
                     </div>
-                    <div class="col-4">
-                        <div class="d-flex flex-row bg-graye">
-                            <div class="p-2"><a href="javascript:void(0);" id="set-other-tenders">设置流程至其他已勾选标段</a></div>
-                        </div>
-                        <div id="shenpi-list">
-                        </div>
+                    <div class="col-8 modal-height-500" style="overflow: auto" id="audit-list">
                     </div>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
 </div>
-<script>
-    const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));
-    const accountList = JSON.parse(unescape('<%- escape(JSON.stringify(accountList)) %>'));
-    const sp_status = JSON.parse('<%- JSON.stringify(shenpi.sp_status) %>');
-    const sp_type = JSON.parse('<%- JSON.stringify(shenpi.sp_other_type) %>');
-</script>
-<% } %>

+ 101 - 0
app/view/financial/pay_stage.ejs

@@ -0,0 +1,101 @@
+<% include ./sub_menu.ejs %>
+<div class="panel-content">
+    <div class="panel-title">
+        <div class="title-main  d-flex">
+            <% include ./sub_mini_menu.ejs %>
+            <div class="col-10 pl-0">
+                <div class="btn-group group-tab">
+                    <a class="btn btn-sm btn-light active" href="javascript:void(0);">支付列表</a>
+                    <a class="btn btn-sm btn-light" href="/financial/pay">汇总列表</a>
+                    <a class="btn btn-sm btn-light" href="/financial/pay">标段统计</a>
+                </div>
+                <div class="d-inline-block col-sm-3">
+                    <div class="input-group input-group-sm pr-1">
+                        <select class="form-control form-control-sm col-auto" id="company_select">
+                            <option value="0">筛选单位</option>
+                            <% for (const c of userCompanyList) { %>
+                            <option value="<%- c.id %>" <% if (c.name === company) { %>selected<% } %>><%- c.name %></option>
+                            <% } %>
+                        </select>
+                    </div>
+                </div>
+                <div class="d-inline-block col-sm-2 pl-0">
+                    <div class="input-group input-group-sm pr-1">
+                        <select class="form-control form-control-sm col-auto" id="order_select">
+                            <option selected="0">筛选期数</option>
+                            <% for (const uo of userOrderList) { %>
+                            <option value="<%- uo %>" <% if (uo === qi) { %>selected<% } %>>第<%- uo %>期</option>
+                            <% } %>>
+                        </select>
+                    </div>
+                </div>
+                <div class="d-inline-block">
+                    <% if (ctx.session.sessionUser.is_admin || fptReportTids) { %>
+                    <a href="#payaccount" data-toggle="modal" data-target="#payaccount" class="btn btn-sm btn-primary mr-2">付款账号</a>
+                    <% } %>
+                    <% if (ctx.session.sessionUser.is_admin) { %>
+                    <a href="#liucheng" data-toggle="modal" data-target="#liucheng" class="btn btn-sm btn-primary mr-2">审批流程</a>
+                    <% } %>
+                </div>
+            </div>
+            <div class="d-inline-block ml-auto">
+                <% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
+                <a href="#add-payqi" data-toggle="modal" data-target="#add-payqi" class="btn btn-primary btn-sm pull-right">新建支付期</a>
+                <% } %>
+<!--                <a href="#batch-sp" data-toggle="modal" data-target="#batch-sp" class="btn btn-success btn-sm pull-right mr-2">批量审批</a>-->
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap">
+        <div class="sjs-height-0" style="background-color: #fff">
+                <table class="table table-bordered text-center">
+                    <thead>
+                    <tr>
+                        <th width="100px">期数</th>
+                        <th width="300px">申请单位</th>
+                        <th width="150px">申请时间</th>
+                        <th width="100px">申请人</th>
+                        <th width="150px">本期金额</th>
+                        <th width="150px">截止上期金额</th>
+                        <th width="150px">截止本期金额</th>
+                        <th width="150px">操作</th>
+                    </tr>
+                    </thead>
+                    <tbody id="pay-list">
+                    <% for (const pay of payList) { %>
+                        <tr class="text-center" data-tid="<%- pay.order %>">
+                            <td class=""><a href="/sp/<%- ctx.subProject.id %>/financial/pay/stage/<%- pay.id %>" class="account-page-size">第<%- pay.order %>期</a></td>
+                            <td class="text-left"><%- pay.company %></td>
+                            <td class=""><%- moment(pay.create_time).format('YYYY-MM-DD') %></td>
+                            <td class=""><%- pay.username %></td>
+                            <td class="text-right"><%- pay.total_price %></td>
+                            <td class="text-right"><%- pay.pre_tp %></td>
+                            <td class="text-right"><%- ctx.helper.add(pay.total_price, pay.pre_tp) %></td>
+                            <td>
+                                <% if ((ctx.session.sessionUser.is_admin || pay.uid === ctx.session.sessionUser.accountId) && pay.can_del) { %>
+                                <a href="javascript:void(0);" data-id="<%- pay.id %>" class="text-danger del-pay-btn">删除</a>
+                                <% } %>
+                            </td>
+                        </tr>
+                    <% } %>
+                    </tbody>
+                </table>
+                <!--翻页-->
+                <% include ../layout/page.ejs %>
+            </div>
+    </div>
+</div>
+<script>
+    const user_id = <%- ctx.session.sessionUser.accountId %>;
+    const is_admin = <%- ctx.session.sessionUser.is_admin %>;
+    const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
+    const tenders = JSON.parse(unescape('<%- escape(JSON.stringify(tenders)) %>'));
+    const userCompanyList = JSON.parse(unescape('<%- escape(JSON.stringify(userCompanyList)) %>'));
+    const fptReportTids = JSON.parse(unescape('<%- escape(JSON.stringify(fptReportTids)) %>'));
+    const auditConst = JSON.parse(unescape('<%- escape(JSON.stringify(auditConst)) %>'));
+    const auditType = JSON.parse(unescape('<%- escape(JSON.stringify(auditType)) %>'));
+    const selfCategoryLevel = '';
+    const pid = '<%- ctx.session.sessionProject.id %>';
+    const subProid = '<%- ctx.subProject.id %>';
+    const uphlname = 'user_' + user_id + '_pro_' + pid + '_sub_' + subProid + '_pay_category_hide_list';
+</script>

+ 165 - 0
app/view/financial/pay_stage_modal.ejs

@@ -0,0 +1,165 @@
+<% include ../shares/delete_hint_modal.ejs %>
+<% if (ctx.session.sessionUser.is_admin || fptReportTids.length > 0) { %>
+<!-- 申请支付 -->
+<div class="modal fade show" id="add-payqi" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">新建支付期</h5>
+            </div>
+            <div class="modal-body">
+                <div class="form-group mb-2">
+                    <label>申请单位<strong class="text-danger">*</strong></label>
+                    <% if (ctx.session.sessionUser.is_admin) { %>
+                    <select name="company" class="form-control form-control-sm" id="add-company-select">
+                        <% for (const c of userCompanyList) { %>
+                            <option value="<%- c.name %>" <% if (c.name === company) { %>selected<% } %>><%- c.name %></option>
+                        <% } %>
+                    </select>
+                    <% } else { %>
+                    <input class="form-control form-control-sm" id="add-company-select" name="company" placeholder="创建人所属单位" value="<%- user.company %>" type="text" readonly="">
+                    <% } %>
+                </div>
+                <div class="form-group mb-2">
+                    <label>支付期数</label>
+                    <input class="form-control form-control-sm" id="company_order" placeholder="自动根据单位生成的期数" value="<%- (ctx.session.sessionUser.is_admin && company ? userCompanyList.find(item => item.name === company).count + 1 : (user.company ? userCompanyList.find(item => item.name === user.company).count + 1 : 0)) %>" type="text" readonly="">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-sm  btn-primary" id="add-qi-btn">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<% } %>
+<!--批量审批-->
+<div class="modal fade" id="batch-sp" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">批量审批</h5>
+            </div>
+            <div class="modal-body">
+                <table class="table table-bordered">
+                    <tr><th>选择</th><th>标段名称</th><th>支付编号</th><th>收款单位</th><th>支付金额</th></tr>
+                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
+                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
+                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
+                    <tr><td><input type="checkbox"></td><td>TJ01</td><td>TJ01-20231207001</td><td>中国交通物资有限公司</td><td class="text-right">12345678</td></tr>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-sm btn-success">审批</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--付款账号-->
+<div class="modal fade" id="payaccount" data-backdrop="static">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">付款账号(标段名称)</h5>
+            </div>
+            <div class="modal-body">
+                <div class="row" style="min-height: 400px;max-height: 700px;">
+                    <div class="col-5" style="min-height: 400px;max-height: 700px;overflow:auto;">
+                        <div class="p-2">标段列表</div>
+                        <div id="pay-tender-list"></div>
+                    </div>
+                    <div class="col-7">
+                        <div class="d-flex">
+                            <a href="javascript:void(0);" class="text-primary mr-3 mb-1" id="get-form-tender">从计量标段同步</a>
+                            <a href="javascript:void(0);" class="text-primary mb-1" id="batch-other-bank">同步信息到所选标段</a>
+                        </div>
+                        <table class="table table-bordered">
+                            <tr><td>开户名称<b class="text-danger">*</b></td><td><input type="text" name="name" class="form-control form-control-sm"></td></tr>
+                            <tr><td>开户银行<b class="text-danger">*</b></td><td><input type="text" name="bank" class="form-control form-control-sm"></td></tr>
+                            <tr><td>开户账号<b class="text-danger">*</b></td><td><input type="text" name="bank_account" class="form-control form-control-sm"></td></tr>
+                            <tr><td>联系人</td><td><input type="text" name="contact" class="form-control form-control-sm"></td></tr>
+                            <tr><td>联系电话</td><td><input type="text" name="phone" class="form-control form-control-sm"></td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <input type="hidden" name="id" value="">
+                <input type="hidden" name="tid" value="">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<% if (ctx.session.sessionUser.is_admin) { %>
+<div class="modal fade" id="liucheng" data-backdrop="static" style="z-index: 1049">
+    <div class="modal-dialog modal-xl" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">审批流程</h5>
+            </div>
+            <div class="modal-body pt-0">
+                <div class="row" style="min-height: 400px;max-height: 700px;">
+                    <div class="col-4" style="min-height: 400px;max-height: 700px;overflow:auto;">
+                        <div class="p-2">标段列表</div>
+                        <div id="shenpi-tender-list"></div>
+                    </div>
+                    <div class="col-4">
+                        <div class="d-flex flex-row bg-graye">
+                            <div class="px-2 pt-1 dropdown">
+                                <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="report_audit_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    添加用户
+                                </button>
+                                <div class="dropdown-menu dropdown-menu-right" id="report_audit_dropdownMenu" aria-labelledby="report_audit_dropdownMenuButton" style="width:220px">
+                                    <div class="mb-2 p-2"><input class="form-control form-control-sm gr-search" placeholder="姓名/手机 检索" data-code="report_audit" autocomplete="off"></div>
+                                    <dl class="list-unstyled book-list">
+                                        <% accountGroup.forEach((group, idx) => { %>
+                                            <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>" data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>
+                                            <div class="dd-content" data-toggleid="<%- idx %>">
+                                                <% group.groupList.forEach(item => { %>
+                                                    <dd class="border-bottom p-2 mb-0 " data-id="<%- item.id %>" >
+                                                        <p class="mb-0 d-flex"><span class="text-primary"><%- item.name %></span><span
+                                                                    class="ml-auto"><%- item.mobile %></span></p>
+                                                        <span class="text-muted"><%- item.role %></span>
+                                                    </dd>
+                                                <% });%>
+                                            </div>
+                                        <% }) %>
+                                    </dl>
+                                </div>
+                            </div>
+                            <div class="p-2"><a href="javascript:void(0);" class="text-danger" id="batch-del-ptAudit">批量删除</a></div>
+                            <div class="p-2"><a href="javascript:void(0);" id="batch-other-ptAudit">同步勾选用户至其他已勾选标段</a></div>
+                        </div>
+                        <table class="table table-bordered">
+                            <thead>
+                            <tr class="text-center"><th><input type="checkbox" id="select-all-ptAudits"></th><th>用户名</th><th>单位</th><th>填报</th><th>操作</th></tr>
+                            </thead>
+                            <tbody id="report-list">
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="col-4">
+                        <div class="d-flex flex-row bg-graye">
+                            <div class="p-2"><a href="javascript:void(0);" id="set-other-tenders">设置流程至其他已勾选标段</a></div>
+                        </div>
+                        <div id="shenpi-list">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));
+    const accountList = JSON.parse(unescape('<%- escape(JSON.stringify(accountList)) %>'));
+    const sp_status = JSON.parse('<%- JSON.stringify(shenpi.sp_status) %>');
+    const sp_type = JSON.parse('<%- JSON.stringify(shenpi.sp_other_type) %>');
+</script>
+<% } %>

+ 1 - 1
app/view/financial/sub_menu_list.ejs

@@ -11,7 +11,7 @@
 <div class="nav-box">
     <ul class="nav-list list-unstyled">
         <li class="<% if (ctx.url.indexOf('/pay') !== -1) { %>active<% } %>">
-            <a href="/sp/<%- ctx.subProject.id %>/financial/pay" class="account-page-size"><span class="ml-3">资金支付</span></a>
+            <a href="/sp/<%- ctx.subProject.id %>/financial/pay/stage" class="account-page-size"><span class="ml-3">资金支付</span></a>
         </li>
     </ul>
 </div>

+ 6 - 6
config/web.js

@@ -1909,7 +1909,7 @@ const JsFiles = {
                 ],
                 mergeFile: 'financial_transfer_tender',
             },
-            pay: {
+            payStage: {
                 files: [
                     '/public/js/decimal.min.js',
                     '/public/js/math.min.js',
@@ -1926,11 +1926,11 @@ const JsFiles = {
                     '/public/js/shares/show_level.js',
                     '/public/js/tender_showhide.js',
                     '/public/js/tender_list_base.js',
-                    '/public/js/financial_pay.js',
+                    '/public/js/financial_pay_stage.js',
                 ],
-                mergeFile: 'financial_pay',
+                mergeFile: 'financial_pay_stage',
             },
-            payCompany: {
+            pay: {
                 files: [
                     '/public/js/decimal.min.js',
                     '/public/js/math.min.js',
@@ -1941,9 +1941,9 @@ const JsFiles = {
                     '/public/js/sub_menu.js',
                     '/public/js/div_resizer.js',
                     '/public/js/zh_calc.js',
-                    '/public/js/financial_pay_company.js',
+                    '/public/js/financial_pay.js',
                 ],
-                mergeFile: 'financial_pay_company',
+                mergeFile: 'financial_pay',
             },
             payDetail: {
                 files: [

+ 3 - 3
sql/update.sql

@@ -255,12 +255,12 @@ ALTER TABLE `zh_financial_transfer`
 ADD COLUMN `pre_hb_tp` decimal(30, 8) NULL DEFAULT 0 COMMENT '截止上次划拨金额' AFTER `total_price`;
 
 ALTER TABLE `zh_financial_pay`
-ADD COLUMN `fpcid` int NULL COMMENT '资金支付单位期id' AFTER `tid`;
+ADD COLUMN `fpsid` int NULL COMMENT '资金支付单位期id' AFTER `tid`;
 
 ALTER TABLE `zh_financial_pay_audit`
-ADD COLUMN `fpcid` int NULL COMMENT '资金支付单位期id' AFTER `fpid`;
+ADD COLUMN `fpsid` int NULL COMMENT '资金支付单位期id' AFTER `fpid`;
 
-CREATE TABLE `zh_financial_pay_company`  (
+CREATE TABLE `zh_financial_pay_stage`  (
   `id` int NOT NULL AUTO_INCREMENT,
   `spid` varchar(100) NULL COMMENT '项目id',
   `company_id` int NULL DEFAULT NULL COMMENT '单位id',