diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue index 4d8057b..61e293c 100644 --- a/src/views/contract/components/paymentRegistration.vue +++ b/src/views/contract/components/paymentRegistration.vue @@ -71,7 +71,7 @@ *款项类型
- { + if(value == 0) return '暂无' return value + '期' } }, @@ -733,8 +734,8 @@ export default { //点击付款计划查看 showPaymentPlan(row, column, cell){ - console.log(column) - if(column.property === 'plan_link_count'){ + //console.log(column) + if(column.property === 'sign_plan_count'){ this.$refs['contractPaymentRegistration'].getSignPlan(row.id) this.$refs['contractPaymentRegistration'].isShow = true } @@ -869,7 +870,7 @@ export default { //选择计划 selectPlan(sel,row){ if(sel){ - console.log(sel,row) + //console.log(sel,row) this.form.plan = sel.map(item => { return { label:item.name, @@ -905,7 +906,7 @@ export default { }, //提交新建 submit(){ - console.log(this.form) + //console.log(this.form) addContrant({ type:this.form.type, is_plan:this.form.isBudget ? 1 : 0, diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue index 52645c5..f6c9c0c 100644 --- a/src/views/contract/paymentRegistrationList.vue +++ b/src/views/contract/paymentRegistrationList.vue @@ -5,15 +5,15 @@ 创建日期 - + 关键字 - + - + @@ -64,6 +64,8 @@ export default { }, data() { return { + selectDate:'', + keywords:'', list:[], contractId:'', total:0, @@ -128,7 +130,7 @@ export default { }, async getFundLogs(){ - const res = await getFundLog({page_size:10,page:this.pageIndex,contract_id:this.contractId}) + const res = await getFundLog({page_size:10,page:this.pageIndex,contract_id:this.contractId,keyword:this.keywords,date:this.selectDate}) this.list = res.data this.total = res.total }, diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue index d43921b..f45d83e 100644 --- a/src/views/finance/paymentRegistrationList.vue +++ b/src/views/finance/paymentRegistrationList.vue @@ -5,12 +5,12 @@ 创建日期 - + 关键字 - + @@ -53,6 +53,8 @@ export default { }, data() { return { + keyword:'', + selectDate:'', list:[], total:0, pageIndex:1, @@ -116,7 +118,7 @@ export default { }, async getFundLogs(){ - const res = await getFundLog({page_size:10,page:this.pageIndex}) + const res = await getFundLog({page_size:10,page:this.pageIndex,keyword:this.keyword,date:this.selectDate}) this.list = res.data this.total = res.total },