diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index 00e6287c..3f52314e 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同资金管理_资金信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int',
+      name: '合同资金管理_资金信息_查询1',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -237,7 +237,7 @@ export function fukuan(code, num1, num2) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同资金管理_批次付款明细表_增加数据',
+      name: '合同资金管理_批次付款明细表_增加数据_新',
       param: '批次资金ID=' + code + '=int&本次收款金额=' + num1 + '=string&本次收款时间=' + num2 + '=string'
     }
   })
@@ -368,8 +368,18 @@ export function never(num1) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同资金管理_催收账款_不再提醒',
+      name: '合同资金管理_资金信息_查询',
       param: '批次资金ID=' + num1 + '=int'
     }
   })
 }
+export function getcustomername() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同资金管理_资金信息_查询_新'
+    }
+  })
+}
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 6774730b..5a8ba895 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -49,7 +49,7 @@ export function delList(num) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同信息管理_合同信息_删除',
+      name: '合同信息管理_合同信息_删除_合同收款计划',
       param: '合同ID=' + num + '=int'
     }
   })
@@ -60,8 +60,8 @@ export function addList() {
     method: 'post',
     data: {
       type: '2',
-      name: '基础表_合同信息表_增加数据',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11]
+      name: '基础表_合同信息表_增加数据_新',
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + '&合同总额=' + arguments[12]
     }
   })
 }
diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js
index 8f4ae65f..ea73961a 100644
--- a/src/api/MarketingCenter/InvoiceRecord.js
+++ b/src/api/MarketingCenter/InvoiceRecord.js
@@ -10,14 +10,14 @@ export function initProject() {
     }
   })
 }
-export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同资金管理_开票记录_合同信息统计_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&客户名称=' + num9 + '=string&客户名称_check=' + num10 + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..03220e7d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
 export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
 export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
 export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
