From 9709ee01ad522380bce888b6fd80c2bcfcde0da6 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Tue, 2 Aug 2022 10:54:33 +0800
Subject: [PATCH] =?UTF-8?q?2022.8.2=20=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/components/paymentRegistration.vue |  2 +-
 src/views/contract/contractList.vue                   | 11 ++++++-----
 src/views/contract/paymentRegistrationList.vue        | 10 ++++++----
 src/views/finance/paymentRegistrationList.vue         |  8 +++++---
 4 files changed, 18 insertions(+), 13 deletions(-)

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 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>款项类型
           </div>
           <div class="xy-table-item-content">
-            <el-select placeholder="选择款项类型或直接填写其他类型"
+            <el-select placeholder="选择款项类型或直接录入其他类型"
                        v-model="paymentRegistrationForm.type"
                        style="width: 200px;"
                        filterable
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 6fd07a7..daf155e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -438,9 +438,10 @@ export default {
         },
         {
           label:'付款计划',
-          prop:'plan_link_count',
+          prop:'sign_plan_count',
           width: 120,
           formatter:(cell,data,value)=>{
+            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 @@
       <slot>
         <span style="padding: 0 6px;word-break: keep-all;">创建日期</span>
         <span>
-          <DatePicker placeholder="请选择日期" type="date" placement="bottom-start" style="width: 180px"></DatePicker>
+          <DatePicker :value="selectDate" placeholder="请选择日期" type="date" placement="bottom-start" style="width: 180px" @on-change="(e)=>selectDate = e"></DatePicker>
         </span>
 
         <span style="padding: 0 6px;word-break: keep-all;">关键字</span>
         <span>
-          <Input placeholder="请输入关键字" style="width: 180px"></Input>
+          <Input v-model="keywords" placeholder="请输入关键字" style="width: 180px"></Input>
         </span>
 
-        <Button type="primary"  style="margin-left: 10px" ghost @click="contractId = '',pageIndex = 1">重置</Button>
+        <Button type="primary"  style="margin-left: 10px" ghost @click="contractId = '',pageIndex = 1,keywords = '',selectDate = ''">重置</Button>
         <Button type="primary"  style="margin-left: 10px" @click="getFundLogs">查询</Button>
       </slot>
     </lx-header>
@@ -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 @@
       <slot>
         <span style="padding: 0 6px;word-break: keep-all;">创建日期</span>
         <span>
-          <DatePicker placeholder="请选择日期" type="date" placement="bottom-start" style="width: 180px"></DatePicker>
+          <DatePicker :value="selectDate" placeholder="请选择日期" type="date" placement="bottom-start" style="width: 180px" @on-change="(e)=>selectDate = e"></DatePicker>
         </span>
 
         <span style="padding: 0 6px;word-break: keep-all;">关键字</span>
         <span>
-          <Input placeholder="请输入关键字" style="width: 180px"></Input>
+          <Input v-model="keyword" placeholder="请输入关键字" style="width: 180px"></Input>
         </span>
 
         <Button type="primary"  style="margin-left: 10px" ghost>重置</Button>
@@ -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
     },