diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js
index 7d900b77..6bd7ba98 100644
--- a/src/api/Inventory/InboundCard.js
+++ b/src/api/Inventory/InboundCard.js
@@ -80,7 +80,18 @@ export function addInboundCard(data1, data2, data3, data4, data5, data6, data7,
     }
   })
 }
-
+// 入库单删除
+export function deleteInboundCard(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_采购入库单_入库单删除',
+      param: '采购入库单流水号=' + data1
+    }
+  })
+}
 // 入库单修改
 export function editInboundCard(data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
   return request({
diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js
index de237229..c37abee8 100644
--- a/src/api/Inventory/OfflinePurchase.js
+++ b/src/api/Inventory/OfflinePurchase.js
@@ -20,7 +20,7 @@ export function addRequestCard(peoplenumber, housenumber) {
     method: 'post',
     data: {
       type: '2',
-      name: 'dbo.库存管理_离线请购单_请购单增加',
+      name: '库存管理_离线请购单_请购单增加',
       param: '请购人编号=' + peoplenumber + '&仓库流水号=' + housenumber
     }
   })
diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index fed72d7e..170cfc0e 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -73,14 +73,14 @@ export function WorkShopPart(data1, data2, data3, data4, data5) {
   })
 }
 // 车间采购件零件出库
-export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8) {
+export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '零件出库_零件出库_异常出库',
-      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&工艺计划流水号=' + data5 + '&货位流水号=' + data6 + '&异常数量=' + data7 + '&异常原因=' + data8
+      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&名称=' + data4 + '&人员编号=' + data5 + '&采购合同明细流水号=' + data6 + '&请购单明细流水号=' + data7 + '&工艺计划流水号=' + data8 + '&货位流水号=' + data9 + '&异常数量=' + data10 + '&异常原因=' + data11 + '&零件类型=' + data12
     }
   })
 }
diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
new file mode 100644
index 00000000..55e5258e
--- /dev/null
+++ b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
@@ -0,0 +1,133 @@
+import request from '@/utils/request'
+
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询'
+    }
+  })
+}
+export function selectProvince() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_省份查询'
+    }
+  })
+}
+export function SelectMarketingManager(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '客户关系管理系统_按地区查询_营销经理',
+      param: '省份流水号=' + code
+    }
+  })
+}
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+  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',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function selectMachine(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据_通过项目流水号',
+      param: '项目流水号=' + code
+    }
+  })
+}
+export function searchTableDataInvoiceRecord(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_开票记录_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableContractCapitalManagement(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同资金管理_资金信息_查询',
+      param: '合同ID=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableSafetyMargin(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '安全保证金管理_安全保证金信息查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableBidBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '营销综合查询_投标保证金_按项目查',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function typeOfPerformanceBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_履约保证金类型_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableDataPerformanceBond(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_履约保证金_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
+export function searchTableDataDeliveryManagement(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '营销综合查询_发货单_按项目查',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
diff --git a/src/icons/svg/ComprehensiveInquiryMS.svg b/src/icons/svg/ComprehensiveInquiryMS.svg
new file mode 100644
index 00000000..833243e5
--- /dev/null
+++ b/src/icons/svg/ComprehensiveInquiryMS.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Svg Vector Icons : http://www.sfont.cn -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
+<g><path d="M500,9.7C229.4,9.7,10,229.2,10,500c0,270.8,219.4,490.3,490,490.3c270.6,0,490-219.5,490-490.3C990,229.2,770.6,9.7,500,9.7z M499.9,925C265.3,925,75.2,734.7,75.2,500c0-234.7,190.2-425.1,424.8-425.1c234.6,0,424.8,190.3,424.8,425.1C924.7,734.7,734.5,925,499.9,925z"/><path d="M702.9,642.2L600.4,533.4c15-25.9,23.8-55.9,23.8-88c0-97.1-78.7-175.7-175.8-175.7c-97.1,0-175.8,78.7-175.8,175.7c0,97.1,78.7,175.8,175.8,175.8c36.2,0,69.9-11,97.9-29.8l100.5,106.7c15.4,15.5,40.5,15.5,56,0C718.3,682.7,718.3,657.6,702.9,642.2z M448.4,552.4c-59.1,0-107-47.9-107-107c0-59.1,47.9-107,107-107c59.1,0,107,47.9,107,107C555.5,504.5,507.6,552.4,448.4,552.4z"/></g>
+</svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 3831fa72..36e6a610 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,10 @@ import time from 'time-formater'
 import htmlToPdf from '@/vendor/htmlToPdf'
 import Viewer from 'v-viewer'
 import 'viewerjs/dist/viewer.css'
+
+Vue.use(curd)
+Vue.use(htmlToPdf)
+Vue.use(ElementUI)
 Vue.use(curd)
 Vue.use(htmlToPdf)
 Vue.use(ElementUI)
diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue
index 33df0fd7..f2a68644 100644
--- a/src/views/Inventory/DirectPart/index.vue
+++ b/src/views/Inventory/DirectPart/index.vue
@@ -109,14 +109,14 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" min-width="80">
+        <el-table-column label="机床图号" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
+            {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组件名称" align="center" min-width="80">
+        <el-table-column label="组号" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.组件名称 }}
+            {{ scope.row.组号 }}
           </template>
         </el-table-column>
         <el-table-column label="采购合同" align="center" min-width="80">
@@ -124,9 +124,9 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="80">
+        <el-table-column label="名称" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.名称 }}
           </template>
         </el-table-column>
         <el-table-column label="到货数量" align="center" min-width="80">
@@ -154,7 +154,7 @@
           <el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
-          <el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+          <el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
             <el-option
               v-for="item in People"
               :key="item.value"
@@ -178,7 +178,7 @@
           <el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
-          <el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+          <el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
             <el-option
               v-for="item in People"
               :key="item.value"
@@ -242,12 +242,15 @@ export default {
       PageCurrent: 1,
       PageSize: 10,
       total: null,
-      projectName: '',
-      machineName: '',
-      teamName: '',
-      materialName: '',
-      contractNumber: '',
-      directPartNumber: ''
+      projectNumber: '', // 项目流水号
+      machineNumber: '', // 机床流水号
+      teamNumber: '', // 组件流水号
+      materialName: '', // 物料名称
+      materialtype: '', // 物料型号
+      materialMode: '', // 物料规格
+      partPicture: '', // 零件图号
+      directPartNumber: '',
+      teamBasicPart: ''
     }
   },
   computed: {
@@ -299,11 +302,13 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.People.push({
             label: response.data[i].姓名,
-            value: parseInt(response.data[i].考勤编号)
+            value: Number(response.data[i].人员编号)
           })
         }
         console.log(this.People)
       })