+export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 6d2e3d84..e0cbc807 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -72,54 +72,34 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="付款方式" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.付款方式 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="图纸会签节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="设备预验收节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="发货节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="安装调试节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="销售经理" prop="营销经理" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.营销经理 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>
+        <el-table-column align="center" label="合同总额" width="110">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ scope.row.合同总金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
+        <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
-            {{ scope.row.电话 }}
+            {{ scope.row.付款方式 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="已付金额" width="80">
+          <template slot-scope="scope">
+            {{ Number(scope.row.已支付).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="开票金额" width="80">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.开票金额 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="销售经理" prop="营销经理" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同信息备注" width="120">
@@ -127,6 +107,71 @@
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="合同签订日期" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货节点" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="投标保证金" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.投标保证金 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="已回收" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.已回收 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="履约保证金" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.履约保证金 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="已收加" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.已收加 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="安全保证金" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.安全保证金 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="已收回" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.已收回 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="图纸会签节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="设备预验收节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="安装调试节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
       <div class="block">
         <el-pagination
@@ -169,469 +214,469 @@
         <el-button type="primary" @click="getName">确认</el-button>
       </div>
     </el-dialog>
-    <el-card class="box-card">
-      <div class="block" style="border: 1px solid rgb(220, 223, 230)">
-        <el-carousel :autoplay="true" trigger="click" height="100px">
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToContractCapitalManagement">收款情况</el-button>
-            <el-table
-              v-loading="listLoadingContractCapitalManagement"
-              :data="tableDataContractCapitalManagement"
-              style="width: 99%;"
-              height="100"
-              border
-              stripe
-              size="mini">
-              <el-table-column align="center" label="付款方式" width="100">
-                <template slot-scope="scope">
-                  {{ scope.row.付款方式 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="合同总金额（万元）" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.合同总金额.toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="已到账金额（万元）" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.已支付.toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="未到账金额（万元）" width="150">
-                <template slot-scope="scope">
-                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="付款进度" width="150">
-                <template slot-scope="scope">
-                  <div style="width: 130px">
-                    <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" status="success" />
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="营销经理" width="80">
-                <template slot-scope="scope">
-                  {{ scope.row.姓名 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="客户名称" width="260">
-                <template slot-scope="scope">
-                  {{ scope.row.客户名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="联系人" width="80">
-                <template slot-scope="scope">
-                  {{ scope.row.联系人 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="联系电话" width="130">
-                <template slot-scope="scope">
-                  {{ scope.row.电话 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="银行账号" width="200">
-                <template slot-scope="scope">
-                  {{ scope.row.银行账号 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="税号">
-                <template slot-scope="scope">
-                  {{ scope.row.税号 }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-carousel-item>
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceRecord">开票情况</el-button>
-            <el-table
-              v-loading="listLoadingInvoiceRecord"
-              :data="tableDataInvoiceRecord"
-              style="width: 99%"
-              height="100"
-              border
-              stripe
-              size="mini">
-              <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="50"/>
-              <el-table-column align="center" label="发票抬头" width="200">
-                <template slot-scope="scope">
-                  {{ scope.row.客户名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="纳税人识别号" width="180">
-                <template slot-scope="scope">
-                  {{ scope.row.税号 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="开票电话" width="120">
-                <template slot-scope="scope">
-                  {{ scope.row.传真 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="开票地址" width="200">
-                <template slot-scope="scope">
-                  {{ scope.row.地址 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="开户行" width="120">
-                <template slot-scope="scope">
-                  {{ scope.row.开户行 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="银行账号" width="160">
-                <template slot-scope="scope">
-                  {{ scope.row.银行账号 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="开票金额（含税）" width="150">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.开票金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="开票时间" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.开票时间 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="备注">
-                <template slot-scope="scope">
-                  {{ scope.row.备注 }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-carousel-item>
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
-            <el-table
-              v-loading="tableDataLoadingDeliveryManagement"
-              id="tb"
-              :data="tableDataDeliveryManagement"
-              highlight-current-row
-              style="width: 99%"
-              height="100"
-              border
-              stripe
-              size="mini"
-            >
-              <el-table-column align="center" label="发货单号">
-                <template slot-scope="scope">
-                  {{ scope.row.发货单号 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="收货地址" width="230">
-                <template slot-scope="scope">
-                  {{ scope.row.省份 + scope.row.市名 + scope.row.详细地址 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="收货人">
-                <template slot-scope="scope">
-                  {{ scope.row.联系人 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="联系电话">
-                <template slot-scope="scope">
-                  {{ scope.row.联系方式 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="车辆牌号">
-                <template slot-scope="scope">
-                  {{ scope.row.车辆牌号 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="发货日期">
-                <template slot-scope="scope">
-                  {{ scope.row.发货日期 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="运输状态">
-                <template slot-scope="scope">
-                  {{ scope.row.运输状态 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="运费">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.运费).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="签收人">
-                <template slot-scope="scope">
-                  {{ scope.row.签收人 === '' || scope.row.签收人 === null ? '未签收' : scope.row.签收人 }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-carousel-item>
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToBidBond">投标保证金</el-button>
-            <el-table
-              v-loading="tableData1LoadingBidBond"
-              :data="tableDataBidBond"
-              style="width: 99%"
-              height="100"
-              border
-              stripe
-              size="mini">
-              <el-table-column align="center" label="投标结果" width="190">
-                <template slot-scope="scope">
-                  <el-radio-group v-model="scope.row.投标结果">
-                    <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
-                    <el-radio :disabled="scope.row.是否禁用未中标" label="2">未中标</el-radio>
-                  </el-radio-group>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="公布日期" width="100">
-                <template slot-scope="scope">
-                  {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="招标企业" width="180">
-                <template slot-scope="scope">
-                  {{ scope.row.招标企业 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="联系人" width="100">
-                <template slot-scope="scope">
-                  {{ scope.row.联系人 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="联系电话" width="120">
-                <template slot-scope="scope">
-                  {{ scope.row.联系电话 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="保证金金额" width="100">
-                <template slot-scope="scope">
-                  <el-tag style="width: 80px" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="中标服务费" width="100">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.中标服务费).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="转履约保证金金额" width="150">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.转履约保证金金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="应收回金额" width="100">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.应收回金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="实收回金额" width="100">
-                <template slot-scope="scope">
-                  <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</el-tag>
-                  <el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="投标人" width="100">
-                <template slot-scope="scope">
-                  {{ scope.row.投标人 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="保金类型" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.保证金类型 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="投标日期" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="计划收回日期" width="150">
-                <template slot-scope="scope">
-                  {{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="实际收回日期" width="150">
-                <template slot-scope="scope">
-                  {{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="状态" width="120">
-                <template slot-scope="scope">
-                  <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.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已收回</el-tag>
-                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
-                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
-                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="备注">
-                <template slot-scope="scope">
-                  {{ scope.row.备注 }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-carousel-item>
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToPerformanceBond">履约保证金</el-button>
-            <el-table
-              v-loading="listLoadingPerformanceBond"
-              v-show="showPerformanceBond"
-              :data="tableDataPerformanceBond"
-              style="width: 99%"
-              height="100"
-              border
-              stripe
-              size="mini">
-              <el-table-column align="center" label="履约保证金金额">
-                <template slot-scope="scope">
-                  <el-tag type="primary" size="small">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="保证金类型">
-                <template slot-scope="scope">
-                  {{ scope.row.保证金类型 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="收回条件">
-                <template slot-scope="scope">
-                  {{ scope.row.执行进度名 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="截止时间">
-                <template slot-scope="scope">
-                  后{{ scope.row.提前X天提醒我 }}天内收回
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="是否收回">
-                <template slot-scope="scope">
-                  <el-tag v-if="parseInt(scope.row.是否收回) === 1" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag>
-                  <el-tag v-else-if="parseInt(scope.row.是否收回) === 0" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="实际收回日期">
-                <template slot-scope="scope">
-                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? scope.row.实际收回日期 = '暂未收回' : scope.row.实际收回日期 }}
-                </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.是否收回)!== 1 " style="text-align: center">
-                      <h4>{{ scope.row.执行进度名 }} 未完成</h4>
-                    </div>
-                    <div v-show="scope.row.计划收款日期 !== '' && scope.row.计划收款日期 !== null && parseInt(scope.row.是否收回)!== 1">
-                      <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划收款日期 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
-                    </div>
-                    <div v-show="parseInt(scope.row.是否收回)=== 1 " style="text-align: center">
-                      <h4>已于{{ scope.row.实际收回日期 }}收回</h4>
-                    </div>
-                    <el-tag v-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null && parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag>
-                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag>
-                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag>
-                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 1" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
-                    <el-tag v-else-if="scope.row.计划收款日期===''||scope.row.计划收款日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div v-show="performanceGuaranteeShow" style="width: 300px;margin: 0 auto;">
-              <viewer>
-                <img :src="url" height="250px" style="margin: 0 auto;border: 1px solid black" alt="">
-              </viewer>
-            </div>
-          </el-carousel-item>
-          <el-carousel-item>
-            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToSafetyMargin">安全保证金</el-button>
-            <el-table
-              v-loading="listLoadingSafetyMargin"
-              :data="tableDataSafetyMargin"
-              style="width: 99%"
-              height="100"
-              border
-              stripe
-              size="mini">
-              <el-table-column align="center" label="保证金金额" width="100">
-                <template slot-scope="scope">
-                  <el-tag type="primary" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="交付日期" width="150">
-                <template slot-scope="scope">
-                  {{ !!scope.row.交付日期 ? scope.row.交付日期.substring(0, scope.row.交付日期.length - 8) : scope.row.交付日期 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="收回条件" width="130">
-                <template slot-scope="scope">
-                  {{ scope.row.执行进度名 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="截止时间(天)" width="150">
-                <template slot-scope="scope">
-                  后{{ scope.row.提前x天提醒 }}天内收回
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="扣款金额" width="100">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.扣款金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column label="应收回金额" align="center" width="120">
-                <template slot-scope="scope">
-                  {{ Number(scope.row.应收回金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column label="实际收回金额" align="center" width="120">
-                <template slot-scope="scope">
-                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="是否收回" width="100">
-                <template slot-scope="scope">
-                  <el-tag v-if="parseInt(scope.row.是否收回) === 2" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag>
-                  <el-tag v-else-if="parseInt(scope.row.是否收回) === 1" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="实际收回日期" width="130">
-                <template slot-scope="scope">
-                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '未收回' : scope.row.实际收回日期 }}
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="状态" width="100">
-                <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.是否收回)!== 2 " style="text-align: center">
-                      <h4>{{ scope.row.执行进度名 }} 未完成</h4>
-                    </div>
-                    <div v-show="scope.row.预计收回日期 !== '' && scope.row.预计收回日期 !== null && parseInt(scope.row.是否收回)!== 2">
-                      <h4>{{ scope.row.执行进度名 }}于{{ !scope.row.节点日期 ? scope.row.节点日期 : scope.row.节点日期.substring(0, scope.row.预计收回日期.length - 8) }}完成，计划于{{ !scope.row.预计收回日期 ? scope.row.预计收回日期 : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
-                    </div>
-                    <div v-show="parseInt(scope.row.是否收回)=== 2 " style="text-align: center">
-                      <h4>已于{{ !scope.row.实际收回日期 ? scope.row.实际收回日期 : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}收回</h4>
-                    </div>
-                    <el-tag v-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null && parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag>
-                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag>
-                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag>
-                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
-                    <el-tag v-else-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
-                    <div v-show="false">{{ scope.row.预计收回日期===''||scope.row.预计收回日期===null || parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用收回 = true : scope.row.是否禁用收回 = false }}</div>
-                  </el-popover>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" label="备注">
-                <template slot-scope="scope">
-                  {{ scope.row.备注 }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-carousel-item>
-        </el-carousel>
-      </div>
-    </el-card>
+    <!--    <el-card class="box-card">-->
+    <!--      <div class="block" style="border: 1px solid rgb(220, 223, 230)">-->
+    <!--        <el-carousel :autoplay="true" trigger="click" height="100px">-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToContractCapitalManagement">收款情况</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="listLoadingContractCapitalManagement"-->
+    <!--              :data="tableDataContractCapitalManagement"-->
+    <!--              style="width: 99%;"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini">-->
+    <!--              <el-table-column align="center" label="付款方式" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.付款方式 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="合同总金额（万元）" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.合同总金额.toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="已到账金额（万元）" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.已支付.toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="未到账金额（万元）" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="付款进度" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <div style="width: 130px">-->
+    <!--                    <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" status="success" />-->
+    <!--                  </div>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="营销经理" width="80">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.姓名 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="客户名称" width="260">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.客户名称 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="联系人" width="80">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.联系人 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="联系电话" width="130">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.电话 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="银行账号" width="200">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.银行账号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="税号">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.税号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--          </el-carousel-item>-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceRecord">开票情况</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="listLoadingInvoiceRecord"-->
+    <!--              :data="tableDataInvoiceRecord"-->
+    <!--              style="width: 99%"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini">-->
+    <!--              <el-table-column-->
+    <!--                align="center"-->
+    <!--                label="序号"-->
+    <!--                type="index"-->
+    <!--                width="50"/>-->
+    <!--              <el-table-column align="center" label="发票抬头" width="200">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.客户名称 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="纳税人识别号" width="180">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.税号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="开票电话" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.传真 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="开票地址" width="200">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.地址 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="开户行" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.开户行 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="银行账号" width="160">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.银行账号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="开票金额（含税）" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.开票金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="开票时间" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.开票时间 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="备注">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.备注 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--          </el-carousel-item>-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceDeliveryManagement">发货情况</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="tableDataLoadingDeliveryManagement"-->
+    <!--              id="tb"-->
+    <!--              :data="tableDataDeliveryManagement"-->
+    <!--              highlight-current-row-->
+    <!--              style="width: 99%"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini"-->
+    <!--            >-->
+    <!--              <el-table-column align="center" label="发货单号">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.发货单号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="收货地址" width="230">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.省份 + scope.row.市名 + scope.row.详细地址 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="收货人">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.联系人 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="联系电话">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.联系方式 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="车辆牌号">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.车辆牌号 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="发货日期">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.发货日期 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="运输状态">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.运输状态 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="运费">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.运费).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="签收人">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.签收人 === '' || scope.row.签收人 === null ? '未签收' : scope.row.签收人 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--          </el-carousel-item>-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToBidBond">投标保证金</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="tableData1LoadingBidBond"-->
+    <!--              :data="tableDataBidBond"-->
+    <!--              style="width: 99%"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini">-->
+    <!--              <el-table-column align="center" label="投标结果" width="190">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-radio-group v-model="scope.row.投标结果">-->
+    <!--                    <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>-->
+    <!--                    <el-radio :disabled="scope.row.是否禁用未中标" label="2">未中标</el-radio>-->
+    <!--                  </el-radio-group>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="公布日期" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="招标企业" width="180">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.招标企业 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="联系人" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.联系人 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="联系电话" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.联系电话 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="保证金金额" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag style="width: 80px" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="中标服务费" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.中标服务费).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="转履约保证金金额" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.转履约保证金金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="应收回金额" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.应收回金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="实收回金额" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</el-tag>-->
+    <!--                  <el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="投标人" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.投标人 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="保金类型" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.保证金类型 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="投标日期" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="计划收回日期" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="实际收回日期" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="状态" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <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.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已收回</el-tag>-->
+    <!--                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>-->
+    <!--                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>-->
+    <!--                  <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="备注">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.备注 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--          </el-carousel-item>-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToPerformanceBond">履约保证金</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="listLoadingPerformanceBond"-->
+    <!--              v-show="showPerformanceBond"-->
+    <!--              :data="tableDataPerformanceBond"-->
+    <!--              style="width: 99%"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini">-->
+    <!--              <el-table-column align="center" label="履约保证金金额">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag type="primary" size="small">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="保证金类型">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.保证金类型 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="收回条件">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.执行进度名 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="截止时间">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  后{{ scope.row.提前X天提醒我 }}天内收回-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="是否收回">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag v-if="parseInt(scope.row.是否收回) === 1" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag>-->
+    <!--                  <el-tag v-else-if="parseInt(scope.row.是否收回) === 0" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="实际收回日期">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? scope.row.实际收回日期 = '暂未收回' : scope.row.实际收回日期 }}-->
+    <!--                </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.是否收回)!== 1 " style="text-align: center">-->
+    <!--                      <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
+    <!--                    </div>-->
+    <!--                    <div v-show="scope.row.计划收款日期 !== '' && scope.row.计划收款日期 !== null && parseInt(scope.row.是否收回)!== 1">-->
+    <!--                      <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划收款日期 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
+    <!--                    </div>-->
+    <!--                    <div v-show="parseInt(scope.row.是否收回)=== 1 " style="text-align: center">-->
+    <!--                      <h4>已于{{ scope.row.实际收回日期 }}收回</h4>-->
+    <!--                    </div>-->
+    <!--                    <el-tag v-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null && parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 1" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.计划收款日期===''||scope.row.计划收款日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>-->
+    <!--                  </el-popover>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--            <div v-show="performanceGuaranteeShow" style="width: 300px;margin: 0 auto;">-->
+    <!--              <viewer>-->
+    <!--                <img :src="url" height="250px" style="margin: 0 auto;border: 1px solid black" alt="">-->
+    <!--              </viewer>-->
+    <!--            </div>-->
+    <!--          </el-carousel-item>-->
+    <!--          <el-carousel-item>-->
+    <!--            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToSafetyMargin">安全保证金</el-button>-->
+    <!--            <el-table-->
+    <!--              v-loading="listLoadingSafetyMargin"-->
+    <!--              :data="tableDataSafetyMargin"-->
+    <!--              style="width: 99%"-->
+    <!--              height="100"-->
+    <!--              border-->
+    <!--              stripe-->
+    <!--              size="mini">-->
+    <!--              <el-table-column align="center" label="保证金金额" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag type="primary" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="交付日期" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ !!scope.row.交付日期 ? scope.row.交付日期.substring(0, scope.row.交付日期.length - 8) : scope.row.交付日期 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="收回条件" width="130">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.执行进度名 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="截止时间(天)" width="150">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  后{{ scope.row.提前x天提醒 }}天内收回-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="扣款金额" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.扣款金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column label="应收回金额" align="center" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ Number(scope.row.应收回金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column label="实际收回金额" align="center" width="120">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="是否收回" width="100">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  <el-tag v-if="parseInt(scope.row.是否收回) === 2" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag>-->
+    <!--                  <el-tag v-else-if="parseInt(scope.row.是否收回) === 1" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="实际收回日期" width="130">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '未收回' : scope.row.实际收回日期 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="状态" width="100">-->
+    <!--                <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.是否收回)!== 2 " style="text-align: center">-->
+    <!--                      <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
+    <!--                    </div>-->
+    <!--                    <div v-show="scope.row.预计收回日期 !== '' && scope.row.预计收回日期 !== null && parseInt(scope.row.是否收回)!== 2">-->
+    <!--                      <h4>{{ scope.row.执行进度名 }}于{{ !scope.row.节点日期 ? scope.row.节点日期 : scope.row.节点日期.substring(0, scope.row.预计收回日期.length - 8) }}完成，计划于{{ !scope.row.预计收回日期 ? scope.row.预计收回日期 : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
+    <!--                    </div>-->
+    <!--                    <div v-show="parseInt(scope.row.是否收回)=== 2 " style="text-align: center">-->
+    <!--                      <h4>已于{{ !scope.row.实际收回日期 ? scope.row.实际收回日期 : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}收回</h4>-->
+    <!--                    </div>-->
+    <!--                    <el-tag v-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null && parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>-->
+    <!--                    <el-tag v-else-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>-->
+    <!--                    <div v-show="false">{{ scope.row.预计收回日期===''||scope.row.预计收回日期===null || parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用收回 = true : scope.row.是否禁用收回 = false }}</div>-->
+    <!--                  </el-popover>-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--              <el-table-column align="center" label="备注">-->
+    <!--                <template slot-scope="scope">-->
+    <!--                  {{ scope.row.备注 }}-->
+    <!--                </template>-->
+    <!--              </el-table-column>-->
+    <!--            </el-table>-->
+    <!--          </el-carousel-item>-->
+    <!--        </el-carousel>-->
+    <!--      </div>-->
+    <!--    </el-card>-->
   </div>
 </template>
 
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index c988890b..5c887249 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -9,10 +9,18 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">营销经理：</span>
-      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
+      <!--      <span style="margin-left: 10px">营销经理：</span>-->
+      <!--      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>-->
+      <span>客户名称：</span>
+      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
+        <el-option
+          v-for="item in customerNames"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
+      <!--      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>-->
       <el-badge :value="value" :max="99" class="item">
         <el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
       </el-badge>
@@ -62,9 +70,9 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已完成进度" width="90">
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.执行进度名 }}
+            {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="付款方式" width="80">
@@ -72,59 +80,59 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同总金额（万元）" width="130">
+        <el-table-column align="center" label="合同总额（万元）" width="130">
           <template slot-scope="scope">
             {{ Number(scope.row.合同总金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已到账金额（万元）" width="130">
-          <template slot-scope="scope">
-            {{ Number(scope.row.已支付).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="未到账金额（万元）" width="130">
-          <template slot-scope="scope">
-            <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="付款进度" width="150">
-          <template slot-scope="scope">
-            <div style="width: 130px">
-              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="营销经理" prop="姓名" width="100">
+        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系人" width="60">
-          <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.银行账号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="税号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.税号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="110">
+        <!--        <el-table-column align="center" label="已完成进度" width="90">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.执行进度名 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="已到账金额（万元）" width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ Number(scope.row.已支付).toFixed(2) }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="未到账金额（万元）" width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="付款进度" width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <div style="width: 130px">-->
+        <!--              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
+        <!--            </div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="60">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.银行账号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="税号" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.税号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" align="center" width="60">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -136,16 +144,16 @@
                   @click.stop="EditTableData(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  style="margin-left: 20px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click.stop="dellist(scope.row)"/>
-              </div>
-            </el-tooltip>
+            <!--            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
+            <!--              <div style="display: inline-block">-->
+            <!--                <el-button-->
+            <!--                  style="margin-left: 20px"-->
+            <!--                  size="mini"-->
+            <!--                  type="text"-->
+            <!--                  icon="el-icon-delete"-->
+            <!--                  @click.stop="dellist(scope.row)"/>-->
+            <!--              </div>-->
+            <!--            </el-tooltip>-->
           </template>
         </el-table-column>
       </el-table>
@@ -233,16 +241,6 @@
             {{ scope.row.已收金额 }}
           </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="169px">
           <template slot-scope="scope">
             <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
@@ -254,38 +252,7 @@
             </el-select>
           </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-column label="操作" fixed="right" align="center" width="110">
+        <el-table-column label="操作" align="center" width="110">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
               <div style="display: inline-block">
@@ -310,6 +277,47 @@
             </el-tooltip>
           </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-card>
     <!--新增合同资金对话框-->
@@ -540,7 +548,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { 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 { 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'
 
 export default {
   components: {
@@ -555,6 +563,8 @@ export default {
       }
     }
     return {
+      customerNames: [],
+      customerName: '',
       pickerOptions: {},
       timetime: '',
       name: '',
@@ -674,6 +684,7 @@ export default {
   created() {
     this.getTableData()
     this.init()
+    this.getCustomerName()
   },
   methods: {
     searchName() { // 模糊查询姓名
@@ -941,9 +952,22 @@ export default {
       this.form.AlreadyPaid = row.未支付金额
       this.maxMoney = parseFloat(row.未支付金额)
     },
+    getCustomerName() {
+      this.customerName = ''
+      this.customerNames = []
+      getcustomername().then(response => {
+        console.log(response, 121212)
+        for (let i = 0; i < response.data.length; i++) {
+          this.customerNames.push({
+            value: response.data[i].客户名称,
+            label: response.data[i].客户名称
+          })
+        }
+      })
+    },
     getTableData() {
       this.listLoading = true
-      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid).then(response => {
+      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName).then(response => {
         this.listLoading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 7fbfe6a0..6b1e4638 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
-    <el-card style="background: rgb(233,240,250)">
+    <el-card>
+      <!--      style="background: rgb(233,240,250)"-->
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px 10px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
@@ -118,63 +119,68 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ Number(scope.row.合同总金额).toFixed(2) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="签订日期" width="100">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="图纸会签节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="设备预验收节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="发货节点" width="85">
-          <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="安装调试节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="销售经理" width="85">
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
+        <!--        <el-table-column align="center" label="会签节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="预验收节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="发货节点" width="85">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" width="120">
+        <!--        <el-table-column align="center" label="安装调试节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="合同备注" width="120">
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="150">
+        <el-table-column label="操作" align="center" width="170">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-circle-plus-outline"
-              @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+              @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -210,37 +216,37 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card v-show="ExecutionProgressShow">
-      <div>
-        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>
-        <div style="display: inline-block; float:right">
-          <span>已完成进度：</span>
-          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
-            <el-option
-              v-for="item in executionProgress"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-              :disabled ="item.disabled"/>
-          </el-select>
-        </div>
-      </div>
-      <div>
-        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
-          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>
-          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>
-          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>
-          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>
-          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>
-          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>
-          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>
-          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>
-        </el-steps>
-      </div>
-    </el-card>
+    <!--    <el-card v-show="ExecutionProgressShow">-->
+    <!--      <div>-->
+    <!--        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>-->
+    <!--        <div style="display: inline-block; float:right">-->
+    <!--          <span>已完成进度：</span>-->
+    <!--          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">-->
+    <!--            <el-option-->
+    <!--              v-for="item in executionProgress"-->
+    <!--              :key="item.value"-->
+    <!--              :label="item.label"-->
+    <!--              :value="item.value"-->
+    <!--              :disabled ="item.disabled"/>-->
+    <!--          </el-select>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <div>-->
+    <!--        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">-->
+    <!--          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>-->
+    <!--          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>-->
+    <!--          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>-->
+    <!--          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>-->
+    <!--          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>-->
+    <!--          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>-->
+    <!--          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>-->
+    <!--          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>-->
+    <!--        </el-steps>-->
+    <!--      </div>-->
+    <!--    </el-card>-->
     <el-card v-show="uploader" style="min-height: 145px;">
       <h4 style="margin: 3px;">纪要文件</h4>
-      <div style="float: right;">
+      <div style="float: left;">
         <el-upload
           :action="action"
           :on-success="uploadSuccess"
@@ -283,7 +289,12 @@
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-show="isTrue" :span="12">
+            <el-form-item label="合同总额" prop="contractAmount">
+              <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-show="false" :span="12" >
             <el-form-item label="已完成进度" prop="executionProgressID">
               <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
                 <el-option
@@ -570,6 +581,7 @@ export default {
   },
   data() {
     return {
+      isTrue: true,
       customerName1: '',
       customerName1_check: '',
       machineDATA: '',
@@ -659,7 +671,8 @@ export default {
         customerName: '', // 客户名称
         remark: '',
         付款方式: 1,
-        bidding: ''
+        bidding: '',
+        contractAmount: '' // 合同总额
       },
       tableDataBidding: [],
       executionProgressID: '',
@@ -682,7 +695,8 @@ export default {
         MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
         executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
         contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
-        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }]
+        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
+        contractAmount: [{ required: true, message: '请输入合同总额', trigger: 'blur' }]
       },
       rules1: { // 表单验证规则
         设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
@@ -922,9 +936,10 @@ export default {
       this.disabled = false
       this.biddingNumber = ''
       this.tableDataBidding = []
+      this.isTrue = true
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
+      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
@@ -979,6 +994,7 @@ export default {
       this.form.bidding = row.招标企业
       this.disabled = true
       this.temp = 2
+      this.isTrue = false
     },
     chaEdit() {
       editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index ed9b72bd..2b8bc71a 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -10,22 +10,28 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
-        <el-date-picker
-          v-model="startTime"
-          style="margin-right: 5px;width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请输入客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
+        <!--        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="margin-right: 5px;width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-circle-plus-outline"
+          @click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
       </el-row>
     </el-card>
     <!--项目表格-->
@@ -55,45 +61,50 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="销售经理" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同总金额（含税）" width="130">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
+            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
             <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="已到账金额" width="120">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
+            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
             <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="税率" width="100">
-          <template slot-scope="scope">
-            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column align="center" label="税率" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="130px">
+        <el-table-column align="center" label="合同签订日期" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="销售经理" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="开票详情" fixed="right" align="center" width="130px">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录</el-button>
+              @click.stop="opendialogFormVisibleRecordDialog(scope.row)">开票详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -110,7 +121,96 @@
       </div>
     </el-card>
     <!--开票记录-->
-    <el-card>
+    <!--    <el-card>-->
+    <!--      <el-table-->
+    <!--        v-loading="listLoading2"-->
+    <!--        :data="tableData2"-->
+    <!--        :summary-method="getSummaries"-->
+    <!--        show-summary-->
+    <!--        style="width: 40%;margin-top: 3px"-->
+    <!--        height="300"-->
+    <!--        highlight-current-row-->
+    <!--        border-->
+    <!--        stripe-->
+    <!--        size="mini">-->
+    <!--        <el-table-column-->
+    <!--          align="center"-->
+    <!--          label="序号"-->
+    <!--          type="index"-->
+    <!--          width="50"/>-->
+    <!--        <el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.客户名称 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="纳税人识别号" width="180">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.税号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票电话" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.传真 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票地址" width="200">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.地址 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开户行" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.开户行 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="银行账号" width="160">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.银行账号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票金额（含税）" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ Number(scope.row.开票金额).toFixed(2) }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票时间" width="100">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.开票时间 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="备注">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.备注 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="操作" align="center" width="130">-->
+    <!--          <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.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>-->
+    <!--              </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-delete"-->
+    <!--                  @click.stop="delInvoiceRecordingDialog(scope.row)"/>-->
+    <!--              </div>-->
+    <!--            </el-tooltip>-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+    <!--    </el-card>-->
+
+    <!--    开票详情-->
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="800px">
       <el-table
         v-loading="listLoading2"
         :data="tableData2"
@@ -132,31 +232,31 @@
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="纳税人识别号" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.税号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票电话" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票地址" width="200">
-          <template slot-scope="scope">
-            {{ scope.row.地址 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开户行" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.开户行 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="银行账号" width="160">
-          <template slot-scope="scope">
-            {{ scope.row.银行账号 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column align="center" label="纳税人识别号" width="180">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.税号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开票电话" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.传真 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开票地址" width="200">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.地址 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开户行" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.开户行 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="银行账号" width="160">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.银行账号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="开票金额（含税）" width="120">
           <template slot-scope="scope">
             {{ Number(scope.row.开票金额).toFixed(2) }}
@@ -172,7 +272,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="130">
+        <el-table-column label="操作" align="center" width="130">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -196,8 +296,7 @@
           </template>
         </el-table-column>
       </el-table>
-    </el-card>
-
+    </el-dialog>
     <!--营销经理选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
       <span>姓名：</span>
@@ -239,36 +338,36 @@
               <el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="发票抬头" prop="发票抬头">
-              <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="税号" prop="税号">
-              <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票电话" prop="开票电话">
-              <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票地址" prop="开票地址">
-              <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行" prop="开户行">
-              <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行账号" prop="银行账号">
-              <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="发票抬头" prop="发票抬头">-->
+          <!--              <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="税号" prop="税号">-->
+          <!--              <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开票电话" prop="开票电话">-->
+          <!--              <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开票地址" prop="开票地址">-->
+          <!--              <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开户行" prop="开户行">-->
+          <!--              <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="银行账号" prop="银行账号">-->
+          <!--              <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="开票金额" prop="开票金额">
               <el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
@@ -350,6 +449,7 @@ export default {
   },
   data() {
     return {
+      row1: [],
       pickerOptions: {},
       timetime: '',
       name: '',
@@ -381,6 +481,7 @@ export default {
       dataPeople: [], // 营销经理数组
       peoplename: '', // 营销经理姓名
       title: '', // 开票记录对话框标题
+      dialogFormVisibleRecord: false, // 开票详情对话框
       dialogFormVisible1: false, // 开票记录对话框显示隐藏
       dialogCustomerFormVisible: false, // 打开选择客户对话框
       flag: '', // 开票记录增加编辑旗帜变量
@@ -389,6 +490,8 @@ export default {
       loading1: false, // 客户信息表加载框
       CustomerCode: '',
       invoiceRecordingCode: '',
+      customerName: '',
+      customerName_check: '',
       form: {
         客户名称: '',
         发票抬头: '',
@@ -403,7 +506,7 @@ export default {
       },
       rules: {
         客户名称: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }],
-        开票金额: [{ required: true, message: '请双击选择客户名称', trigger: 'blur' }],
+        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
         开票时间: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }]
       }
     }
@@ -413,6 +516,10 @@ export default {
     this.fetchTableData1()
   },
   methods: {
+    opendialogFormVisibleRecordDialog(row) {
+      this.dialogFormVisibleRecord = true
+      this.fetchTableData2(row)
+    },
     changeTime() {
       this.pickerOptions = Object.assign({}, this.pickerOptions, {
         disabledDate: (time) => {
@@ -440,12 +547,13 @@ export default {
     },
     // 查询项目信息表格
     fetchTableData1() {
+      if (this.customerName === '' || this.customerName === null) { this.customerName_check = 0 } else { this.customerName_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       this.listLoading1 = true
-      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName, this.customerName_check).then(response => {
         this.listLoading1 = false
         const data = response.data
         for (let i = 0; i < data.rows.length; i++) {
@@ -472,6 +580,7 @@ export default {
     },
     // 查询开票记录表格
     fetchTableData2(row) {
+      this.row1 = row
       this.taxRate = row.税率
       this.projectid = row.项目流水号
       searchTableData2(this.projectid).then(response => {
@@ -565,13 +674,20 @@ export default {
       this.peopleid = ''
     },
     // 打开增加开票记录对话框
-    openAddInvoiceRecordingDialog(row) {
-      this.projectid = row.项目流水号
-      this.timetime = row.合同签订日期
-      this.changeTime()
-      this.addForm('form')
-      this.title = '增加开票记录'
-      this.dialogFormVisible1 = true
+    openAddInvoiceRecordingDialog() {
+      if (this.row1.项目流水号 === undefined) {
+        this.$message.error('请先选择合同')
+      } else {
+        console.log(this.row1)
+        this.projectid = this.row1.项目流水号
+        this.timetime = this.row1.合同签订日期
+        this.changeTime()
+        this.addForm('form')
+        this.title = '增加开票记录'
+        this.dialogFormVisible1 = true
+        this.form.客户名称 = this.row1.客户名称
+        this.CustomerCode = this.row1.客户流水号
+      }
     },
     // 打开选择
     CustomerChange() {