diff --git a/src/api/Inventory/SelfMadePartsWarehouseOut.js b/src/api/Inventory/SelfMadePartsWarehouseOut.js
index 2e43594e..1127bfdd 100644
--- a/src/api/Inventory/SelfMadePartsWarehouseOut.js
+++ b/src/api/Inventory/SelfMadePartsWarehouseOut.js
@@ -49,14 +49,14 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
   })
 }
 // 自制件出库
-export function warehousing(processPlanSerialNumber, leader, remarks) {
+export function warehousing(processPlanSerialNumber, outgoingQuantity, leader, remarks) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '自制件出库_循环执行_新',
-      param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks
+      param: '工艺计划流水号组=' + processPlanSerialNumber + '&出库数量组=' + outgoingQuantity + '&考勤编号=' + leader + '&出库备注=' + remarks
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
index 14ae7554..1dc278d1 100644
--- a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
+++ b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
@@ -41,7 +41,7 @@ export function searchTable(entryValue, machineValue, check2, GroupNumValue, che
     data: {
       type: '1',
       name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询',
-      param: '项目流水号_check=1&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
+      param: '项目流水号_check=0&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
       pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index 717ff692..b26ad3fa 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -43,6 +43,39 @@ export function searchTable2(num1) {
     }
   })
 }
+export function updateMoney(num1, money) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_编辑数据',
+      param: '资金明细ID=' + num1 + '&金额=' + money
+    }
+  })
+}
+export function addMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_增加数据',
+      param: '资金ID=' + num1
+    }
+  })
+}
+export function deleteMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_删除数据',
+      param: '资金明细ID=' + num1
+    }
+  })
+}
 export function editBatchCapitalChar(num1, num2, num3, num4) {
   return request({
     url: '',
diff --git a/src/utils/request.js b/src/utils/request.js
index 2954d36b..fc41e22d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index 3f16611e..e4e46fa8 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -2,39 +2,39 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
-          <el-option
-            v-for="item in machineTool"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
+        <!--        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">-->
+        <!--          <el-option-->
+        <!--            v-for="item in entryName"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">-->
+        <!--          <el-option-->
+        <!--            v-for="item in machineTool"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
         <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
         <el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData" style="width: 760px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
           width="45"/>
         <el-table-column align="center" label="序号" type="index" width="55px"/>
-        <el-table-column align="center" label="机床图号" width="110px">
+        <el-table-column align="center" label="机床图号" width="130px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -54,11 +54,26 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量" width="50px">
+        <el-table-column align="center" label="库存数量" width="90px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.出库数量1 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="已出库数量" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.已出库数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="出库数量" width="140px">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.出库数量" :max="scope.row.出库数量1" :min="0" size="mini" style="width: 100%"/>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="入库数量" width="80px">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.入库数量 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <!--        <el-table-column align="center" label="状态" width="80px">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
@@ -89,7 +104,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
-          <el-select v-model="form.name" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
+          <el-select v-model="form.name" placeholder="请选择领料人" size="small" filterable clearable style="width: 200px;">
             <el-option
               v-for="item in leaders"
               :key="item.value"
@@ -97,9 +112,9 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员编号" prop="leader" label-width="100px" size="small">
-          <el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>
-        </el-form-item>
+        <!--        <el-form-item label="人员编号" prop="leader" label-width="100px" size="small">-->
+        <!--          <el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible=false">取消</el-button>
@@ -138,6 +153,9 @@ export default {
       rules: {
         leader: [{ required: true, message: '请输入' }]
       },
+      shuzu: [],
+      keyichuku: 1,
+      outgoingQuantity: [],
       departments: [], // 部门
       leaders: [] // 领料人
     }
@@ -148,12 +166,27 @@ export default {
   },
   methods: {
     searchData() {
+      this.tableData = []
       const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
       const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
       const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
       const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
       searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData = response.data.rows
+        if (response.data.rows.length !== 0) {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            this.tableData.push({
+              机床图号: response.data.rows[i].机床图号,
+              组号: response.data.rows[i].组号,
+              零件图号: response.data.rows[i].零件图号,
+              零件名称: response.data.rows[i].零件名称,
+              已出库数量: Number(response.data.rows[i].出库数量),
+              入库数量: Number(response.data.rows[i].入库数量),
+              工艺计划流水号: response.data.rows[i].工艺计划流水号,
+              出库数量: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量),
+              出库数量1: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量)
+            })
+          }
+        }
         this.total = response.data.total
       })
     },