+      console.log(this.token, 88)
+      console.log(this.People, 99)
     },
     searchContractData() { // 查询合同
       this.Contract = []
@@ -346,17 +351,21 @@ export default {
     },
     // 打开直达件表单
     addDirect(row) {
+      console.log(row)
       this.PeopleValue = ''
       this.form = {}
       this.dialogFormVisible = true
       this.materialNum = row.物料流水号
       this.purchaseContractNumber = row.采购合同明细流水号
       this.teamPart = row.组件零件流水号
-      this.projectName = row.项目名称
-      this.machineName = row.机床名称
-      this.teamName = row.组件名称
+      this.teamBasicPart = row.组件零件基本件流水号
+      this.projectNumber = row.项目流水号
+      this.machineNumber = row.机床流水号
+      this.teamNumber = row.组件流水号
       this.materialName = row.物料名称
-      this.contractNumber = row.采购合同编号
+      this.materialtype = row.物料型号
+      this.materialMode = row.物料规格
+      this.partPicture = row.零件图号
     },
     // 打开直达件编辑表单
     changeDirect(row) {
@@ -407,8 +416,7 @@ export default {
     },
     // 增加直达件
     addDirectPartm() {
-      console.log(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.form.DirectNote)
-      addDirectPart(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.projectName, this.machineName, this.teamName, this.materialName, this.contractNumber, this.form.DirectNote).then(response => {
+      addDirectPart(this.form.DirectNumber, this.purchaseContractNumber, this.PeopleNumber, this.form.getPeople, this.form.DirectNumber, this.teamPart, this.teamBasicPart, this.projectNumber, this.machineNumber, this.teamNumber, this.materialName, this.form.DirectNote, this.materialtype, this.materialMode, this.partPicture).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
             title: '成功',
diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue
index 8067448c..8c4febc9 100644
--- a/src/views/Inventory/InboundCard/index.vue
+++ b/src/views/Inventory/InboundCard/index.vue
@@ -169,8 +169,9 @@
       <el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" />
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchInboundCard1()">查询</el-button>
       <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addCard()">创建</el-button>
-      <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
-      <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="downLoadCjn()">导出</el-button>
+      <el-button size="small" type="primary" icon="el-icon-arrow-down" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
+    </el-card>
+    <el-card>
       <el-table
         v-loading="listLoading3"
         :data="tableData3"
@@ -214,7 +215,7 @@
             {{ scope.row.到货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="业务号" align="center" min-width="50">
+        <el-table-column label="业务号" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.业务号 }}
           </template>
@@ -229,17 +230,17 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="业务类型" align="center" min-width="130">
+        <el-table-column label="业务类型" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.业务类型 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购类型" align="center" min-width="50">
+        <el-table-column label="采购类型" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.采购类型 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库类别" align="center" min-width="50">
+        <el-table-column label="入库类别" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.入库类别 }}
           </template>
@@ -251,9 +252,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="300px">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">编辑</el-button>
-            <el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
-            <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
+            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="editInboundCardInfor(scope.row)">编辑</el-button>
+            <el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropCard(scope.row)">删除</el-button>
+            <el-button size="small" type="warning" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -432,123 +433,197 @@
         <el-button type="primary" size="small" @click="printCard">打印</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
-        <el-form-item label="合同名称" prop="合同名称">
-          <el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
-            <el-option
-              v-for="item in Contract"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="仓库名称" prop="仓库名称">
-          <el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
-            <el-option
-              v-for="item in Inventory"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="入库日期" prop="入库日期">
-          <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="到货单号" prop="到货单号">
-          <el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务号" prop="业务号">
-          <el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务员" prop="业务员">
-          <el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
-            <el-option
-              v-for="item in People"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="到货日期">
-          <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="业务类型" prop="业务类型">
-          <el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="采购类型" prop="采购类型">
-          <el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="备注" prop="备注">
-          <el-input v-model="form.note" placeholder="备注" size="small" clearable/>
-        </el-form-item>
+    <el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="contract">
+              <el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
+                <el-option
+                  v-for="item in Contract"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="house">
+              <el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
+                <el-option
+                  v-for="item in Inventory"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库日期" prop="inboundDay">
+              <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货单号" prop="到货单号">
+              <el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="业务号" prop="业务号">
+              <el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员" prop="业务员">
+              <el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
+                <el-option
+                  v-for="item in People"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="到货日期" prop="到货日期">
+              <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务类型" prop="业务类型">
+              <el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="采购类型" prop="采购类型">
+              <el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库类别" prop="入库类别">
+              <el-input v-model="form.inboundType" placeholder="入库类别" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
-        <el-button type="primary" size="small" @click="submitCard">确定</el-button>
+        <el-button size="small" @click="dialogVisible1=false">取消</el-button>
+        <el-button type="primary" size="small" @click="submitCard('form')">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
-        <el-form-item label="合同名称" prop="合同名称">
-          <el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
-            <el-option
-              v-for="item in Contract"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="仓库名称" prop="仓库名称">
-          <el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
-            <el-option
-              v-for="item in Inventory"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="入库日期" prop="入库日期">
-          <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="到货单号" prop="到货单号">
-          <el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务号" prop="业务号">
-          <el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务员" prop="业务员">
-          <el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
-            <el-option
-              v-for="item in People"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="到货日期">
-          <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="业务类型" prop="业务类型">
-          <el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="采购类型" prop="采购类型">
-          <el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="备注" prop="备注">
-          <el-input v-model="form.note" placeholder="备注" size="small" clearable/>
-        </el-form-item>
+    <el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="contract">
+              <el-select v-model="form.contract" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
+                <el-option
+                  v-for="item in Contract"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="house">
+              <el-select v-model="form.house" filterable clearable size="small" placeholder="仓库" style="width: 200px">
+                <el-option
+                  v-for="item in Inventory"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库日期" prop="inboundDay">
+              <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货单号" prop="到货单号">
+              <el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="业务号" prop="业务号">
+              <el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员" prop="业务员">
+              <el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
+                <el-option
+                  v-for="item in People"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="到货日期" prop="到货日期">
+              <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务类型" prop="业务类型">
+              <el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="采购类型" prop="采购类型">
+              <el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库类型" prop="入库类型">
+              <el-input v-model="form.inboundType" placeholder="入库类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2=false">取消</el-button>
-        <el-button type="primary" size="small" @click="editCard">确定</el-button>
+        <el-button type="primary" size="small" @click="submitInboundCardInfor('form')">确定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract, editInboundCard } from '@/api/Inventory/InboundCard'
+import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract, editInboundCard, deleteInboundCard } from '@/api/Inventory/InboundCard'
 import { mapGetters } from 'vuex'
 import $ from 'jquery'
 
@@ -568,6 +643,7 @@ export default {
       listLoading2: '',
       tableData2: [],
       listLoading3: '',
+      CardNumber: '', // 采购入库单流水号
       inboundCardNumber: '',
       inboundCardNumber_check: '',
       tableData3: [],
@@ -592,14 +668,7 @@ export default {
       rules: { // 表单验证规则
         contract: [{ required: true, message: '请选择合同', trigger: 'blur' }],
         house: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
-        inboundDay: [{ required: true, message: '请输入入库日期', trigger: 'blur' }],
-        arrive: [{ required: true, message: '请输入到货单号', trigger: 'blur' }],
-        affair: [{ required: true, message: '请输入业务号', trigger: 'blur' }],
-        affairPeople: [{ required: true, message: '请选择业务员', trigger: 'blur' }],
-        affirType: [{ required: true, message: '请输入入库日期', trigger: 'blur' }],
-        purchaseType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
-        inboundType: [{ required: true, message: '请输入入库类别', trigger: 'blur' }],
-        note: [{ required: true, message: '请输入备注', trigger: 'blur' }]
+        inboundDay: [{ required: true, message: '请输入入库日期', trigger: 'blur' }]
       },
       nameGroup: [],
       modelGroup: [],
@@ -644,7 +713,7 @@ export default {
         }
       })
       // 查询车间合同
-      searchContract().then(response => {
+      searchShopContract().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.ShopContract.push({
             label: response.data[i].采购合同编号,
@@ -652,7 +721,6 @@ export default {
           })
         }
       })
-      searchShopContract
       searchAffairPeople(this.token).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.People.push({
@@ -677,7 +745,7 @@ export default {
       this.listLoading = true
       searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].组件零件流水号 !== 0) {
+          if (response.data[i].组件零件流水号 === 0) {
             response.data[i].物料名称 = response.data[i].零件名称
           }
         }
@@ -711,8 +779,9 @@ export default {
     addCard() {
       this.dialogVisible1 = true
     },
-    submitCard() { // 提交设置
-      this.$refs['form'].validate((valid) => {
+    // 增加入库单
+    submitCard(formName) {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
             if (response.data[0].result === '1') {
@@ -770,6 +839,36 @@ export default {
         }
       })
     },
+    // 修改入库单
+    editInboundCardInfor(row) {
+      this.DetailNumber = row.采购入库单流水号
+      this.dialogVisible2 = true
+      this.form.contract = row.合同流水号
+      this.form.house = row.仓库流水号
+      this.form.inboundDay = row.入库日期
+      this.form.arrive = row.到货单号
+      this.form.affair = row.业务号
+      this.form.affairPeople = row.业务员
+      this.form.arriveDay = row.到货日期
+      this.form.affirType = row.业务类型
+      this.form.purchaseType = row.采购类型
+      this.form.inboundType = row.入库类别
+      this.form.note = row.备注
+    },
+    submitInboundCardInfor(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('修改成功')
+              this.dialogVisible2 = false
+            } else {
+              this.$message.error('修改失败')
+            }
+          })
+        }
+      })
+    },
     // 查询采购入库单明细
     searchDetail(row) {
       this.DetailNumber = row.采购入库单流水号
@@ -781,6 +880,29 @@ export default {
         this.tableData4 = data
       })
     },
