浏览代码

资金支付功能修改

ellisran 7 月之前
父节点
当前提交
572bd05961

+ 1 - 1
app/controller/financial_controller.js

@@ -654,7 +654,7 @@ module.exports = app => {
                         await ctx.service.financialPay.defaultUpdate({ final_auditor_str }, { where: { id: pay.id } });
                     }
                 }
-                if (pay.status === auditConst.financial.status.uncheck || pay.status === auditConst.financial.status.checkNo) {
+                if (pay.status !== auditConst.financial.status.checked) {
                     pay.entities = await ctx.service.financialPayContract.getEntities(pay.id);
                 }
             }

+ 1 - 1
app/public/js/financial_pay_detail.js

@@ -125,7 +125,7 @@ $(function () {
             {title: '结算金额', colSpan: '1', rowSpan: '2', field: 'settle_price', hAlign: 2, width: 80, type: 'Number', readOnly: 'readOnly.isEdit2'},
             {title: '累计结算', colSpan: '1', rowSpan: '2', field: 'accumulate_settle_price', getValue: 'getValue.accumulate_settle_price', hAlign: 2, width: 80, type: 'Number', readOnly: true },
             {title: '未结算', colSpan: '1', rowSpan: '2', field: 'not_pay_price', getValue: 'getValue.not_pay_price', hAlign: 2, width: 80, type: 'Number', readOnly: true },
-            {title: '支付方式', colSpan: '1', rowSpan: '2', field: 'pay_type', hAlign: 2, width: 80, cellType: 'unit', comboItems: payTypeList },
+            {title: '支付方式', colSpan: '1', rowSpan: '2', field: 'pay_type', hAlign: 1, width: 80, cellType: 'unit', comboItems: payTypeList },
             {title: '发票', colSpan: '1', rowSpan: '2', field: 'bill', hAlign: 1, cellType: 'checkbox', width: 60, readOnly: 'readOnly.isEdit2' },
             {title: '附件', colSpan: '1', rowSpan: '2', field: 'attachment', hAlign: 0, width: 60, readOnly: true, cellType: 'imageBtn',
                 normalImg: '#rela-file-icon', hoverImg: '#rela-file-hover', getValue: 'getValue.attachment' },

+ 2 - 1
app/service/financial_pay_audit.js

@@ -294,7 +294,7 @@ module.exports = app => {
                 await transaction.updateRows(this.tableName, updateData);
                 await transaction.update(this.ctx.service.financialPay.tableName, {
                     id: fpId, status: auditConst.status.checking,
-                    entities: await this.ctx.service.financialPayContract.getEntities(fpId),
+                    // entities: await this.ctx.service.financialPayContract.getEntities(fpId),
                 });
                 // todo 更新标段tender状态 ?
                 await transaction.commit();
@@ -391,6 +391,7 @@ module.exports = app => {
                         // 同步 期信息
                         await transaction.update(this.ctx.service.financialPay.tableName, {
                             id: fp.id, status: checkData.checkType,
+                            entities: await this.ctx.service.financialPayContract.getEntities(fp.id),
                         });
                     }
                 } else {