@@ -220,8 +253,8 @@ export default {
       }
     }, // 入库
     wareHousing() {
-      console.log(this.multipleSelection, 121212)
-      if (this.multipleSelection.length === 0) {
+      console.log(this.shuzu, 121212)
+      if (this.shuzu.length === 0) {
         this.$message.warning('请勾选出库物料')
       } else {
         this.selectDepartment()
@@ -230,26 +263,42 @@ export default {
       }
     }, // 多选
     handleSelectionChange(val) {
-      this.multipleSelection = []
-      val.map(v => {
-        this.multipleSelection.push(v.工艺计划流水号)
-      })
+      this.shuzu = []
+      this.shuzu = val
+      // val.map(v => {
+      //   this.multipleSelection.push(v.工艺计划流水号)
+      //   this.outgoingQuantity.push(v.出库数量)
+      // })
     },
     CHUKU() {
-      console.log(this.form.name, 909090, this.form.leader)
-      if (Number(this.form.leader) === Number(this.form.name)) {
-        warehousing(this.multipleSelection, this.form.leader, this.remarks).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('出库成功')
-            this.dialogFormVisible = false
-            this.searchData()
-          } else {
-            this.$message.error('出库失败')
-            this.dialogFormVisible = false
-          }
-        })
+      this.keyichuku = 1
+      this.multipleSelection = []
+      this.outgoingQuantity = []
+      this.shuzu.map(v => {
+        if (v.出库数量 !== 0) {
+          this.multipleSelection.push(v.工艺计划流水号)
+          this.outgoingQuantity.push(v.出库数量)
+        } else {
+          this.keyichuku = 0
+        }
+      })
+      if (this.keyichuku === 1) {
+        if (this.form.name === '') {
+          this.$message.error('请选择领料人')
+        } else {
+          warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('出库成功')
+              this.dialogFormVisible = false
+              this.searchData()
+            } else {
+              this.$message.error('出库失败')
+              this.dialogFormVisible = false
+            }
+          })
+        }
       } else {
-        this.$message.error('人员编号错误')
+        this.$message.error('请选择正确的出库数量')
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index b28e0396..de58c121 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -21,7 +21,7 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <span>机床图号:</span>
-        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange">
+        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
           <el-option
             v-for="item in machineName"
             :key="item.value"
@@ -326,6 +326,7 @@ export default {
         this.check3 = 0
       }
       searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => {
+        console.log(response.data)
         this.tableData = response.data.rows
         this.total = response.data.total
         this.listLoading = false
diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
index 6cd658d1..94c8f275 100644
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -142,6 +142,7 @@ export default {
     this.search2()
     this.search4()
     this.search5()
+    this.search6()
   },
   methods: {
     fetchData() {
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 8073d952..8b409fe0 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -69,7 +69,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 670px">
+      <el-col style="width: 810px">
         <el-card>
           <el-table
             :data="tableData"
@@ -90,7 +90,7 @@
                 {{ scope.row.跟单号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="130">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="180">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 2c0b264c..5c605f46 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称：</span>
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px " size="small" clearable>
+      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px;width: 140px " size="small" clearable>
         <el-option
           v-for="item in entryName"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>客户名称：</span>
-      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
+      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 140px " size="small" clearable>
         <el-option
           v-for="item in customerNames"
           :key="item.value"
@@ -78,7 +76,7 @@
               {{ scope.row.付款方式 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同总额（万元）" width="130">
+          <el-table-column align="right" label="合同总额（万元）" width="130">
             <template slot-scope="scope">
               {{ Number(scope.row.合同总金额).toFixed(2) }}
             </template>
@@ -88,6 +86,11 @@
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
+          <el-table-column label="操作" align="center" width="70" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click.stop="addMoney(scope.row)">收款</el-button>
+            </template>
+          </el-table-column>
           <!--<el-table-column label="操作" align="center" width="60" fixed="right">-->
           <!--<template slot-scope="scope">-->
           <!--<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">-->
@@ -137,8 +140,7 @@
       <el-col :span="10">
         <el-table
           :data="tableData2"
-          style="width: 100%;max-height: 440px;text-align: center"
-          height="210"
+          style="width: 500px;max-height: 440px;text-align: center"
           highlight-current-row
           border
           stripe
@@ -147,330 +149,56 @@
             align="center"
             label="序号"
             type="index"
-            width="100"/>
-          <el-table-column label="收款金额" align="center">
+            width="70"/>
+          <el-table-column align="right" label="收款金额" width="125">
             <template slot-scope="scope">
-              {{ scope.row.金额 }}
+              <template v-if="scope.row.edit">
+                <el-input-number v-model="scope.row.收款金额" :min="0" :step="1" style="width:100px" clearable size="mini"/>
+              </template>
+              <span v-else>{{ Number(scope.row.收款金额).toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="收款时间" align="center">
+          <el-table-column label="收款时间" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.入账时间 }}
+              {{ scope.row.收款时间 ? scope.row.收款时间.split(' ')[0] : '-' }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" align="center" width="110">
+          <el-table-column align="center" label="操作" width="150">
             <template slot-scope="scope">
-              <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
-                <div style="display: inline-block">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-edit-outline"
-                    @click="handleEdit2(scope.row);flag = 2"/>
-                </div>
-              </el-tooltip>
+              <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="updateMoney(scope.row)">确定</el-button>
+              <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleteMoney(scope.row)">删除</el-button>
             </template>
           </el-table-column>
-          <!--        <el-table-column align="center" label="未收金额（万元）" width="118px">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="转下阶段收款金额" width="120px">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.转下阶段金额 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="截止时间" width="156px">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <span>后</span>-->
-          <!--            <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>-->
-          <!--            <span>天内完成</span>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="状态" >-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <el-popover-->
-          <!--              placement="top-start"-->
-          <!--              title="收款计划"-->
-          <!--              width="200"-->
-          <!--              trigger="hover">-->
-          <!--              <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">-->
-          <!--                <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
-          <!--              </div>-->
-          <!--              <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">-->
-          <!--                <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
-          <!--              </div>-->
-          <!--              <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">-->
-          <!--                <h4>{{ scope.row.执行进度名 }}阶段收款已完成</h4>-->
-          <!--              </div>-->
-          <!--              <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>-->
-          <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>-->
-          <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>-->
-          <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>-->
-          <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>-->
-          <!--            </el-popover>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
         </el-table>
       </el-col>
     </el-card>
-
-    <!--新增合同资金对话框-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
-        <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
-          <el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
-            <el-option
-              v-for="item in entryName2"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="合同编号" prop="ContractNumberValue" label-width="100px" size="small">
-          <el-input v-model="form2.ContractNumberValue" :disabled="true" size="small" placeholder="请输入合同编号" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（万元）" style="width: 200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form2')">取消</el-button>
-        <el-button type="primary" @click="submit('form2')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--编辑合同资金对话框-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
-        <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
-          <el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
-            <el-option
-              v-for="item in entryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="合同编号" prop="ContractNumberValue" label-width="100px" size="small">
-          <el-input v-model="form2.ContractNumberValue" :disabled="true" size="small" placeholder="请输入合同编号" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（万元）" style="width: 200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form2')">取消</el-button>
-        <el-button type="primary" @click="editTableData('form2')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--付款对话框-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
-      <el-form ref="form" :model="form" :rules="rules1" label-position="left">
-        <el-form-item label="项目名称" prop="EntryName" label-width="100px">
-          <el-input v-model="form.EntryName" :disabled="true" size="small" placeholder="请输入项目名称"/>
-        </el-form-item>
-        <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form.TotalContractAmount" :disabled="true" size="small" placeholder="请输入合同总金额（万元）"/>
-        </el-form-item>
-        <el-form-item label="未付款金额" prop="AlreadyPaid1" label-width="100px">
-          <el-input v-model="form.AlreadyPaid1 " :disabled="true" size="small" placeholder="请输入未付款金额（万元）"/>
-        </el-form-item>
-        <el-form-item label="本次付款" prop="ThisPayment" label-width="100px">
-          <el-input-number v-model="form.ThisPayment" :min="0" :max="maxMoney" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
-        </el-form-item>
-        <el-form-item label="付款时间" prop="payTime" label-width="97px">
-          <el-date-picker
-            v-model="form.payTime"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="请选择本次付款时间"/>
-        </el-form-item>
-        <el-form-item label="付款阶段" prop="PaymentPhaseValue" label-width="97px">
-          <el-select v-model="form.PaymentPhaseValue" placeholder="请输入付款阶段" clearable size="small" style="width: 236px">
-            <el-option
-              v-for="item in PaymentPhase"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff()">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--营销经理选择-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
-      <span>姓名：</span>
-      <el-input v-model="name" clearable size="small" style="width: 200px"/>
-      <el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
-      <div style="margin-top: 15px">
-        <el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
-          <el-table-column label="销售经理" align="center" >
-            <template slot-scope="scope">
-              {{ scope.row.姓名 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="性别" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.性别 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="offName">取消</el-button>
-        <el-button type="primary" @click="getName">确认</el-button>
-      </div>
-    </el-dialog>
-    <!--编辑批次资金-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
-      <el-form ref="form3" :model="form3" :rules="rules2" label-position="left">
-        <el-form-item label="本次收款金额" prop="本次付款" label-width="110px">
-          <el-input-number v-model="form3.本次付款" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
-        </el-form-item>
-        <el-form-item label="本次收款时间" prop="付款时间" label-width="110px">
-          <el-date-picker
-            v-model="form3.付款时间"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="请选择本次付款时间"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form3')">取消</el-button>
-        <el-button type="primary" @click="submitEdit('form3')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--转移收款-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
-      <el-form ref="form4" :model="form4" :rules="rules3" label-position="left">
-        <el-form-item label="转移金额" prop="转移金额" label-width="110px">
-          <el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
-        </el-form-item>
-        <el-form-item label="计划阶段" prop="计划阶段" label-width="110px">
-          <el-select v-model="form4.计划阶段" clearable filterable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small">
-            <el-option
-              v-for="item in Planning"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form4')">取消</el-button>
-        <el-button type="primary" @click="submitTransPlanning('form4')">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" title="查看收款信息" center width="65%">
-      <el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
-        <el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="name" label="客户名称" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="address" label="联系人" width="80px" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="date" label="联系电话" align="center" width="200px" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="name" label="计划收款时间" width="130px" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.计划付款时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="name" label="阶段" width="60" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.付款批次 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="address" label="状态" width="70px" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.状态 }}
-          </template>
-        </el-table-column>
-        <el-table-column property="date" label="操作" align="center" width="130px">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1000" effect="dark" content="立即收款" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-money"
-                  @click="Detail(scope.row)"/>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1000" effect="dark" content="不再提醒" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  size="mini"
-                  type="text"
-                  style="margin-left: 20px"
-                  icon="el-icon-circle-close"
-                  @click="Never(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { getcustomername, never, executionProgressID, searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
+import { updateMoney, addMoney, deleteMoney, executionProgressID, getcustomername, searchProjectNumber2, AccountsReceivable, selectProvince, SelectMarketingManager, searchTable1, searchTable2, searchProjectNumber, PaymentPhase, selectMachine } from '@/api//MarketingCenter/ContractCapitalManagement'
 
 export default {
   components: {
     elInput
   },
   data() {
-    const validateValue = (rule, value, callback) => {
-      if (value === 0) {
-        callback(new Error('金额不能为0或大于未付款金额'))
-      } else {
-        callback()
-      }
-    }
     return {
       customerNames: [],
       customerName: '',
       pickerOptions: {},
       timetime: '',
       name: '',
+      moneyValue: '',
+      visible1: false,
+      visible2: false,
       plannedTime: [],
       entryName2: [],
       count1: 0,
       type: '',
-      a: 1,
-      b: 1,
-      c: 1,
-      d: 1,
-      id: '',
-      id1: '',
-      id2: '',
-      id3: '',
-      max: 0,
-      max1: 0,
-      max2: 0,
       value: null,
       selectMax: '',
       flag: '',
@@ -478,8 +206,6 @@ export default {
       editFukuan: '',
       ProvinceValue: '',
       Province: [],
-      expands1: [],
-      expands: [],
       tableData3: [],
       tableData4: [],
       entryNameValue: '',
@@ -496,17 +222,13 @@ export default {
       tableData1: [],
       tableData2: [],
       gridData: [],
+      expands: [],
       PageCurrent: 1,
       PageSize: 30,
       total: null,
       PageCurrent2: 1,
       PageSize2: 30,
       total2: null,
-      dialogFormVisible1: false, // 付款对话框可见性
-      dialogFormVisible2: false, // 新增对话框可见性
-      dialogFormVisible3: false,
-      dialogFormVisible4: false,
-      dialogFormVisible5: false,
       maxMoney: 0, // 批次付款最大数额
       zijinID: '', // 资金ID
       PaymentPhase: [],
@@ -517,56 +239,7 @@ export default {
       num: '',
       contractTotal: '',
       dialogFormVisiblePeople: false,
-      AccountsReceivableVisible: false,
-      form: {
-        EntryName: '', // 项目名称
-        TotalContractAmount: '', // 合同总金额
-        AlreadyPaid: '', // 已支付的金额
-        ThisPayment: 0, // 本次付款
-        payTime: '', // 本次付款时间
-        PaymentPhaseValue: '', // 付款阶段
-        AlreadyPaid1: ''
-      },
-      form2: {
-        ContractNumberValue: '', // 合同编号
-        EntryName: '', // 项目名称
-        TotalContractAmount: '', // 合同总金额
-        entryNameValue: '' // 项目名称下拉框
-      },
-      form3: {
-        本次付款: '',
-        付款时间: '',
-        付款阶段id: null
-      },
-      form4: {
-        转移金额: '',
-        计划阶段: ''
-      },
-      rules: { // 表单验证规则
-        ContractNumberValue: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-        TotalContractAmount: [{ required: true, message: '请输入合同总金额', trigger: 'blur' }],
-        entryNameValue: [{ required: true, message: '请选择项目名称', trigger: 'change' }]
-      },
-      rules1: { // 表单验证规则
-        ThisPayment: [
-          { required: true, message: '请输入本次付款金额', trigger: 'blur' },
-          { required: true, trigger: 'blur', validator: validateValue }],
-        payTime: [{ required: true, message: '请输入付款时间', trigger: 'change' }],
-        PaymentPhaseValue: [{ required: true, message: '请输入付款阶段', trigger: 'change' }]
-      },
-      rules2: { // 表单验证规则
-        本次付款: [
-          { required: true, message: '请输入本次付款金额' },
-          { required: true, trigger: 'blur', validator: validateValue }],
-        付款时间: [{ required: true, message: '请输入付款时间' }]
-        // 付款阶段id: [{ required: true, message: '请输入付款阶段', trigger: 'change' }]
-      },
-      rules3: { // 表单验证规则
-        转移金额: [
-          { required: true, message: '请输入转移金额', trigger: 'blur' },
-          { required: true, trigger: 'blur', validator: validateValue }],
-        计划阶段: [{ required: true, message: '请选择计划阶段', trigger: 'change' }]
-      }
+      AccountsReceivableVisible: false
     }
   },
   created() {
@@ -607,148 +280,61 @@ export default {
         this.value = response.data.length
       })
     },
-    handleDelete2(row) {
-      function a() {
-        this.getTableData()
-        AccountsReceivable().then(response => {
-          const data = response.data
-          for (let i = 0; i < data.length; i++) {
-            data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-            if (data[i].状态 === '1') {
-              data[i].状态 = '即将拖期'
-            }
-            if (data[i].状态 === '2') {
-              data[i].状态 = '已拖期'
-            }
-          }
-          this.gridData = data
-          this.value = response.data.length
-        })
-        selectBatchFundingDetails(this.id).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
-              response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
-            }
-          }
-          this.tableData4 = response.data
-        })
-        searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-          this.listLoading2 = false
-          const data = response.data.rows
-          for (let i = 0; i < data.length; i++) {
-            data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-            data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            data[i].执行进度id = parseInt(data[i].执行进度id)
-            if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-              data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-            }
-            if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-              data[i].是否禁用收款 = true
-              data[i].状态 = '进度未完'
-            } else {
-              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-              data[i].是否禁用收款 = false
-              if (data[i].未收金额 === '0') {
-                data[i].状态 = '已完成'
-              } else {
-                if (data[i].状态 === '0') {
-                  data[i].状态 = '未开始'
-                }
-                if (data[i].状态 === '1') {
-                  data[i].状态 = '即将拖期'
-                }
-                if (data[i].状态 === '2') {
-                  data[i].状态 = '已拖期'
-                }
-              }
-            }
-            data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-          }
-          this.tableData2 = data
-          this.total2 = response.data.total
-        })
-      }
-      this.deleteRow(delMoney, row.批次付款明细ID, a)
-    },
-    changeTime(row) {
-      const timeid = row.批次资金id
-      const time = row.执行进度id
-      editTime(timeid, time).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('信息更新成功')
-          AccountsReceivable().then(response => {
-            const data = response.data
-            for (let i = 0; i < data.length; i++) {
-              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-              if (data[i].状态 === '1') {
-                data[i].状态 = '即将拖期'
-              }
-              if (data[i].状态 === '2') {
-                data[i].状态 = '已拖期'
-              }
-            }
-            this.gridData = data
-            this.value = response.data.length
-          })
-          searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-            const data = response.data.rows
-            for (let i = 0; i < data.length; i++) {
-              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-              data[i].执行进度id = parseInt(data[i].执行进度id)
-              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-              }
-              if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                data[i].是否禁用收款 = true
-                data[i].状态 = '进度未完'
-              } else {
-                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                data[i].是否禁用收款 = false
-                if (data[i].未收金额 === '0') {
-                  data[i].状态 = '已完成'
-                } else {
-                  if (data[i].状态 === '0') {
-                    data[i].状态 = '未开始'
-                  }
-                  if (data[i].状态 === '1') {
-                    data[i].状态 = '即将拖期'
-                  }
-                  if (data[i].状态 === '2') {
-                    data[i].状态 = '已拖期'
-                  }
-                }
-              }
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            }
-            this.tableData2 = data
-            this.total2 = response.data.total
-            this.dialogFormVisible4 = false
-          })
+    updateMoney(row) {
+      row.edit = false
+      updateMoney(row.资金明细ID, row.收款金额).then(response => {
+        if (response.data[0].result !== '0') {
+          this.$message.success('编辑成功')
         } else {
-          this.$message.error('信息更新失败')
+          this.$message.error('编辑失败')
         }
       })
     },
-    handleEdit2(row) {
-      this.editForm(row, 'form3')
-      this.title = '编辑阶段收款'
-      this.max1 = parseFloat(this.max2) + parseFloat(row.本次收款金额)
-      this.dialogFormVisible3 = true
-      this.form3.本次付款 = row.本次收款金额
-      this.form3.付款时间 = row.本次收款时间
-      this.id2 = row.批次付款明细ID
-      selectMax(this.id2).then(response => {
-        this.max1 = parseFloat(response.data[0].应收金额) - parseFloat(response.data[0].已收金额) + row.本次收款金额
+    addMoney(row) {
+      this.tableData2 = []
+      addMoney(row.资金id).then(response => {
+        if (response.data[0].result !== '0') {
+          this.$message.success('收款成功')
+          searchTable2(row.资金id).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              this.tableData2.push({
+                收款金额: response.data[i].金额,
+                收款时间: response.data[i].入账时间,
+                资金明细ID: response.data[i].资金明细ID,
+                原收款金额: response.data[i].金额,
+                edit: false
+              })
+            }
+          })
+        } else {
+          this.$message.error('收款失败')
+        }
       })
     },
-    handleChange(row) {
-      this.peopleid = row.营销经理流水号
-      this.peoplename = row.姓名
+    cancelEdit(index, row) {
+      row.edit = false
+      row.收款金额 = this.tableData2[index].原收款金额
+      this.$message('取消修改')
     },
-    changeProvince() {
-      SelectMarketingManager(this.ProvinceValue).then(response => {
-        this.dataPeople = response.data
+    deleteMoney(row) {
+      this.tableData2 = []
+      deleteMoney(row.资金明细ID).then(response => {
+        if (response.data[0].result !== '0') {
+          this.$message.success('删除成功')
+          searchTable2(this.moneyID).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              this.tableData2.push({
+                收款金额: response.data[i].金额,
+                收款时间: response.data[i].入账时间,
+                资金明细ID: response.data[i].资金明细ID,
+                原收款金额: response.data[i].金额,
+                edit: false
+              })
+            }
+          })
+        } else {
+          this.$message.error('删除失败')
+        }
       })
     },
     selectMachine(row) {
@@ -779,67 +365,6 @@ export default {
     getRowKeys(row) {
       return row.项目流水号
     },
-    getRowKeys1(row) {
-      return row.批次资金id
-    },
-    selectMachine1(row) {
-      this.id = row.批次资金id
-      this.tableData4 = []
-      selectBatchFundingDetails(row.批次资金id).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
-            response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
-          }
-        }
-        this.tableData4 = response.data
-      })
-      if (this.c === 1) {
-        this.expands1.push(row.批次资金id)
-        this.d = row.批次资金id
-        this.c = 0
-      } else {
-        if (this.d === row.批次资金id) {
-          this.expands1 = []
-          this.c = 1
-        } else {
-          this.expands1 = []
-          this.expands1.push(row.批次资金id)
-          this.c = 0
-          this.d = row.批次资金id
-        }
-      }
-    },
-    getName() {
-      this.dialogFormVisiblePeople = false
-      this.MarketingManagerValue = this.peoplename
-    },
-    offName() {
-      this.dialogFormVisiblePeople = false
-      this.peopleid = ''
-      this.peoplename = ''
-    },
-    searchProjectName() {
-      if (this.form2.entryNameValue !== '' && this.form2.entryNameValue !== null) {
-        searchProjectName(this.form2.entryNameValue).then(response => {
-          this.form2.ContractNumberValue = response.data[0].合同编号
-        })
-      }
-    },
-    handleEdit(row) {
-      this.contractTotal = parseFloat(row.合同总金额)
-      this.max = parseFloat(row.未支付金额)
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
-      this.temp = 2
-      this.dialogFormVisible1 = true
-      this.form.EntryName = row.项目名称
-      this.zijinID = row.资金id
-      this.form.TotalContractAmount = row.合同总金额
-      this.form.AlreadyPaid1 = row.未支付金额
-      this.form.AlreadyPaid = row.未支付金额
-      this.maxMoney = parseFloat(row.未支付金额)
-    },
     getCustomerName() {
       this.customerName = ''
       this.customerNames = []
@@ -869,9 +394,18 @@ export default {
       })
     },
     getTableData2(row) {
+      this.tableData2 = []
       this.moneyID = row.资金id
       searchTable2(this.moneyID).then(response => {
-        this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.tableData2.push({
+            收款金额: response.data[i].金额,
+            收款时间: response.data[i].入账时间,
+            资金明细ID: response.data[i].资金明细ID,
+            原收款金额: response.data[i].金额,
+            edit: false
+          })
+        }
       })
     },
     handleSizeChange(val) {
@@ -882,673 +416,6 @@ export default {
     handleCurrentChange(val) {
       this.PageCurrent = val
       this.getTableData()
-    },
-    handleSizeChange2(val) {
-      this.PageCurrent2 = 1
-      this.PageSize2 = val
-      this.getTableData2()
-    },
-    handleCurrentChange2(val) {
-      this.PageCurrent2 = val
-      this.getTableData2()
-    },
-    // 重置表单
-    callOff() {
-      this.form2.ContractNumberValue = ''
-      this.form2.EntryName = ''
-      this.form2.TotalContractAmount = ''
-      this.form3.付款阶段id = null
-      this.form3.付款时间 = ''
-      this.form3.本次付款 = ''
-      this.form.PaymentPhaseValue = 1
-      this.dialogFormVisible1 = false
-      this.dialogFormVisible2 = false
-      this.dialogFormVisible3 = false
-      this.dialogFormVisible4 = false
-      this.dialogFormVisible5 = false
-    },
-    chaEdit() {
-      editBatchCapitalChar(this.zijinID, this.form.PaymentPhaseValue, this.form.ThisPayment, this.form.payTime).then(response => {
-        this.dialogFormVisible1 = false
-        if (response.data[0].result === '1') {
-          this.$message.success('信息更新成功')
-          this.getTableData()
-          this.listLoading2 = true
-          searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-            const data = response.data.rows
-            for (let i = 0; i < data.length; i++) {
-              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-              data[i].执行进度id = parseInt(data[i].执行进度id)
-              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-              }
-              if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                data[i].是否禁用收款 = true
-                data[i].状态 = '进度未完'
-              } else {
-                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                data[i].是否禁用收款 = false
-                if (data[i].未收金额 === '0') {
-                  data[i].状态 = '已完成'
-                } else {
-                  if (data[i].状态 === '0') {
-                    data[i].状态 = '未开始'
-                  }
-                  if (data[i].状态 === '1') {
-                    data[i].状态 = '即将拖期'
-                  }
-                  if (data[i].状态 === '2') {
-                    data[i].状态 = '已拖期'
-                  }
-                }
-              }
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            }
-            this.tableData2 = data
-            this.total2 = response.data.total
-            this.dialogFormVisible4 = false
-          })
-          this.maxMoney = 0
-          this.form.PaymentPhaseValue = 1
-        } else {
-          this.$message.error('信息更新失败')
-        }
-      })
-    },
-    // 提交添加或者修改
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.temp === 1) {
-            this.addTableData1()
-            // this.form2.ContractNumberValue = ''
-            // this.form2.EntryName = ''
-            // this.form2.TotalContractAmount = ''
-            this.temp = null
-          } else if (this.temp === 2) {
-            this.chaEdit()
-            this.temp = null
-          }
-        }
-      })
-    },
-    changeMoney() {
-      this.form.AlreadyPaid1 = parseFloat(this.form.AlreadyPaid) - parseFloat(this.form.ThisPayment)
-    },
-    handleDelete(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deletechar(row.批次资金id).then(response => {
-          if (response.data[0].result === '1') {
-            this.getTableData()
-            searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-              const data = response.data.rows
-              for (let i = 0; i < data.length; i++) {
-                data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-                data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                data[i].执行进度id = parseInt(data[i].执行进度id)
-                if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                  data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-                }
-                if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                  data[i].是否禁用收款 = true
-                  data[i].状态 = '进度未完'
-                } else {
-                  data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                  data[i].是否禁用收款 = false
-                  if (data[i].未收金额 === '0') {
-                    data[i].状态 = '已完成'
-                  } else {
-                    if (data[i].状态 === '0') {
-                      data[i].状态 = '未开始'
-                    }
-                    if (data[i].状态 === '1') {
-                      data[i].状态 = '即将拖期'
-                    }
-                    if (data[i].状态 === '2') {
-                      data[i].状态 = '已拖期'
-                    }
-                  }
-                }
-                data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-              }
-              this.tableData2 = data
-              this.total2 = response.data.total
-              this.dialogFormVisible4 = false
-            })
-            this.$message.success('删除成功')
-          } else {
-            this.$message.error('数据占用')
-          }
-        })
-      })
-    },
-    ADD(formName) {
-      this.form2.entryNameValue = ''
-      this.form2.ContractNumberValue = ''
-      this.form2.TotalContractAmount = ''
-      this.count1 = this.count1 + 1
-      if (this.count1 !== 1) {
-        this.$refs[formName].resetFields()
-      }
-      this.dialogFormVisible2 = true
-      this.temp = 1
-    },
-    addTableData1() {
-      addList(this.form2.entryNameValue, this.form2.TotalContractAmount).then(response => {
-        this.dialogFormVisible2 = false
-        if (response.data[0].result === '1') {
-          this.$message.success('添加成功')
-          this.form2.ContractNumberValue = ''
-          this.form2.TotalContractAmount = ''
-        } else {
-          this.$message.error('添加失败')
-        }
-        this.getTableData()
-      })
-    },
-    dellist(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        dellist(row.资金id).then(response => {
-          if (response.data[0].result === '1') {
-            this.getTableData()
-            AccountsReceivable().then(response => {
-              const data = response.data
-              for (let i = 0; i < data.length; i++) {
-                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-                if (data[i].状态 === '1') {
-                  data[i].状态 = '即将拖期'
-                }
-                if (data[i].状态 === '2') {
-                  data[i].状态 = '已拖期'
-                }
-              }
-              this.gridData = data
-              this.value = response.data.length
-            })
-            this.$message.success('删除成功')
-            this.tableData2 = []
-          } else {
-            this.$message.error('数据占用')
-          }
-        })
-      })
-    },
-    changeTime1() {
-      this.pickerOptions = Object.assign({}, this.pickerOptions, {
-        disabledDate: (time) => {
-          return time.getTime() < Date.parse(this.timetime)
-        }
-      })
-    },
-    handleEdit1(row) {
-      this.addForm('form3')
-      this.changeTime1()
-      this.title = '收款'
-      this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
-      this.dialogFormVisible3 = true
-      this.id = row.批次资金id
-      this.id1 = row.资金id
-    },
-    submitEdit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.flag === 1) {
-            fukuan(this.id, this.form3.本次付款, this.form3.付款时间).then(response => {
-              this.dialogFormVisible3 = false
-              if (response.data[0].result === '1') {
-                this.$message.success('收款成功')
-                this.getTableData()
-                searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-                  const data = response.data.rows
-                  for (let i = 0; i < data.length; i++) {
-                    data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                    data[i].执行进度id = parseInt(data[i].执行进度id)
-                    if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                      data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-                    }
-                    if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                      data[i].是否禁用收款 = true
-                      data[i].状态 = '进度未完'
-                    } else {
-                      data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                      data[i].是否禁用收款 = false
-                      if (data[i].未收金额 === '0') {
-                        data[i].状态 = '已完成'
-                      } else {
-                        if (data[i].状态 === '0') {
-                          data[i].状态 = '未开始'
-                        }
-                        if (data[i].状态 === '1') {
-                          data[i].状态 = '即将拖期'
-                        }
-                        if (data[i].状态 === '2') {
-                          data[i].状态 = '已拖期'
-                        }
-                      }
-                    }
-                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                  }
-                  this.tableData2 = data
-                  this.total2 = response.data.total
-                  this.dialogFormVisible4 = false
-                })
-                AccountsReceivable().then(response => {
-                  const data = response.data
-                  for (let i = 0; i < data.length; i++) {
-                    data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-                    if (data[i].状态 === '1') {
-                      data[i].状态 = '即将拖期'
-                    }
-                    if (data[i].状态 === '2') {
-                      data[i].状态 = '已拖期'
-                    }
-                  }
-                  this.gridData = data
-                  this.value = response.data.length
-                })
-                selectBatchFundingDetails(this.id).then(response => {
-                  for (let i = 0; i < response.data.length; i++) {
-                    if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
-                      response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
-                    }
-                  }
-                  this.tableData4 = response.data
-                })
-                this.flag = ''
-              } else {
-                this.$message.error('收款失败')
-              }
-            })
-          } else {
-            editFukuan(this.id2, this.form3.本次付款, this.form3.付款时间).then(response => {
-              this.dialogFormVisible3 = false
-              if (response.data[0].result === '1') {
-                this.$message.success('更新信息成功')
-                AccountsReceivable().then(response => {
-                  const data = response.data
-                  for (let i = 0; i < data.length; i++) {
-                    data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-                    if (data[i].状态 === '1') {
-                      data[i].状态 = '即将拖期'
-                    }
-                    if (data[i].状态 === '2') {
-                      data[i].状态 = '已拖期'
-                    }
-                  }
-                  this.gridData = data
-                  this.value = response.data.length
-                })
-                this.getTableData()
-                searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-                  const data = response.data.rows
-                  for (let i = 0; i < data.length; i++) {
-                    data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                    data[i].执行进度id = parseInt(data[i].执行进度id)
-                    if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                      data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-                    }
-                    if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                      data[i].是否禁用收款 = true
-                      data[i].状态 = '进度未完'
-                    } else {
-                      data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                      data[i].是否禁用收款 = false
-                      if (data[i].未收金额 === '0') {
-                        data[i].状态 = '已完成'
-                      } else {
-                        if (data[i].状态 === '0') {
-                          data[i].状态 = '未开始'
-                        }
-                        if (data[i].状态 === '1') {
-                          data[i].状态 = '即将拖期'
-                        }
-                        if (data[i].状态 === '2') {
-                          data[i].状态 = '已拖期'
-                        }
-                      }
-                    }
-                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                  }
-                  this.tableData2 = data
-                  this.total2 = response.data.total
-                  this.dialogFormVisible4 = false
-                })
-                selectBatchFundingDetails(this.id).then(response => {
-                  for (let i = 0; i < response.data.length; i++) {
-                    if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
-                      response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
-                    }
-                  }
-                  this.tableData4 = response.data
-                })
-                this.flag = ''
-              } else {
-                this.$message.error('更新信息失败')
-              }
-            })
-          }
-        }
-      })
-    },
-    EditTableData(row) {
-      this.editForm(row, 'form2')
-      this.dialogFormVisible4 = true
-      this.form2.entryNameValue = parseInt(row.项目流水号)
-      this.form2.ContractNumberValue = row.合同编号
-      this.form2.TotalContractAmount = row.合同总金额
-      this.zijinID = row.资金id
-    },
-    clear() {
-      this.peopleid = ''
-    },
-    editTableData(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          editList(this.form2.entryNameValue, this.form2.TotalContractAmount, this.zijinID).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('更新信息成功')
-              this.getTableData()
-              searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-                const data = response.data.rows
-                for (let i = 0; i < data.length; i++) {
-                  data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-                  data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                  data[i].执行进度id = parseInt(data[i].执行进度id)
-                  if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                    data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-                  }
-                  if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                    data[i].是否禁用收款 = true
-                    data[i].状态 = '进度未完'
-                  } else {
-                    data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                    data[i].是否禁用收款 = false
-                    if (data[i].未收金额 === '0') {
-                      data[i].状态 = '已完成'
-                    } else {
-                      if (data[i].状态 === '0') {
-                        data[i].状态 = '未开始'
-                      }
-                      if (data[i].状态 === '1') {
-                        data[i].状态 = '即将拖期'
-                      }
-                      if (data[i].状态 === '2') {
-                        data[i].状态 = '已拖期'
-                      }
-                    }
-                  }
-                  data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                }
-                this.tableData2 = data
-                this.total2 = response.data.total
-                this.dialogFormVisible4 = false
-              })
-            } else {
-              this.$message.error('更新信息失败')
-            }
-          })
-        }
-      })
-      // this.editTable(editTableData, [this.zijinID, this.form2.TotalContractAmount], 'form2', function() { this.getTableData(); this.dialogFormVisible4 = false })
-    },
-    TransferPlan(row) {
-      this.id = row.批次资金id
-      this.max1 = parseFloat(row.未收金额)
-      this.form4.转移金额 = parseFloat(row.未收金额)
-      this.form4.计划阶段 = parseInt(row.付款批次) + 1
-      this.dialogFormVisible5 = true
-      this.Planning = []
-      this.addForm('form4')
-      var j = parseInt(row.付款批次)
-      selectBatch(row.资金id).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (i >= j) {
-            this.Planning.push({
-              label: response.data[i].付款批次,
-              value: response.data[i].批次资金ID
-            })
-          }
-        }
-      })
-    },
-    submitTransPlanning() {
-      TransPlanning(this.id, parseInt(this.form4.计划阶段), this.form4.转移金额).then(response => {
-        this.dialogFormVisible5 = false
-        if (response.data[0].result === '1') {
-          this.$message.success('更新信息成功')
-          AccountsReceivable().then(response => {
-            const data = response.data
-            for (let i = 0; i < data.length; i++) {
-              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-              if (data[i].状态 === '1') {
-                data[i].状态 = '即将拖期'
-              }
-              if (data[i].状态 === '2') {
-                data[i].状态 = '已拖期'
-              }
-            }
-            this.gridData = data
-            this.value = response.data.length
-          })
-          this.getTableData()
-          searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-            const data = response.data.rows
-            for (let i = 0; i < data.length; i++) {
-              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-              data[i].执行进度id = parseInt(data[i].执行进度id)
-              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-              }
-              if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                data[i].是否禁用收款 = true
-                data[i].状态 = '进度未完'
-              } else {
-                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                data[i].是否禁用收款 = false
-                if (data[i].未收金额 === '0') {
-                  data[i].状态 = '已完成'
-                } else {
-                  if (data[i].状态 === '0') {
-                    data[i].状态 = '未开始'
-                  }
-                  if (data[i].状态 === '1') {
-                    data[i].状态 = '即将拖期'
-                  }
-                  if (data[i].状态 === '2') {
-                    data[i].状态 = '已拖期'
-                  }
-                }
-              }
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            }
-            this.tableData2 = data
-            this.total2 = response.data.total
-            this.dialogFormVisible4 = false
-          })
-          // selectBatchFundingDetails(this.id).then(response => {
-          //   for (let i = 0; i < response.data.length; i++) {
-          //     response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
-          //   }
-          //   this.tableData4 = response.data
-          // })
-        } else {
-          this.$message.error('更新信息失败')
-        }
-      })
-    },
-    editDay(row) {
-      const Day = row.提前x天提醒
-      editDay(row.批次资金id, Day).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('更新信息成功')
-          AccountsReceivable().then(response => {
-            const data = response.data
-            for (let i = 0; i < data.length; i++) {
-              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-              if (data[i].状态 === '1') {
-                data[i].状态 = '即将拖期'
-              }
-              if (data[i].状态 === '2') {
-                data[i].状态 = '已拖期'
-              }
-            }
-            this.gridData = data
-            this.value = response.data.length
-          })
-          searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
-            const data = response.data.rows
-            for (let i = 0; i < data.length; i++) {
-              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-              data[i].执行进度id = parseInt(data[i].执行进度id)
-              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-              }
-              if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-                data[i].是否禁用收款 = true
-                data[i].状态 = '进度未完'
-              } else {
-                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-                data[i].是否禁用收款 = false
-                if (data[i].未收金额 === '0') {
-                  data[i].状态 = '已完成'
-                } else {
-                  if (data[i].状态 === '0') {
-                    data[i].状态 = '未开始'
-                  }
-                  if (data[i].状态 === '1') {
-                    data[i].状态 = '即将拖期'
-                  }
-                  if (data[i].状态 === '2') {
-                    data[i].状态 = '已拖期'
-                  }
-                }
-              }
-              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            }
-            this.tableData2 = data
-            this.total2 = response.data.total
-          })
-        } else {
-          this.$message.error('更新信息失败')
-        }
-      })
-    },
-    AccountsReceivable() {
-      this.AccountsReceivableVisible = true
-      AccountsReceivable().then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-          if (data[i].状态 === '1') {
-            data[i].状态 = '即将拖期'
-          }
-          if (data[i].状态 === '2') {
-            data[i].状态 = '已拖期'
-          }
-        }
-        this.gridData = data
-        this.value = response.data.length
-      })
-    },
-    tableRowClassName({ row }) {
-      if (row.状态 === '即将拖期') {
-        return 'background: #ffff66'
-      } else if (row.状态 === '已拖期') {
-        return 'background: #ff6666'
-      } else {
-        return ''
-      }
-    },
-    Detail(row) {
-      this.moneyID = row.资金ID
-      this.id3 = row.批次资金ID
-      SelectContractFunds(row.资金ID, this.PageCurrent, this.PageSize).then(response => {
-        this.AccountsReceivableVisible = false
-        const data = response.data.rows
-        for (let i = 0; i < data.length; i++) {
-          data[i].未支付金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-          data[i].已支付 === '0' ? data[i].是否禁用编辑 = false : data[i].是否禁用编辑 = true
-        }
-        this.tableData1 = data
-        this.total = response.data.total
-      })
-      searchTable2(this.PageCurrent2, this.PageSize2, row.资金ID).then(response => {
-        const data = response.data.rows
-        for (let i = 0; i < data.length; i++) {
-          data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
-          data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-          data[i].执行进度id = parseInt(data[i].执行进度id)
-          if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
-            data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
-          }
-          if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
-            data[i].是否禁用收款 = true
-            data[i].状态 = '进度未完'
-          } else {
-            data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
-            data[i].是否禁用收款 = false
-            if (data[i].未收金额 === '0') {
-              data[i].状态 = '已完成'
-            } else {
-              if (data[i].状态 === '0') {
-                data[i].状态 = '未开始'
-              }
-              if (data[i].状态 === '1') {
-                data[i].状态 = '即将拖期'
-              }
-              if (data[i].状态 === '2') {
-                data[i].状态 = '已拖期'
-              }
-            }
-          }
-          data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-        }
-        this.tableData2 = data
-        this.total2 = response.data.total
-      })
-    },
-    tableRowClassName1({ row }) {
-      if (this.id3 === parseInt(row.批次资金id)) {
-        return 'background: #ccffff'
-      } else {
-        return ''
-      }
-    },
-    Never(row) {
-      never(row.批次资金ID).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('信息更新成功')
-          AccountsReceivable().then(response => {
-            const data = response.data
-            for (let i = 0; i < data.length; i++) {
-              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
-              if (data[i].状态 === '1') {
-                data[i].状态 = '即将拖期'
-              }
-              if (data[i].状态 === '2') {
-                data[i].状态 = '已拖期'
-              }
-            }
-            this.gridData = data
-            this.value = response.data.length
-          })
-        } else {
-          this.$message.error('信息更新失败')
-        }
-      })
     }
   }
 }
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index b7914573..020ab011 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -542,7 +542,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="供应商名称" prop="供应商名称">
+            <el-form-item label="供应商名称" prop="供应商流水号">
               <el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable>
                 <el-option
                   v-for="item in supplierNames"