+    // 删除领料单
+    dropCard(row) {
+      this.CardNumber = row.采购入库单流水号
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteInboundCard(this.CardNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchInboundCard1()
+          } else {
+            this.$message.error('数据占用')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     // 删除领料单明细
     dropCarddetail(row) {
       this.CardDetailNumber = row.采购入库单明细流水号
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index a0757d1d..a1fad173 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -535,7 +535,6 @@ export default {
     },
     // 执行修改货位
     LocateEdit() {
-      console.log(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量)
       alterLocate(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量).then(response => {
         this.dialogFormVisible2 = false
         if (response.data[0].result === '1') {
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 0dd2b790..7e062217 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -7,7 +7,9 @@
         size="mini"
         border
         style="width: 100%;"
-        height="200">
+        height="200"
+        @row-click = "searchoutRecord"
+      >
         <el-table-column
           label="序号"
           align="center"
@@ -41,7 +43,6 @@
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
             <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="parOut(scope.row)">出库</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchoutRecord(scope.row)">选择</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index 87854b2b..43ad22ca 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -42,7 +42,7 @@
             <el-tag v-else type="success" size="small">充足</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" min-width="200" align="center">
+        <el-table-column label="物料名称" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
@@ -57,7 +57,7 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供货商" min-width="200" align="center">
+        <el-table-column label="供货商" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
           </template>
@@ -162,6 +162,7 @@
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportCard(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -198,6 +199,16 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
+        <el-table-column label="物料品种" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.物料品种 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料类别" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.物料类别 }}
+          </template>
+        </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
             <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
@@ -210,12 +221,69 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
+      <el-card>
+        <div id="print">
+          <div style="text-align: center">
+            <h2>离 线 请 购 单</h2>
+            <hr>
+            <table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
+              <colgroup>
+                <col style="width: 73px">
+                <col style="width: 78px">
+                <col style="width: 84px">
+                <col style="width: 88px">
+                <col style="width: 94px">
+                <col style="width: 80px">
+              </colgroup>
+              <tr>
+                <td class="tg-s268">请购单号:</td>
+                <td class="tg-0lax" style=" text-align: left">{{ inbondCard[0] }}</td>
+                <td class="tg-0lax">请购人:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[1] }}</td>
+              </tr>
+              <tr>
+                <td class="tg-0lax">仓库名称:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[2] }}</td>
+                <td class="tg-0lax">请购时间:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[3] }}</td>
+              </tr>
+            </table>
+            <div style="margin-top: 10px">
+              <table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
+                <tr>
+                  <th class="tg-c3ow">物料名称</th>
+                  <th class="tg-c3ow">物料规格</th>
+                  <th class="tg-c3ow">物料型号</th>
+                  <th class="tg-c3ow">物料品种</th>
+                  <th class="tg-c3ow">物料类别</th>
+                  <th class="tg-c3ow">数量</th>
+                </tr>
+                <tr v-for="(list, index) in tableData3" :key="index">
+                  <td class="tg-c3ow">{{ list.物料名称 }}</td>
+                  <td class="tg-c3ow">{{ list.物料规格 }}</td>
+                  <td class="tg-c3ow">{{ list.物料型号 }}</td>
+                  <td class="tg-c3ow">{{ list.物料品种 }}</td>
+                  <td class="tg-c3ow">{{ list.物料类别 }}</td>
+                  <td class="tg-c3ow">{{ list.数量 }}</td>
+                </tr>
+              </table>
+            </div>
+          </div>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
+        <el-button type="primary" size="small" @click="printCard">打印</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail, deleteRequest, deleteRequestDetail, alterNumber, setSafeValue } from '@/api/Inventory/OfflinePurchase'
 import { mapGetters } from 'vuex'
+import $ from 'jquery'
 
 export default {
   data() {
@@ -285,7 +353,9 @@ export default {
       disable4: true,
       disable: false, // 其他的禁用
       House: [],
-      HouseNumber: ''
+      HouseNumber: '',
+      dialogVisibleExport: false, // 导出表单
+      inbondCard: [] // 导出表格表头
     }
   },
   computed: {
@@ -348,6 +418,14 @@ export default {
         this.total1 = response.data.total
       })
     },
+    handleSizeChange1(val) { // 离线请购单列表分页
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) { // 离线请购单列表分页
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
     handleSizeChange2(val) { // 离线请购单列表分页
       this.pageSize2 = val
       this.searchTable2()
@@ -455,6 +533,27 @@ export default {
         }
       })
     },
