diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 2410f84..e4d8bec 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -21,7 +21,7 @@ export default { default:18 }, cellStyle:{ - type:Function, + type:[Function,Object], default:()=>{} }, rowStyle:{ diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue index d29f274..89dbe15 100644 --- a/src/views/finance/components/examineRegistration.vue +++ b/src/views/finance/components/examineRegistration.vue @@ -490,14 +490,6 @@ }) return } - console.log({ - id: this.registrationId, - contract_id: this.contract.id, - act_money: this.paymentRegistrationForm.actMoney, - status: 1, - money_way_id: this.paymentRegistrationForm.moneyWay.toString(), - contract_plan_act_links: this.paymentRegistrationForm.plan - }) editorFundLog({ id: this.registrationId, contract_id: this.contract.id, @@ -505,7 +497,8 @@ status: 1, act_date: this.paymentRegistrationForm.act_date, money_way_id: this.paymentRegistrationForm.moneyWay.toString(), - contract_plan_act_links: this.paymentRegistrationForm.plan + contract_plan_act_links: this.paymentRegistrationForm.plan, + is_end: this.paymentRegistrationForm.isLast ? 1 : 0 }).then(res => { this.$emit('refresh') this.isShow = false