@@ -785,7 +785,7 @@ export default {
       rules2: { // 离线合同表单验证规则
         离线合同编号: [{ required: true, message: '请填写离线合同编号' }],
         离线合同名称: [{ required: true, message: '请填写离线合同名称' }],
-        供应商名称: [{ required: true, message: '请选择供应商' }],
+        供应商流水号: [{ required: true, message: '请选择供应商' }],
         规定到货时间: [{ required: true, message: '请选择规定到货时间' }],
         运费: [{ required: true, message: '请填写运费' }],
         付款方式: [{ required: true, message: '请选择付款方式' }]
@@ -1116,7 +1116,7 @@ export default {
             if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
               this.$message.error('该离线合同编号已存在')
             } else {
-              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商名称, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
+              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
                 if (response.data[0].result === '1') {
                   this.$message.success('新建离线合同成功')
                   this.offlineContract = this.form2.离线合同编号
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index 5a1db1b3..c84da4e1 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <span>项目名称</span>
-      <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="width: 185px">
+      <el-select v-model="projectValue" placeholder="请选择项目名称" clearable filterable size="small" style="width: 185px">
         <el-option
           v-for="item in project"
           :key="item.value"
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span>机床图号</span>
-      <el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small" style="width: 185px">
+      <el-select v-model="machineValue" placeholder="请选择机床图号" clearable filterable size="small" style="width: 185px">
         <el-option
           v-for="item in machine"
           :key="item.value"
@@ -18,7 +18,7 @@
           :value="item.value"/>
       </el-select>
       <span>组号</span>
-      <el-select v-model="groupValue" placeholder="请选择组号" filterable size="small" style="width: 100px">
+      <el-select v-model="groupValue" placeholder="请选择组号" clearable filterable size="small" style="width: 100px">
         <el-option
           v-for="item in group"
           :key="item.value"