+    exportCard(row) {
+      this.dialogVisibleExport = true
+      this.inbondCard[0] = row.请购单编号
+      this.inbondCard[1] = row.姓名
+      this.inbondCard[2] = row.仓库名称
+      this.inbondCard[3] = row.请购时间.split(' ')[0]
+      SeeDetail(this.purchasecardnumber).then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    // 打印请购单
+    printCard() {
+      const htmlNode = $('#print').html() // #print为需要打印的dom节点id
+      const body = $('body')
+      body.children().hide()
+      const printNode = $(htmlNode)
+      body.append(printNode)
+      window.print()
+      body.children().show()
+      printNode.remove()
+    },
     // 传递请购单
     doneRequestCard() {
       this.$confirm('确定传递请购单?', '提示', {
@@ -518,4 +617,8 @@ export default {
     right: 15px;
     top: 5px;
   }
+  .tg  {border-collapse:collapse;border-spacing:0;}
+  .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
 </style>
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 40b6bceb..9e346b64 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -10,7 +10,8 @@
         border
         size="mini"
         style="width: 100%;"
-        height="300">
+        height="300"
+        @row-click = "chooseListinfor">
         <el-table-column
           label="序号"
           align="center"
@@ -31,11 +32,6 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="200px">
-          <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <el-table
         v-loading="listLoading1"
@@ -100,9 +96,6 @@
     <!--异常出库对话框-->
     <el-dialog :visible.sync="dialogFormVisible" title="异常出库" center width="380px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left">
-        <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
-          <el-input v-model="form.ErrorNumber" size="small" placeholder="出库数量" style="width: 200px"/>
-        </el-form-item>
         <el-form-item label="异常数量" prop="ContractNumberValue" label-width="100px" size="small">
           <el-input v-model="form.ErrorNumber" size="small" placeholder="异常数量" style="width: 200px"/>
         </el-form-item>
@@ -167,9 +160,12 @@ export default {
       projectnumber: '',
       machinenumber: '',
       teamnumber: '',
-      teanmpartnumber: '',
-      craftnumber: '',
-      locatenumber: ''
+      purchaseDeatileNumber: '', // 采购合同明细流水号
+      askPurchaseNumber: '', // 请购单明细流水号
+      craftnumber: '', // 工艺计划流水号
+      partType: '', // 零件类型
+      locatenumber: '',
+      partName: '' // 名称
     }
   },
   computed: {
@@ -184,7 +180,6 @@ export default {
     // 获取人员编号
     getpeopleid() {
       this.picikingPeople = this.id
-      console.log(this.picikingPeople)
     },
     // 查询领料单
     searchListinfor() {
@@ -249,20 +244,24 @@ export default {
       }
     },
     ErrorpartOut(row) {
+      console.log(row, 1111)
       this.dialogFormVisible = true
       this.projectnumber = row.项目流水号
       this.machinenumber = row.机床流水号
       this.teamnumber = row.组件流水号
-      this.teanmpartnumber = row.采购合同明细流水号
+      this.purchaseDeatileNumber = row.采购合同明细流水号
+      this.askPurchaseNumber = row.请购单明细流水号
       this.craftnumber = row.工艺计划流水号
       this.locatenumber = row.货位流水号
+      this.partType = row.零件类型
+      this.partName = row.名称
     },
     callOff(form) {
       this.form = []
       this.dialogFormVisible = false
     },
     submitEdit() {
-      ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.teanmpartnumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason).then(response => {
+      ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.partName, this.picikingPeople, this.purchaseDeatileNumber, this.askPurchaseNumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason, this.partType).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
           this.dialogFormVisible = false
diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue
index 58f43481..644294ba 100644
--- a/src/views/Inventory/PartsReplacement/index.vue
+++ b/src/views/Inventory/PartsReplacement/index.vue
@@ -77,6 +77,7 @@
         </el-table-column>
         <el-table-column label="修改原因" min-width="100" align="center">
           <template slot-scope="scope">
+
             {{ scope.row.修改原因 }}
           </template>
         </el-table-column>
@@ -87,7 +88,7 @@
         </el-table-column>
         <el-table-column label="修改日期" min-width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.修改日期 }}
+            {{ scope.row.修改日期 ? scope.row.修改日期.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="仓库" min-width="100" align="center">
@@ -160,7 +161,7 @@
         </el-table-column>
         <el-table-column label="记录时间" min-width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.记录时间 }}
+            {{ scope.row.记录时间 ? scope.row.记录时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="零件类型" min-width="100" align="center">
@@ -225,7 +226,7 @@
         </el-table-column>
         <el-table-column label="补投时间" align="center" min-width="250">
           <template slot-scope="scope">
-            {{ scope.row.补投时间 }}
+            {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center" min-width="250">
@@ -236,7 +237,7 @@
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">导出</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -299,12 +300,77 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
+      <el-card>
+        <div id="print">
+          <div style="text-align: center">
+            <h2>仓 库 补 投 单</h2>
+            <hr>
+            <table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
+              <colgroup>
+                <col style="width: 120px">
+                <col style="width: 250px">
+                <col style="width: 110px">
+                <col style="width: 100px">
+                <col style="width: 120px">
+                <col style="width: 120px">
+              </colgroup>
+              <tr>
+                <td class="tg-s268">补投单编号:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[0] }}</td>
+                <td class="tg-0lax">姓名:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[1] }}</td>
+              </tr>
+              <tr>
+                <td class="tg-0lax">补投时间:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[2] }}</td>
+                <td class="tg-0lax">仓库名称:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[3] }}</td>
+              </tr>
+            </table>
+          </div>
+          <div style="margin-top: 10px">
+            <table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
+              <colgroup>
+                <col style="width: 74px">
+                <col style="width: 78px">
+                <col style="width: 84px">
+                <col style="width: 88px">
+                <col style="width: 94px">
+                <col style="width: 80px">
+              </colgroup>
+              <tr>
+                <th class="tg-c3ow">项目名称</th>
+                <th class="tg-c3ow">机床图号</th>
+                <th class="tg-c3ow">组号</th>
+                <th class="tg-c3ow">名称</th>
+                <th class="tg-c3ow">数量</th>
+                <th class="tg-c3ow">类型</th>
+              </tr>
+              <tr v-for="(list, index) in tableData4" :key="index">
+                <td class="tg-c3ow">{{ list.项目名称 }}</td>
+                <td class="tg-c3ow">{{ list.机床图号 }}</td>
+                <td class="tg-c3ow">{{ list.组号 }}</td>
+                <td class="tg-c3ow">{{ list.名称 }}</td>
+                <td class="tg-c3ow">{{ list.数量 }}</td>
+                <td class="tg-c3ow">{{ list.类型名称 }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
+        <el-button type="primary" size="small" @click="printCard">打印</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard, initWarehouse, addCardDetail, searchCardDetail, deleteReplacementCard, deleteCardDetail } from '@/api/Inventory/PartsReplacement'
 import { mapGetters } from 'vuex'
