diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 6077874..9a79ea4 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -48,6 +48,9 @@ export default {
       type:Boolean,
       default:false
     },
+    summaryMethod:{
+      type:Function
+    },
     treeProps:{
       type:Object,
       default:()=> {
@@ -113,7 +116,7 @@ export default {
   mounted() {
   },
   render(h) {
-    let {cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this
+    let {summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this
     return (
       <div class="table-tree">
         { tableItem && tableItem.length>0 ?
@@ -121,6 +124,7 @@ export default {
             ref="table"
             show-summary={showSummary}
             show-header={showHeader}
+            summary-method={summaryMethod}
             header-row-style={headerRowStyle}
             header-cell-style={headerCellStyle}
             row-style={rowStyle}
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 6610279..5b827f2 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -118,7 +118,7 @@
       <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>备注
+            备注
           </div>
           <div class="xy-table-item-content">
             <el-input clearable placeholder="请填写备注" type="textarea" v-model="form.remark" style="width: 300px;"/>
@@ -201,7 +201,7 @@
       <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>备注
+            备注
           </div>
           <div class="xy-table-item-content">
             <el-input clearable placeholder="请填写备注" type="textarea" v-model="editorForm.remark" style="width: 300px;"/>
@@ -247,13 +247,11 @@ export default {
           {required:true,message:"必选项"}
         ],
         money:[
-          {required:true,message:"必填项"}
+          {required:true,message:"必填项"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         content:[
           {required:true,message:"必填项"}
-        ],
-        remark:[
-          {required:true,message:"必填项"}
         ]
       },
       list:[],
@@ -300,12 +298,6 @@ export default {
           align:'right',
           width: 160
         },
-        {
-          label:"描述",
-          prop:'content',
-          align:'left',
-          sortable:false
-        },
         {
           label:"创建信息",
           prop:'created_at',
@@ -313,7 +305,14 @@ export default {
           formatter:(cell,data,value)=>{
             return parseTime(new Date(value))
           }
-        }
+        },
+        {
+          label:"描述",
+          minWidth:300,
+          prop:'content',
+          align:'left',
+          sortable:false
+        },
       ],
       select:{
         page:1,
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 55c309f..53bc9d5 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -45,7 +45,7 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同金额
           </div>
-          <div class="xy-table-item-content xy-table-item-price">
+          <div class="xy-table-item-content xy-table-item-price-wan">
             <el-input placeholder="请填写合同金额" v-model="form.money" style="width: 300px;"/>
           </div>
         </div>
@@ -145,7 +145,8 @@ export default {
           {required:true,message:"必填"}
         ],
         money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ]
       },
 
@@ -201,7 +202,8 @@ export default {
           {required:true,message:"必填"}
         ],
         money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ]
       }
     }
@@ -264,7 +266,7 @@ export default {
       let res = await getOatoken()
       let url =`/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
       const oaInfo = await axios.get(url)
-      this.form.money = Number(oaInfo.data.flow['合同金额（万元）']) * 10000
+      this.form.money = Number(oaInfo.data.flow['合同金额（万元）'])
       this.form.number = oaInfo.data.flow['合同编号']
       this.form.supply = oaInfo.data.flow['承包商\\供应商']
       this.form.carryDepartment = oaInfo.data.flow['执行部门']
@@ -322,5 +324,18 @@ export default {
     content:'（元）'
   }
 }
-
+.xy-table-item-price-wan{
+  position: relative;
+  &::after{
+    position: absolute;
+    right: 0;
+    top: 0;
+    content:'（万元）'
+  }
+  ::v-deep .el-input__clear{
+    position: relative;
+    right: 46px;
+    z-index: 2;
+  }
+}
 </style>
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index d3da941..7b0777a 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -46,7 +46,7 @@
           <div class="sign-info-item">
             <div class="sign-info-item-title">合同金额</div>
             <div class="sign-info-item-content">{{detail.money}}</div>
-            <div class="sign-info-item-unit">（元）</div>
+            <div class="sign-info-item-unit">（万元）</div>
           </div>
           <div style="display: flex;justify-content: space-between">
             <div class="sign-info-item" style="flex-basis: 50%">
diff --git a/src/views/contract/components/detailContractSign.vue b/src/views/contract/components/detailContractSign.vue
index 95a9ade..684c969 100644
--- a/src/views/contract/components/detailContractSign.vue
+++ b/src/views/contract/components/detailContractSign.vue
@@ -66,7 +66,8 @@ export default {
           {required:true,message:"必填"}
         ],
         money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ]
       }
     }
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 23cc13b..3940a25 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -149,13 +149,16 @@ export default {
       ],
       rules:{
         apply_money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         act_money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         discount_money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         type:[
           {required:true,message:"必选"}
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 6200436..0c71a67 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -58,16 +58,6 @@
           </div>
         </div>
       </template>
-      <template v-slot:money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同金额
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input clearable placeholder="请填写合同金额" v-model="detail.money" style="width: 300px;"/>
-          </div>
-        </div>
-      </template>
       <template v-slot:fundingChannels>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -80,26 +70,6 @@
           </div>
         </div>
       </template>
-      <template v-slot:supply>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>供应商
-          </div>
-          <div class="xy-table-item-content">
-            <el-input clearable placeholder="请填写供应商" v-model="detail.supply" style="width: 300px;"/>
-          </div>
-        </div>
-      </template>
-      <template v-slot:carryDepartment>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>执行部门
-          </div>
-          <div class="xy-table-item-content">
-            <el-input clearable placeholder="请填写执行部门" v-model="detail.carryDepartment" style="width: 300px;"/>
-          </div>
-        </div>
-      </template>
       <template v-slot:isBudget>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -200,20 +170,12 @@ export default {
           {required:true,message:"必选"}
         ],
         price:[
-          {required:true,message:"必填"}
-        ],
-        money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         fundingChannels:[
           {required:true,message:"必填"}
         ],
-        supply:[
-          {required:true,message:"必填"}
-        ],
-        carryDepartment:[
-          {required:true,message:"必填"}
-        ],
         plan:[
           {validator:planPass}
         ]
@@ -319,9 +281,6 @@ export default {
         modality:res.purchase_way_id,
         fundingChannels:res.money_way_id,
         price:res.plan_price,
-        money:res.money,
-        supply:res.supply,
-        carryDepartment:res.carry_department,
         isBudget:res.is_plan === 1 ? true : false,
         plan:res.plans.map(item=>{
           return {
@@ -345,7 +304,6 @@ export default {
         money_way_id:this.detail.fundingChannels,
         plan_price:this.detail.price,
         name:this.detail.name,
-        carry_department:this.detail.carryDepartment,
         contract_plan_links:this.detail.plan.map(item=>{
           return item.value
         })
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index 30df027..3a53dfe 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -177,16 +177,19 @@ export default {
       },
       paymentRegistrationRules:{
         applyMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         deductionMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         type:[
           {required:true,message:"必选"}
         ],
         actMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ]
       },
       planTable:[
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index d968ab2..4d8057b 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -163,10 +163,12 @@ export default {
       },
       paymentRegistrationRules:{
         applyMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         deductionMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         type:[
           {required:true,message:"必选"}
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ff9d4e6..c86266e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -13,9 +13,9 @@
 
           <div>
             <span style="padding: 0 6px;word-break: keep-all;">
-            合同类型
+            项目类型
             </span>
-            <Select placeholder="请选择类型" v-model="select.type" style="width:120px;" clearable>
+            <Select placeholder="请选择项目类型" v-model="select.type" style="width:140px;" clearable>
               <Option v-for="item in type" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </div>
@@ -70,6 +70,15 @@
               v-model="select.priceMax"/>
           </div>
 
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+            状态
+          </span>
+            <Select clearable placeholder="请选择合同状态" v-model="select.status" style="width:200px;">
+              <Option v-for="item in [{label:'待签订',value:1},{label:'已签订',value:2}]" :value="item.value" :key="item.value">{{ item.label }}</Option>
+            </Select>
+          </div>
+
           <Button type="primary"  style="margin-left: 10px" @click="isShowAdd = true">新增</Button>
           <Button type="primary"  style="margin-left: 10px" @click="getContracts">查询</Button>
           <Button type="primary"  style="margin-left: 10px" ghost
@@ -79,7 +88,7 @@
       </slot>
     </lx-header>
 
-    <xy-table :table-item="table" :list="list" @editor="" @delete="(row)=>deleteContract(row.id)" @cellClick="showPaymentPlan" :cell-style="cellStyle">
+    <xy-table :table-item="table" :list="list" @editor="" @delete="(row)=>deleteContract(row.id)" @cellClick="showPaymentPlan" :cell-style="cellStyle" :show-summary="true" :summary-method="summary">
       <template v-slot:btns>
         <el-table-column label="操作" fixed="right" width="220" header-align="center">
           <template slot-scope="scope">
@@ -242,7 +251,7 @@
           <template v-slot:btns>
             <el-table-column label="使用金额" header-align="center">
               <template slot-scope="scope">
-                <Input :value="scope.row.useMoney ? scope.row.useMoney: scope.row.money" @input="(e)=>scope.row.useMoney = e"/>
+                <Input :value="scope.row.useMoney" @input="(e)=>scope.row.useMoney = e"/>
               </template>
             </el-table-column>
           </template>
@@ -402,6 +411,12 @@ export default {
             return value.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
           }
         },
+        {
+          label:'合同签订价（万元）',
+          width: 200,
+          prop:'money',
+          align:'right'
+        },
         {
           label:"合同状态",
           width: 160,
@@ -600,20 +615,12 @@ export default {
           {required:true,message:"必选"}
         ],
         price:[
-          {required:true,message:"必填"}
-        ],
-        money:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         fundingChannels:[
           {required:true,message:"必填"}
         ],
-        supply:[
-          {required:true,message:"必填"}
-        ],
-        carryDepartment:[
-          {required:true,message:"必填"}
-        ],
         plan:[
           {validator:planPass, trigger: 'change'}
         ]
@@ -628,79 +635,110 @@ export default {
     }
   },
   methods: {
+    //合计
+    summary(param){
+      const { columns, data } = param
+      const sums = []
+      columns.map((column,index) => {
+        if(index === 0){
+          sums[index] = '总计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value)) && (column.property === 'money' || column.property === 'plan_price'|| column.property === 'fund_log_total')) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sums[index].toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+        } else {
+          sums[index] = '';
+        }
+      })
+
+      return sums
+    },
+
     cellStyle({row, column, rowIndex, columnIndex}){
-      if(columnIndex === 10){
+      if(columnIndex === 11){
         if(row.is_plan === 1){
-          return {'background':'rgba(240,240,240,0.2)'}
+          return {'color':'rgb(140,140,140)'}
         }
         switch (row.req_status){
           case 1:
-            return {'background':'rgba(140,197,255,0.2)'}
+            return {'color':'rgb(96,109,241)'}
             break;
           case 2:
-            return {'background':'rgba(253,226,226,0.2)'}
+            return {'color':'rgb(219,122,122)'}
             break;
           case 3:
-            return {'background':'rgba(225,243,216,0.2)'}
+            return {'color':'rgb(147,201,134)'}
             break;
           default:
-            return {'background':'rgba(250,236,216,0.2)'}
+            return {'color':'rgb(220,185,126)'}
         }
       }
-      if(columnIndex === 11){
+      if(columnIndex === 12){
         switch (row.purchase_status){
           case 1:
-            return {'background':'rgba(140,197,255,0.2)'}
+            return {'color':'rgb(96,109,241)'}
             break;
           case 2:
-            return {'background':'rgba(253,226,226,0.2)'}
+            return {'color':'rgb(219,122,122)'}
             break;
           case 3:
-            return {'background':'rgba(225,243,216,0.2)'}
+            return {'color':'rgb(147,201,134)'}
             break;
           default:
-            return {'background':'rgba(250,236,216,0.2)'}
+            return {'color':'rgb(220,185,126)'}
         }
       }
-      if(columnIndex === 12){
+      if(columnIndex === 13){
         switch (row.invite_status){
           case 1:
-            return {'background':'rgba(140,197,255,0.2)'}
+            return {'color':'rgb(96,109,241)'}
             break;
           case 2:
-            return {'background':'rgba(253,226,226,0.2)'}
+            return {'color':'rgb(219,122,122)'}
             break;
           case 3:
-            return {'background':'rgba(225,243,216,0.2)'}
+            return {'color':'rgb(147,201,134)'}
             break;
           default:
-            return {'background':'rgba(250,236,216,0.2)'}
+            return {'color':'rgb(220,185,126)'}
         }
       }
-      if(columnIndex === 13){
+      if(columnIndex === 14){
         switch (row.join_status){
           case 1:
-            return {'background':'rgba(140,197,255,0.2)'}
+            return {'color':'rgb(96,109,241)'}
             break;
           case 2:
-            return {'background':'rgba(253,226,226,0.2)'}
+            return {'color':'rgb(219,122,122)'}
             break;
           case 3:
-            return {'background':'rgba(225,243,216,0.2)'}
+            return {'color':'rgb(147,201,134)'}
             break;
           default:
-            return {'background':'rgba(250,236,216,0.2)'}
+            return {'color':'rgb(220,185,126)'}
         }
       }
     },
 
     //点击付款计划查看
     showPaymentPlan(row, column, cell){
-      if(column.id === 'el-table_1_column_10'){
-        console.log(row)
+      console.log(column)
+      if(column.property === 'plan_link_count'){
         this.$refs['contractPaymentRegistration'].getSignPlan(row.id)
         this.$refs['contractPaymentRegistration'].isShow = true
       }
+      if(column.property === 'fund_log_total'){
+        this.$router.push(`/contract/paymentRegistrationList?contractId=${row.id}`)
+      }
     },
     //招标文件审查
     async bidding(row){
@@ -809,7 +847,8 @@ export default {
         purchase_type_id:this.select.purchaseModality,
         purchase_way_id:this.select.purchaseMethods,
         start_plan_price:this.select.priceMin,
-        end_plan_price:this.select.priceMax
+        end_plan_price:this.select.priceMax,
+        status:this.select.status
       })
       this.list = res.data
       this.total = res.total
@@ -828,6 +867,7 @@ export default {
     //选择计划
     selectPlan(sel,row){
       if(sel){
+        console.log(sel,row)
         this.form.plan = sel.map(item => {
           return {
             label:item.name,
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index d007be9..ac06622 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -13,7 +13,7 @@
           <Input placeholder="请输入关键字" style="width: 180px"></Input>
         </span>
 
-        <Button type="primary"  style="margin-left: 10px" ghost>重置</Button>
+        <Button type="primary"  style="margin-left: 10px" ghost @click="contractId = '',pageIndex = 1">重置</Button>
         <Button type="primary"  style="margin-left: 10px" @click="getFundLogs">查询</Button>
       </slot>
     </lx-header>
@@ -65,6 +65,7 @@ export default {
   data() {
     return {
       list:[],
+      contractId:'',
       total:0,
       pageIndex:1,
       table:[
@@ -125,7 +126,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,contract_id:this.contractId})
       this.list = res.data
       this.total = res.total
     },
@@ -141,8 +142,10 @@ export default {
     }
   },
   mounted() {
+    this.contractId = this.$route.query.contractId
+
     this.getFundLogs()
-  }
+  },
 }
 </script>
 
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 23038be..6cfe290 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -177,16 +177,19 @@ export default {
       },
       paymentRegistrationRules:{
         applyMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         deductionMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
         type:[
           {required:true,message:"必选"}
         ],
         actMoney:[
-          {required:true,message:"必填"}
+          {required:true,message:"必填"},
+          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
         ]
       },
       planTable:[
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 58dac0b..7702e9a 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -130,7 +130,7 @@ export default {
     },
 
     cancelExamine(row){
-      editorFundLog({id:row.id,status:0}).then(res=>{
+      editorFundLog({id:row.id,contract_id:row.contract_id,status:0}).then(res=>{
         this.getFundLogs()
         Message({
           type:"success",