+import $ from 'jquery'
 export default {
   data() {
     return {
@@ -350,7 +416,9 @@ export default {
       locateGroup: [],
       partType: [],
       reasonGroup: [],
-      cardNumber: ''
+      cardNumber: '',
+      inbondCard: [], // 补投单
+      dialogVisibleExport: false // 导出表单
     }
   },
   computed: {
@@ -470,10 +538,8 @@ export default {
       } else {
         this.GroupNumValue_check = 1
       }
-      searchAlterRecord(this.pageCurrent, this.pageSize, this.rojectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+      searchAlterRecord(this.pageCurrent, this.pageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
         this.tableData1 = response.data.rows
-        console.log(response.data)
-        console.log(this.tableData1)
         this.total = response.data.total
         this.loading = false
       })
@@ -638,11 +704,36 @@ export default {
           message: '已取消删除'
         })
       })
+    },
+    doneRequestCard(row) {
+      this.dialogVisibleExport = true
+      this.cardNumber = row.补投单流水号
+      this.inbondCard[0] = row.补投单编号
+      this.inbondCard[1] = row.姓名
+      this.inbondCard[2] = row.补投时间.split(' ')[0]
+      this.inbondCard[3] = row.仓库名称
+      searchCardDetail(this.cardNumber).then(response => {
+        this.tableData4 = response.data
+      })
+    },
+    // 打印请购单
+    printCard() {
+      const htmlNode = $('#print').html() // #print为需要打印的dom节点id
+      const body = $('body')
+      body.children().hide()
+      const printNode = $(htmlNode)
+      body.append(printNode)
+      window.print()
+      body.children().show()
+      printNode.remove()
     }
   }
 }
 </script>
 
 <style scoped>
-
+  .tg  {border-collapse:collapse;border-spacing:0;}
+  .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
 </style>
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 14118acd..0aee6caf 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -14,7 +14,7 @@
         style="width: 100%;"
         size="mini"
         height="200"
-        @row-click = "searchListDetailt()">
+        @row-click = "chooseListinfor">
         <el-table-column
           label="序号"
           align="center"
@@ -37,7 +37,6 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200px">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
             <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -813,6 +812,7 @@ export default {
     // 选择领料单
     chooseListinfor(row) {
       this.pickingListNumberx = row.领料单流水号
+      this.searchListDetailt()
     },
     // 增加基本件领料单明细
     addBasicListDetailinfor(row) {
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 6b52fb71..9574c768 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -554,7 +554,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .green{
+  .lightgreen{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 8debe709..1981fda5 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -632,12 +632,13 @@ export default {
               } else {
                 this.$message.error('信息编辑失败')
               }
+            }).then(() => {
+              this.getTableData()
             })
           } else {
             this.$message.error('信息编辑失败')
           }
         })
-        this.getTableData()
       } else {
         handlechange3(this.Num, this.form.考勤编号).then(response => {
           if (response.data[0].result === '1') {
@@ -648,6 +649,8 @@ export default {
               } else {
                 this.$message.error('信息编辑失败')
               }
+            }).then(() => {
+              this.getTableData()
             })
           } else {
             this.$message.error('信息编辑失败')
@@ -724,7 +727,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .green{
+  .lightgreen{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index 2afd1167..35a3c0ac 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -4,7 +4,6 @@
 
     <el-card>
       <div>
-        <!--项目名称-->
         <span>项目名称:</span>
         <el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
           <el-option
@@ -13,7 +12,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--机床号-->
         <span style="margin-left: 15px">机床号:</span>
         <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:200px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
@@ -22,7 +20,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--组号-->
         <span style="margin-left: 15px">组号:</span>
         <el-select v-model="TeamValue" placeholder="请选择组号" style="width:200px" clearable size="small">
           <el-option
@@ -88,11 +85,11 @@
         <el-table-column
           align="center"
           prop="province7"
-          label="批次零件状态"
+          label="零件状态"
         >
           <template slot-scope="scope">
-            <div v-if="scope.row.批次零件状态 === '2'">停产</div>
-            <div v-else >正常生产</div>
+            <el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
+            <el-tag v-else type="success" size="small">生产</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -102,7 +99,7 @@
           width="100px"
         >
           <template slot-scope="scope" >
-            <el-button type="primary" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" size="small" @click="handleEdit(scope.row)">停产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -185,61 +182,6 @@
           @current-change="handleCurrentChange2"/>
       </div>
     </el-card>
-    <!--编辑对话框-->
-    <div style="text-align: left">
-      <el-dialog :visible.sync="dialogeditVisible" title="编辑" style="width: 800px;margin: auto" center >
-        <el-form ref="form" :model="form" label-position="left">
-          <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-            <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
-          </el-form-item>
-          <el-form-item label="批次零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
-            <el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
-              <el-radio-button label="正常生产"/>
-              <el-radio-button label="停止生产"/>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-            <el-date-picker
-              v-model="input3"
-              value-format="yyyy-MM-dd"
-              size="small"
-              type="date"
-              placeholder="选择日期"/>
-          </el-form-item>
-          <el-form-item label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-            <el-date-picker
-              v-model="input4"
-              value-format="yyyy-MM-dd"
-              size="small"
-              type="date"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-form>
-        <div style="margin-right: 60px;margin-top: 10px">
-          <el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
-          <el-button type="primary" @click="submit('form')">确定</el-button>
-        </div>
-      </el-dialog>
-    </div>
-
-    <el-dialog :visible.sync="dialogeditVisible1" title="停产记录" style="width: 800px;margin: auto" center>
-      <el-form ref="form2" :model="form2" label-position="left">
-        <el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-input v-model="form2.reason" auto-complete="off"/>
-        </el-form-item>
-        <el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-date-picker
-            v-model="form2.time"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="选择日期"/>
-        </el-form-item>
-      </el-form>
-      <div style="margin-left: 140px;margin-top: 10px">
-        <el-button type="primary" @click="submitRemark()">确定</el-button>
-      </div>
-    </el-dialog>
 
     <el-card>
       <div>停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
@@ -248,19 +190,19 @@
         <el-input v-model="inputA" auto-complete="off" style="width: 200px" size="small"/>
         <span>开始工序</span>
         <el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
-        <el-button :disabled="disabled" type="success" size="small" @click="editA">补投接着生产零件</el-button>
+        <el-button type="success" size="small" @click="editA">补投接着生产零件</el-button>
       </div>
-      <div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>
+      <!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
       <div style="margin-top: 20px; display: block">
         <span>补投重新加工零件数量</span>
         <el-input v-model="inputC" auto-complete="off" style="width: 200px" size="small" />
         <span>开始工序</span>
         <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
-        <el-button :disabled="disabledB" type="success" size="small" @click="editB">补投重新生产零件</el-button>
+        <el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
 
-    <el-card>
+    <el-card v-show="false">
       <el-table
         :data="tableData4"
         height="250"
@@ -295,11 +237,75 @@
       </el-table>
     </el-card>
 
+    <el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
+      <el-form ref="form" :model="form" label-position="left">
+        <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
+        </el-form-item>
+        <el-form-item label="停产原因" label-width="100px" prop="reason" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.reason" auto-complete="off" style="margin-left: 20px"/>
+        </el-form-item>
+        <el-form-item label="停产时间" label-width="120px" prop="time" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-date-picker
+            v-model="form2.time"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+        <el-form-item v-show="false" label="零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
+          <el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
+            <el-radio-button label="正常生产"/>
+            <el-radio-button label="停止生产"/>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="false" label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
+          <el-date-picker
+            v-model="input3"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+        <el-form-item v-show="false" label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
+          <el-date-picker
+            v-model="input4"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+      </el-form>
+      <div style="margin-right: 60px;margin-top: 10px">
+        <el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="submit('form')">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
+      <el-form ref="form2" :model="form2" label-position="left">
+        <el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.reason" auto-complete="off"/>
+        </el-form-item>
+        <el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-date-picker
+            v-model="form2.time"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+      </el-form>
+      <div style="margin-left: 140px;margin-top: 10px">
+        <el-button type="primary" @click="submitRemark()">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, TableData3Select, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
 export default {
   data() {
     return {
@@ -361,6 +367,7 @@ export default {
   },
   created() {
     this.fetchProjectNameData()
+    this.fetchTableData()
   },
   methods: {
     // 项目名称查询
@@ -453,7 +460,7 @@ export default {
       this.radio === '正常生产' ? this.temp = '1' : this.temp = '2'
       const Time = await editTime(this.code, this.input3, this.input4)
       const Char = await editchar(this.remark1, this.remark2, this.code)
-      const Stop = await editStop(this.code, this.temp)
+      const Stop = await editStop(this.code, 2)
       if (Time.data[0].result === '1' && Char.data[0].result === '1' && Stop.data[0].result === '1') {
         this.dialogeditVisible = false
         this.$message.success('信息更新成功')
@@ -481,10 +488,7 @@ export default {
         editA(this.CutCodeBefore, this.inputA, this.inputB).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('补投成功')
-            this.disabled = true
-            TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
-              this.tableData4 = response.data
-            })
+            this.fetchTableData()
           } else {
             this.$message.error('补投失败')
           }
@@ -496,10 +500,7 @@ export default {
         editA(this.CutCodeBefore, this.inputC, this.inputD).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('补投成功')
-            this.disabledB = true
-            TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
-              this.tableData4 = response.data
-            })
+            this.fetchTableData()
           } else {
             this.$message.error('补投失败')
           }
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 44fed53d..1729999d 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -550,7 +550,6 @@ export default {
       }
       this.tableData1Loading = true
       selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
-        console.log(response)
         this.tableData1Loading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
new file mode 100644
index 00000000..b191b77d
--- /dev/null
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -0,0 +1,938 @@
+<template>
+  <div>
+    <el-card>
+      <span>项目名称：</span>
+      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
+        <el-option
+          v-for="item in entryName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span style="margin-left: 10px">销售经理：</span>
+      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
+      <span style="margin-left: 10px">开始日期：</span>
+      <el-date-picker
+        v-model="startTime"
+        style="width: 200px;"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择开始日期"/>
+      <span style="margin-left: 10px">结束日期：</span>
+      <el-date-picker
+        v-model="endTime"
+        style="width: 200px;"
+        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 = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData1"
+        :row-key="getRowKeys"
+        :expand-row-keys="expands"
+        highlight-current-row
+        style="width: 100%"
+        height="300"
+        border
+        size="mini"
+        @row-click="fetchTableData"
+        @expand-change="selectMachine">
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <el-table :data="tableData2" border style="width: 350px; text-align: center" size="mini">
+              <el-table-column label="设备型号" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="设备名称" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.机床名称 }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同编号" width="150">
+          <template slot-scope="scope">
+            <template>
+              <el-tag slot="reference" type="small">{{ scope.row.合同编号 }}</el-tag>
+            </template>
+          </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="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.合同签订日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="图纸会签节点" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.图纸会签节点 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="设备预验收节点" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.设备预验收节点 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货节点" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.发货节点 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="安装调试节点" width="110">
+          <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="230">
+          <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="100">
+          <template slot-scope="scope">
+            {{ scope.row.电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同信息备注" width="142">
+          <template slot-scope="scope">
+            {{ scope.row.合同信息备注 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="PageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+    <!--营销经理选择-->
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
+      <span>责权省份</span>
+      <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
+        <el-option
+          v-for="item in Province"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <div style="margin-top: 15px">
+        <el-table :data="tableData3" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
+          <el-table-column label="销售经理" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.性别 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="offName">取消</el-button>
+        <el-button type="primary" @click="getName">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-card class="box-card">
+      <div class="block" style="border: 1px solid rgb(220, 223, 230)">
+        <el-carousel :autoplay="true" trigger="click" height="350px">
+          <el-carousel-item>
+            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToContractCapitalManagement">收款情况</el-button>
+            <el-table
+              v-loading="listLoadingContractCapitalManagement"
+              :data="tableDataContractCapitalManagement"
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              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.合同总金额 }}
+                </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">
+                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</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-left: 15px;margin-top: 15px" @click="goToInvoiceRecord">开票情况</el-button>
+            <el-table
+              v-loading="listLoadingInvoiceRecord"
+              :data="tableDataInvoiceRecord"
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              size="mini">
+              <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                width="50"/>
+              <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="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">
+                  {{ 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="备注">
+                <template slot-scope="scope">
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-carousel-item>
+          <el-carousel-item>
+            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
+            <el-table
+              v-loading="tableDataLoadingDeliveryManagement"
+              id="tb"
+              :data="tableDataDeliveryManagement"
+              highlight-current-row
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              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">
+                  {{ scope.row.运费 }}
+                </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-left: 15px;margin-top: 15px" @click="goToBidBond">投标保证金</el-button>
+            <el-table
+              v-loading="tableData1LoadingBidBond"
+              :data="tableDataBidBond"
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              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">{{ scope.row.保证金金额 }}</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="100">
+                <template slot-scope="scope">
+                  {{ scope.row.应收回金额 }}
+                </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">{{ scope.row.应收回金额 }}</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-left: 15px;margin-top: 15px" @click="goToPerformanceBond">履约保证金</el-button>
+            <el-table
+              v-loading="listLoadingPerformanceBond"
+              v-show="showPerformanceBond"
+              :data="tableDataPerformanceBond"
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              size="mini">
+              <el-table-column align="center" label="履约保证金金额">
+                <template slot-scope="scope">
+                  <el-tag type="primary" size="small">{{ scope.row.履约保证金金额 }}</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-left: 15px;margin-top: 15px" @click="goToSafetyMargin">安全保证金</el-button>
+            <el-table
+              v-loading="listLoadingSafetyMargin"
+              :data="tableDataSafetyMargin"
+              style="width: 99%;margin-left: 10px;margin-right: 10px"
+              height="300"
+              border
+              size="mini">
+              <el-table-column align="center" label="保证金金额" width="100">
+                <template slot-scope="scope">
+                  <el-tag type="primary" size="small">{{ scope.row.保证金金额 }}</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">
+                  {{ scope.row.扣款金额 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="应收回金额" align="center" width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.应收回金额 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="实际收回金额" align="center" width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : scope.row.应收回金额 }}
+                </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>
+
+<script>
+import request from '@/utils/request'
+import elInput from 'element-ui/packages/input'
+import { initProject, selectProvince, SelectMarketingManager, searchTable1, selectMachine, searchTableDataInvoiceRecord, searchTableContractCapitalManagement, searchTableSafetyMargin, searchTableBidBond, typeOfPerformanceBond, searchTableDataPerformanceBond, searchTableDataDeliveryManagement } from '@/api/MarketingCenter/ComprehensiveInquiryMS'
+export default {
+  components: {
+    elInput
+  },
+  data() {
+    return {
+      tableDataLoadingDeliveryManagement: false,
+      tableDataDeliveryManagement: [],
+      dialogVisible: false,
+      dialogImageUrl: '',
+      fileList: [],
+      performanceGuaranteeShow: false,
+      showPerformanceBond: false,
+      listLoadingPerformanceBond: false,
+      tableDataPerformanceBond: [],
+      tableDataContractCapitalManagement: [],
+      listLoadingContractCapitalManagement: false,
+      tableDataSafetyMargin: [],
+      listLoadingSafetyMargin: false,
+      tableData1LoadingBidBond: false,
+      tableDataBidBond: [],
+      entryNameValue: '',
+      entryName: [],
+      entryNameValue_check: null,
+      MarketingManagerValue: '',
+      peopleid_check: '',
+      startTime: '',
+      startTime_check: null,
+      endTime: '',
+      endTime_check: null,
+      param: '',
+      PageSize: 10,
+      PageCurrent: 1,
+      total: null,
+      dialogFormVisiblePeople: false,
+      Province: '',
+      ProvinceValue: '',
+      tableData3: [],
+      peopleid: '',
+      peoplename: '',
+      listLoading: false,
+      expands: [],
+      tableData1: [],
+      tableData2: [],
+      projectNum: '',
+      listLoadingInvoiceRecord: false,
+      tableDataInvoiceRecord: [],
+      a: 1,
+      b: 1,
+      url: ''
+    }
+  },
+  created() {
+    this.init()
+    this.fetchTableData1()
+  },
+  methods: {
+    init() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
+      this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
+    },
+    openName() {
+      this.dialogFormVisiblePeople = true
+      this.ProvinceValue = ''
+      this.tableData3 = []
+    },
+    changeProvince() {
+      SelectMarketingManager(this.ProvinceValue).then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    offName() {
+      this.dialogFormVisiblePeople = false
+      this.peopleid = ''
+      this.c = ''
+    },
+    getName() {
+      this.dialogFormVisiblePeople = false
+      this.MarketingManagerValue = this.peoplename
+    },
+    handleChange(row) {
+      this.peopleid = row.营销经理流水号
+      this.peoplename = row.姓名
+    },
+    fetchTableData1() {
+      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.listLoading = true
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
+      this.tableDataInvoiceRecord = []
+      this.tableDataContractCapitalManagement = []
+      this.tableDataSafetyMargin = []
+    },
+    getRowKeys(row) {
+      return row.项目流水号
+    },
+    selectMachine(row) {
+      if (this.a === 1) {
+        this.expands.push(row.项目流水号)
+        this.b = row.项目流水号
+        this.a = 0
+      } else {
+        if (this.b === row.项目流水号) {
+          this.expands = []
+          this.a = 1
+        } else {
+          this.expands = []
+          this.expands.push(row.项目流水号)
+          this.a = 0
+          this.b = row.项目流水号
+        }
+      }
+      selectMachine(row.项目流水号).then(response => {
+        this.tableData2 = response.data
+      })
+      this.projectNum = row.项目流水号
+    },
+    fetchTableData(row) {
+      this.projectNum = row.项目流水号
+      this.getFileList()
+      this.listLoadingInvoiceRecord = true
+      this.listLoadingContractCapitalManagement = true
+      this.listLoadingSafetyMargin = true
+      this.tableData1LoadingBidBond = true
+      this.listLoadingPerformanceBond = true
+      this.tableDataLoadingDeliveryManagement = true
+      searchTableDataInvoiceRecord(this.projectNum).then(response => {
+        this.listLoadingInvoiceRecord = false
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
+        }
+        this.tableDataInvoiceRecord = data
+      })
+      searchTableContractCapitalManagement(this.projectNum).then(response => {
+        this.listLoadingContractCapitalManagement = false
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          if (parseFloat(data[i].付款百分比) >= 99.9) {
+            data[i].付款百分比 = 100
+          }
+        }
+        this.tableDataContractCapitalManagement = data
+      })
+      searchTableSafetyMargin(this.projectNum).then(response => {
+        this.listLoadingSafetyMargin = false
+        this.tableDataSafetyMargin = response.data
+      })
+      searchTableBidBond(this.projectNum).then(response => {
+        this.tableData1LoadingBidBond = false
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].投标结果 = (data[i].投标结果).toString()
+          if (parseInt(data[i].投标结果) === 1) {
+            data[i].是否禁用已中标 = false
+            data[i].是否禁用未中标 = true
+          } else if (parseInt(data[i].投标结果) === 2) {
+            data[i].是否禁用已中标 = true
+            data[i].是否禁用未中标 = false
+          } else {
+            data[i].是否禁用已中标 = false
+            data[i].是否禁用未中标 = false
+          }
+        }
+        this.tableDataBidBond = data
+      })
+      typeOfPerformanceBond(this.projectNum).then(response => {
+        const data = response.data[0].履约保证金类型
+        return parseInt(data)
+      }).then(data => {
+        if (data === 1) {
+          this.performanceGuaranteeShow = false
+          this.showPerformanceBond = true
+          searchTableDataPerformanceBond(this.projectNum).then(response => {
+            this.listLoadingPerformanceBond = false
+            const data = response.data
+            for (let i = 0; i < data.length; i++) {
+              data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
+              data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
+              data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
+            }
+            this.tableDataPerformanceBond = data
+          })
+        } else {
+          this.performanceGuaranteeShow = true
+          this.showPerformanceBond = false
+        }
+      })
+      searchTableDataDeliveryManagement(this.projectNum).then(response => {
+        this.tableDataLoadingDeliveryManagement = false
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].发货日期 = data[i].发货日期.substring(0, data[i].发货日期.length - 9)
+          data[i].运输状态 === 0 ? data[i].运输状态 = '运输中' : data[i].运输状态 = '已签收'
+        }
+        this.tableDataDeliveryManagement = data
+      })
+    },
+    handleSizeChange(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.fetchTableData1()
+      this.tableDataInvoiceRecord = []
+      this.tableDataContractCapitalManagement = []
+      this.tableDataSafetyMargin = []
+    },
+    handleCurrentChange(val) {
+      this.PageCurrent = val
+      this.fetchTableData1()
+      this.tableDataInvoiceRecord = []
+      this.tableDataContractCapitalManagement = []
+      this.tableDataSafetyMargin = []
+    },
+    goToInvoiceRecord() {
+      this.$router.push({ path: '/InvoiceRecord/index' })
+    },
+    goToContractCapitalManagement() {
+      this.$router.push({ path: '/ContractCapitalManagement/index' })
+    },
+    goToSafetyMargin() {
+      this.$router.push({ path: '/SafetyMargin/index' })
+    },
+    goToBidBond() {
+      this.$router.push({ path: '/BidBond/index' })
+    },
+    goToPerformanceBond() {
+      this.$router.push({ path: '/PerformanceBond/index' })
+    },
+    goToInvoiceDeliveryManagement() {
+      this.$router.push({ path: '/DeliveryManagement/index' })
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    async getFileList() {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 合同信息管理_履约保证金_履约保函 where 是否启用 = 1 and 项目流水号 = ${this.projectNum}`
+        }
+      })
+      this.url = 'http://localhost:8411/webpage/img/' + data[0].文件标识
+    },
+    async handleRemove(file, fileList) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '4',
+          name: `update 合同信息管理_履约保证金_履约保函 set 是否启用 = 0 where 履约保函流水号 = ${file._id}`
+        }
+      })
+      if (data[0].result === '0') {
+        this.$message.error('上传失败')
+      }
+    },
+    beforeUpload(file) {
+      const isJPG = /^image\/.*/.test(file.type)
+      const isLt4M = file.size / 1024 / 1024 < 4
+      const isInvoiceNum = !!this.projectId
+
+      if (!isJPG) {
+        this.$message.error('只能上传图片。。')
+      }
+      if (!isLt4M) {
+        this.$message.error('上传图片大小不能超过 4MB!')
+      }
+
+      return isJPG && isLt4M && isInvoiceNum
+    },
+    onSuccess(res, file, fileList) {
+      fileList = []
+      if (res[0].result === '1') {
+        this.getFileList()
+      } else {
+        this.$message.error('上传失败')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-carousel__item h3 {
+    color: #475669;
+    font-size: 14px;
+    opacity: 0.75;
+    line-height: 150px;
+    margin: 0;
+  }
+
+  .el-carousel__item:nth-child(2n) {
+    background-color: white;
+  }
+
+  .el-carousel__item:nth-child(2n+1) {
+    background-color: white;
+  }
+</style>