diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index f56be492..c0c62822 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -26,39 +26,39 @@ export function searchMateriel(num) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询',
-      param: `供应商名称_check=${num}&供应商名称=${num1}`,
+      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 新增到货单
-export function addPurchaseOrder(num1, num2, num3, num4, num5, num6) {
+export function addPurchaseOrder(num5, num6, num7) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_新增到货单',
-      param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&供应商流水号=${num6}`
+      param: `备注=${num5}&供应商流水号=${num6}&日期=${num7}`
     }
   })
 }
 // 编辑采购单
-export function editPurchaseOrder(num1, num2, num3, num4, num5, num6, num7) {
+export function editPurchaseOrder(num5, num6, num7, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_编辑到货单',
-      param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}`
+      param: `备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}}&日期=${num8}`
     }
   })
 }
@@ -86,15 +86,71 @@ export function searchTable5(num) {
     }
   })
 }
-// 选入
+export function deleteArrivalMX(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_删除到货单明细',
+      param: `到货单明细流水号=${num}`
+    }
+  })
+}
+export function EditArrivalOrderMX(num, num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_编辑到货单明细',
+      param: `到货单明细流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}`
+    }
+  })
+}
+export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_新增到货单明细',
+      param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}`
+    }
+  })
+}
+// 取消关联
+export function deleteMateriel(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_取消到货单明细绑定',
+      param: `到货单明细绑定流水号=${num1}&采购计划明细流水号=${num2}`
+    }
+  })
+}
+// 关联材料
 export function addMateriel(num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '备料管理_到货单明细_选入',
-      param: `到货单流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}`
+      name: '备料管理_到货单明细关联',
+      param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}`
+    }
+  })
+}
+export function searchTable6(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_关联材料_查询数据',
+      param: `到货单明细流水号=${num1}`
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
index 633a338a..7f27d15c 100644
--- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 发票查询
-export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, supplierName0, check3, transmit, check4, recipient) {
+export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, supplierName0) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_发票_查询数据',
-      param: '发票号_check=' + check1 + '&发票号=' + num1 + '&供应商名称_check=' + check2 + '&供应商名称=' + supplierName0 + '&传送人_check=' + check3 + '&传送人=' + transmit + '&接收人_check=' + check4 + '&接收人=' + recipient,
+      param: '发票号_check=' + check1 + '&发票号=' + num1 + '&供应商名称_check=' + check2 + '&供应商名称=' + supplierName0,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -26,26 +26,26 @@ export function searchInvoiceDetail(num) {
   })
 }
 // 发票增加
-export function addInvoice(num1, time1, money, send, receive, remark, num3, num4) {
+export function addInvoice(time1, money, send, remark, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_发票_增加数据',
-      param: `采购计划流水号组=${num1}&开票时间=${time1}&开票金额=${money}&传送人=${send}&接收人=${receive}&备注=${remark}&供应商=${num3}&采购计划流水号字符串=${num4}`
+      param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}`
     }
   })
 }
 // 发票编辑
-export function editInvoice(num1, time1, money, send, receive, remark, num3) {
+export function editInvoice(num1, time1, money, send, remark, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_发票_编辑数据',
-      param: '发票流水号=' + num1 + '&供应商=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
+      param: `发票流水号=${num1}&开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}`
     }
   })
 }
@@ -61,6 +61,17 @@ export function deleteInvoice(num1) {
     }
   })
 }
+export function deleteInvoiceMX(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_发票明细_删除数据',
+      param: '发票明细流水号=' + num + '&到货单流水号=' + num1
+    }
+  })
+}
 // 初始化采购计划
 export function initPurchase() {
   return request({
@@ -120,3 +131,28 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
     }
   })
 }
+// 查询到货单
+export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_到货单查询',
+      param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 关联到货单
+export function addMateriel(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '备料管理_发票明细_增加数据',
+      param: `发票流水号=${num}&到货单流水号组=${num1}`
+    }
+  })
+}
diff --git a/src/assets/img/img16.png b/src/assets/img/img16.png
new file mode 100644
index 00000000..427e81dd
Binary files /dev/null and b/src/assets/img/img16.png differ
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index b24f58e7..b6ba61f3 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -1,21 +1,21 @@
 <template>
   <el-card>
     <div class="process">
-      <div style="position: relative;left:48px;top:375px; width: 100px;height: 28px;" >
+      <div :id="OPNAME137" :title="tooltip" style="position: relative;left:48px;top:375px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <!--<div :id="OPNAME137+fang" class="fang"/>-->
           <div :id="OPNAME137+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME137 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:48px;top:382px; width: 100px;height: 28px;">
+      <div :id="OPNAME138" :title="tooltip" style="position: relative;left:48px;top:382px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <!--<div :id="OPNAME138+fang" class="fang"/>-->
           <div :id="OPNAME138+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME138 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:48px;top:389px; width: 100px;height: 28px;">
+      <div :id="OPNAME139" :title="tooltip" style="position: relative;left:48px;top:389px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <!--<div :id="OPNAME139+fang" class="fang"/>-->
           <div :id="OPNAME139+circle" class="circle" style="margin-left: 11px;"/>
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 412eae92..0d8f492e 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -4491,7 +4491,7 @@ export default {
     width: 1680px;
     height: 400px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img15.png') repeat;
+    background: url('../../../assets/img/img16.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index e8843fd4..9b6ed9dc 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -370,10 +370,10 @@
     <el-card style="width: 1100px;margin: 10px auto">
       <div id="WGBLD" style="width: 1000px;margin: 0 auto">
         <table cellspacing="0px" align="center" border="1 solid black" width="100%">
-          <tr>
+          <tr style="height: 60px">
             <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
           </tr>
-          <tr>
+          <tr style="height: 40px">
             <th colspan="14"><h4>{{ 采购单名称 }}</h4></th>
           </tr>
           <tr style="height: 40px">
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 8532239a..5686aa67 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -2,60 +2,126 @@
   <div>
     <el-card>
       <div>
-        <span>采购单号:</span>
-        <el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
         <span style="margin-left: 10px">供应商:</span>
-        <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
-        <el-tooltip :open-delay="1200" effect="dark" content="查询采购单" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+        <el-input v-model="Name" placeholder="供应商" size="small" clearable/>
+        <span style="margin-left: 10px">时间段:</span>
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          type="daterange"
+          align="center"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          style="width:260px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
         </el-tooltip>
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入原材料</el-button>
+        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
       </div>
-      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="采购单号" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.采购单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购单名称" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.采购单名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
+    </el-card>
+    <el-card>
+      <h3>到货单</h3>
+      <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable5">
+        <el-table-column width="60" align="center" type="index" label="序号"/>
+        <el-table-column label="供应商" align="center" min-width="280">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="80">
+        <el-table-column label="到货日期" align="center" width="150">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="下单日期" align="center" width="100">
+        <el-table-column label="备注" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.下单日期.split(' ')[0] }}
+            {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划完成日期" align="center" width="100">
+        <el-table-column label="操作" align="center" width="150" fixed="right">
           <template slot-scope="scope">
-            {{ scope.row.计划完成日期.split(' ')[0] }}
+            <el-tooltip effect="dark" content="新增到货材料" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalOrder(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
-          :current-page="pageCurrent2"
+          :current-page="pageCurrent4"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
+          :page-size="pageSize4"
+          :total="total4"
           style="display:inline-block;width:50%"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
+          @size-change="handleSizeChange4"
+          @current-change="handleCurrentChange4"/>
       </div>
-      <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="200px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
+      <h3>到货单明细</h3>
+      <el-table v-loading="" :data="tableData5" border highlight-current-row stripe style="margin: 3px 0" height="200px" size="mini" @row-click="searchTable6">
+        <el-table-column width="60" align="center" type="index" label="序号"/>
+        <el-table-column label="材料" align="center" width="200">
+          <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-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-column label="金额" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-tooltip effect="dark" content="关联材料" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalMX(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalMX(scope.row)"/>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <h3>关联材料</h3>
+      <el-table v-loading="" :data="tableData6" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini">
         <el-table-column label="物料编码" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.物料零件编码 }}
@@ -86,89 +152,165 @@
             {{ scope.row.单位 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="备注">
-          <template slot-scope="scope">
-            {{ scope.row.备注1 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card>
-      <div>
-        <span style="margin-left: 10px">供应商:</span>
-        <el-input v-model="Name" placeholder="供应商" size="small" clearable/>
-        <el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
-        </el-tooltip>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增到货单</el-button>
-      </div>
-      <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable5">
-        <el-table-column label="材料" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.单位 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" min-width="250" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
-          </template>
-        </el-table-column>
-        <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="80">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="备注" align="center" >
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="创建日期" align="center" width="150">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            {{ scope.row.日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="150" fixed="right">
-          <template slot-scope="scope">
-            <el-tooltip effect="dark" content="编辑" placement="top">
+            <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
-                <el-button type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
-              </div>
-            </el-tooltip>
-            <el-tooltip effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
+                <el-button type="text" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
         </el-table-column>
+      </el-table>
+    </el-card>
 
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 200px" width="430px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="120px">
+        <el-row>
+          <el-form-item label="供应商" prop="supplierNameValue">
+            <el-select v-model="form.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
+              <el-option
+                v-for="item in supplierNames"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="创建日期" prop="invoiceTime">
+            <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="备注" prop="备注">
+            <el-input v-model="form.备注" size="small"/>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-show="title==='新增到货单'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitAddArrivalOrder">确定</el-button>
+        <el-button
+          v-show="title==='编辑到货单'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitEditArrivalOrder">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 200px" width="430px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="120px">
+        <el-row>
+          <el-form-item label="材料" prop="材料">
+            <el-input v-model="form1.材料" size="small"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="数量" prop="数量">
+            <el-input v-model="form1.数量" size="small"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="单位" prop="单位">
+            <el-input v-model="form1.单位" size="small"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="单价" prop="单价">
+            <el-input v-model="form1.单价" size="small"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="金额" prop="金额">
+            <el-input v-model="form1.金额" size="small"/>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-show="title1==='新增到货材料'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitAddArrivalOrderMX">确定</el-button>
+        <el-button
+          v-show="title1==='编辑到货材料'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitEditArrivalOrderMX">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联材料" center style="min-height: 200px" width="55%">
+      <div>
+        <span>采购单号:</span>
+        <el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
+        <span style="margin-left: 10px">供应商:</span>
+        <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
+        <el-tooltip :open-delay="1200" effect="dark" content="查询采购单" placement="top">
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+        </el-tooltip>
+      </div>
+      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
+        <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-column label="供应商" align="center" show-overflow-tooltip>
+          <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-column label="下单日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.下单日期.split(' ')[0] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="计划完成日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.计划完成日期.split(' ')[0] }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
-          :current-page="pageCurrent4"
+          :current-page="pageCurrent2"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize4"
-          :total="total4"
+          :page-size="pageSize2"
+          :total="total2"
           style="display:inline-block;width:50%"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange4"
-          @current-change="handleCurrentChange4"/>
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
       </div>
-      <el-table v-loading="" :data="tableData5" border highlight-current-row stripe style="margin: 3px 0" height="200px" size="mini">
-        <el-table-column label="物料编码" align="center" width="200">
+      <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="物料编码" align="center" width="150">
           <template slot-scope="scope">
-            {{ scope.row.物料编码 }}
+            {{ scope.row.物料零件编码 }}
           </template>
         </el-table-column>
         <el-table-column label="零件名称" align="center">
@@ -181,7 +323,7 @@
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center">
+        <el-table-column label="数量" align="center" width="50px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -191,90 +333,34 @@
             {{ scope.row.成品尺寸 }}
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" >
+        <el-table-column label="单位" align="center" >
           <template slot-scope="scope">
-            {{ scope.row.单价 }}
+            {{ scope.row.单位 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="备注">
+        <el-table-column label="备注" align="center" >
           <template slot-scope="scope">
             {{ scope.row.备注1 }}
           </template>
         </el-table-column>
       </el-table>
-    </el-card>
-
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 300px" width="750px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="材料" prop="材料">
-              <el-input v-model="form.材料" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位" prop="单位">
-              <el-input v-model="form.单位" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="数量" prop="数量">
-              <el-input v-model="form.数量" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="金额" prop="金额">
-              <el-input v-model="form.金额" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商" prop="supplierNameValue">
-              <el-select v-model="form.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
-                <el-option
-                  v-for="item in supplierNames"
-                  :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="备注">
-              <el-input v-model="form.备注" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          v-show="title==='创建到货单'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitAddPurchaseOrder">确定</el-button>
-        <el-button
-          v-show="title==='编辑到货单'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitEditPurchaseOrder">确定</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入原材料</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5, searchSupplier } from '@/api/WorkshopProcurement/NewArrivalList.js'
+import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5, searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6 } from '@/api/WorkshopProcurement/NewArrivalList.js'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
       purchasingOrder: '',
+      ArrivalOrderNumber: '',
+      ArrivalOrderMXNumber: '',
       supplierName0: '',
       arrest: [],
       check: 0,
@@ -284,6 +370,7 @@ export default {
       pageCurrent2: 1,
       pageSize2: 10,
       tableData3: [],
+      tableData6: [],
       采购计划流水号: '',
       tableData4: [],
       total4: 0,
@@ -291,23 +378,34 @@ export default {
       pageSize4: 10,
       tableData5: [],
       到货单流水号: '',
+      dateRange: '',
       form: {
-        材料: '',
-        单位: '',
-        数量: '',
-        金额: '',
         备注: '',
+        日期: '',
         supplierNameValue: ''
       },
+      form1: {
+        材料: '',
+        数量: '',
+        单位: '',
+        单价: '',
+        金额: ''
+      },
       supplierNames: [],
       dialogVisible: false,
+      dialogVisible1: false,
+      dialogVisible2: false,
       title: '',
-      rules: { // 采购表单验证规则
+      title1: '',
+      rules: {
+        supplierNameValue: [{ required: true, message: '请选择供应商' }],
+        日期: [{ required: true, message: '请选择日期' }]
+      },
+      rules1: {
         材料: [{ required: true, message: '请填写材料' }],
-        单位: [{ required: true, message: '请填写单位' }],
         数量: [{ required: true, message: '请填写数量' }],
-        金额: [{ required: true, message: '请填写金额' }],
-        supplierNameValue: [{ required: true, message: '请选择供应商' }]
+        单位: [{ required: true, message: '请填写单位' }],
+        单价: [{ required: true, message: '请填写单价' }]
       },
       工艺计划流水号组: [],
       采购计划明细流水号组: []
@@ -350,30 +448,29 @@ export default {
     },
     // 查询到货单
     searchTable4() {
+      console.log(this.dateRange)
       this.Name ? this.check = 1 : this.check = 0
-      searchArriveOrder(this.check, this.Name, this.pageCurrent4, this.pageSize4).then(response => {
+      this.dateRange ? this.check = 1 : (this.check = 0, this.dateRange = '')
+      searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
         this.tableData4 = response.data.rows
         this.total4 = response.data.total
       })
     },
     handleSizeChange4(val) { // 采购单列表分页
-      this.pageSize2 = val
-      this.searchTable2()
+      this.pageSize4 = val
+      this.pageCurrent4 = 1
+      this.searchTable4()
     },
     handleCurrentChange4(val) { // 采购单列表分页
-      this.pageCurrent2 = val
-      this.searchTable2()
+      this.pageCurrent4 = val
+      this.searchTable4()
     },
     // 创建采购单
-    addPurchaseOrder() {
+    addArrivalOrder() {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '创建到货单'
-      this.form.材料 = ''
-      this.form.单位 = ''
-      this.form.数量 = ''
-      this.form.金额 = ''
+      this.title = '新增到货单'
       this.form.备注 = ''
       this.form.supplierNameValue = ''
       this.dialogVisible = true
@@ -387,10 +484,10 @@ export default {
       })
     },
     // 新增
-    submitAddPurchaseOrder() {
+    submitAddArrivalOrder() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.form.supplierNameValue).then(response => {
+          addPurchaseOrder(this.form.备注, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建到货单成功')
               this.pageCurrent4 = 1
@@ -405,23 +502,20 @@ export default {
       })
     },
     // 编辑
-    editPurchaseOrder(row) {
+    editArrivalOrder(row) {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
       this.title = '编辑到货单'
-      this.form.材料 = row.材料
-      this.form.单位 = row.单位
-      this.form.数量 = row.数量
-      this.form.金额 = row.金额
       this.form.备注 = row.备注
+      this.form.日期 = row.日期
       this.form.supplierNameValue = row.供应商流水号
       this.dialogVisible = true
     },
-    submitEditPurchaseOrder() {
+    submitEditArrivalOrder() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          editPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.到货单流水号, this.form.supplierNameValue).then(response => {
+          editPurchaseOrder(this.form.备注, this.到货单流水号, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('修改到货单成功')
               this.searchTable4()
@@ -433,7 +527,7 @@ export default {
         }
       })
     },
-    deletePurchaseOrder(row) { // 删除采购单
+    deleteArrivalOrder(row) { // 删除采购单
       this.$confirm('确定删除该合同?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -458,15 +552,107 @@ export default {
         this.tableData5 = response.data
       })
     },
+    addArrivalOrderMX(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.title1 = '新增到货材料'
+      this.form1.材料 = ''
+      this.form1.数量 = ''
+      this.form1.单位 = ''
+      this.form1.单价 = ''
+      this.form1.金额 = ''
+      this.ArrivalOrderNumber = row.到货单流水号
+      this.dialogVisible1 = true
+    },
+    submitAddArrivalOrderMX() {
+      this.$refs['form1'].validate((valid) => {
+        if (valid) {
+          AddArrivalOrderMX(this.ArrivalOrderNumber, this.form1.材料, this.form1.数量, this.form1.单位, this.form1.单价, this.form1.金额).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('新增到货材料成功')
+              searchTable5(this.ArrivalOrderNumber).then(response => {
+                this.tableData5 = response.data
+              })
+              this.dialogVisible1 = false
+            } else { this.$message.error('新建到货单失败') }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    editArrivalMX(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.title1 = '编辑到货材料'
+      this.form1.材料 = row.材料
+      this.form1.数量 = row.数量
+      this.form1.单位 = row.单位
+      this.form1.单价 = row.单价
+      this.form1.金额 = row.金额
+      this.ArrivalOrderMXNumber = row.到货单明细流水号
+      this.dialogVisible1 = true
+    },
+    submitEditArrivalOrderMX() {
+      this.$refs['form1'].validate((valid) => {
+        if (valid) {
+          EditArrivalOrderMX(this.ArrivalOrderMXNumber, this.form1.材料, this.form1.数量, this.form1.单位, this.form1.单价, this.form1.金额).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑到货材料成功')
+              searchTable5(this.ArrivalOrderNumber).then(response => {
+                this.tableData5 = response.data
+              })
+              this.dialogVisible1 = false
+            } else { this.$message.error('编辑到货单失败') }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    deleteArrivalMX(row) {
+      this.$confirm('确定删除该合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteArrivalMX(row.到货单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            searchTable5(this.ArrivalOrderNumber).then(response => {
+              this.tableData5 = response.data
+            })
+          } else { this.$message.error('数据占用，删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    searchTable6(row) {
+      this.ArrivalOrderMXNumber = row.到货单明细流水号
+      searchTable6(this.到货单流水号).then(response => {
+        this.tableData6 = response.data
+      })
+    },
+    addArrivalCL(row) {
+      this.ArrivalOrderMXNumber = row.到货单明细流水号
+      this.dialogVisible2 = true
+    },
     handleSelectionChange(val) {
       this.arrest = val
+      console.log(val)
     },
     // 选入
     addMateriel() {
-      if (!this.到货单流水号) {
-        this.$message.warning('请选择到货单')
+      if (!this.ArrivalOrderMXNumber) {
+        this.$message.warning('请选择到货材料')
       } else if (this.arrest.length === 0) {
-        this.$message.warning('请勾选原材料')
+        this.$message.warning('请勾选需要关联的材料')
       } else {
         this.工艺计划流水号组 = []
         this.采购计划明细流水号组 = []
@@ -474,18 +660,41 @@ export default {
           this.工艺计划流水号组.push(v.工艺计划流水号)
           this.采购计划明细流水号组.push(v.采购计划明细流水号)
         })
-        addMateriel(this.到货单流水号, this.工艺计划流水号组, this.采购计划明细流水号组).then(response => {
+        addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组).then(response => {
           if (response.data[0].result === '1') {
-            this.$message.success('选入成功')
+            this.$message.success('关联成功')
+            this.dialogVisible2 = false
             searchMateriel(this.采购计划流水号).then(response => {
               this.tableData3 = response.data
             })
-            searchTable5(this.到货单流水号).then(response => {
-              this.tableData5 = response.data
+            searchTable6(this.ArrivalOrderMXNumber).then(response => {
+              this.tableData6 = response.data
             })
-          } else { this.$message.error('选入失败') }
+          } else { this.$message.error('关联失败') }
         })
       }
+    },
+    deleteMateriel(row) {
+      this.$confirm('确定取消关联?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log(row)
+        deleteMateriel(row.到货单明细绑定流水号, row.采购计划明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('取消成功')
+            searchTable6(this.ArrivalOrderMXNumber).then(response => {
+              this.tableData6 = response.data
+            })
+          } else { this.$message.error('取消失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
     }
   }
 }
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 81324b67..43c1891d 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -21,24 +21,47 @@
         @click="addTable1()">新增发票</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="550px" stripe border highlight-current-row @expand-change="searchTable02">
+      <el-table
+        :data="tableData1"
+        :row-key="getRowKeys"
+        :expand-row-keys="expands"
+        size="mini"
+        style="margin-top: 3px"
+        height="550px"
+        stripe
+        border
+        highlight-current-row
+        @expand-change="searchTable02">
         <el-table-column type="expand" label="详情">
           <template slot-scope="scope">
-            <el-table :data="gridData" class="subTableHeader" stripe border size="mini" show-summary style="width: 40%">
+            <el-table :data="gridData" class="subTableHeader" stripe border size="mini" style="width: 40%">
               <el-table-column width="50" align="center" type="index" label="序号"/>
-              <el-table-column min-width="150" align="center" label="到货单号">
+              <el-table-column min-width="150" align="center" label="供应商">
                 <template slot-scope="scope">
-                  {{ scope.row.到货单号 }}
+                  {{ scope.row.供应商名称 }}
                 </template>
               </el-table-column>
-              <el-table-column min-width="100" align="center" label="到货单名称">
+              <el-table-column min-width="100" align="center" label="到货日期">
                 <template slot-scope="scope">
-                  {{ scope.row.到货单名称 }}
+                  {{ scope.row.日期.split(' ')[0] }}
                 </template>
               </el-table-column>
-              <el-table-column min-width="100" align="center" label="金额" prop="金额">
+              <el-table-column min-width="100" align="center" label="备注">
                 <template slot-scope="scope">
-                  {{ scope.row.金额 }}
+                  {{ scope.row.备注 }}
+                </template>
+              </el-table-column>
+              <el-table-column min-width="100" align="center" label="操作">
+                <template slot-scope="scope">
+                  <el-tooltip effect="dark" content="取消关联" placement="top">
+                    <div style="display: inline-block">
+                      <el-button
+                        type="text"
+                        size="mini"
+                        icon="el-icon-delete"
+                        @click="deleteTable10(scope.row)"/>
+                    </div>
+                  </el-tooltip>
                 </template>
               </el-table-column>
             </el-table>
@@ -64,30 +87,29 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="传送人" min-width="80px">
-          <template slot-scope="scope">
-            {{ scope.row.传送人姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="接收人" min-width="80px">
-          <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="操作" fixed="right" width="150px">
+        <el-table-column align="center" label="操作" fixed="right" width="200px">
           <template slot-scope="scope">
+            <el-tooltip effect="dark" content="关联到货单" placement="top">
+              <div style="display: inline-block">
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-share"
+                  @click="aboutArrival(scope.row)"/>
+              </div>
+            </el-tooltip>
             <el-tooltip effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   type="text"
                   size="mini"
                   icon="el-icon-edit-outline"
-                  style="margin-left: 10px"
+                  style="margin-left: 20px"
                   @click="editTable1(scope.row)"/>
               </div>
             </el-tooltip>
@@ -116,46 +138,26 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="33%">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="23%">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
-        <el-form-item label="供应商名称" prop="供应商名称">
-          <el-input v-model="form1.供应商名称" size="small" readonly>
-            <el-button slot="append" icon="el-icon-search" @click="dialogVisible=true"/>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="采购单号" prop="contractNum">
-          <el-select :disabled="title1==='编辑备料发票'" v-model="form1.contractNum" placeholder="采购单号" size="small" multiple filterable clearable>
+        <el-form-item label="供应商" prop="supplierNameValue">
+          <el-select v-model="form1.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
             <el-option
-              v-for="item in contractNums"
+              v-for="item in supplierNames"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="发票号" prop="money">
+          <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
+        </el-form-item>
         <el-form-item label="开票时间" prop="invoiceTime">
           <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
         </el-form-item>
         <el-form-item label="开票金额" prop="money">
           <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
         </el-form-item>
-        <el-form-item label="传送人" prop="sendPerson">
-          <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
-            <el-option
-              v-for="item in selectPerson1"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="接收人" prop="receivePerson">
-          <el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" filterable clearable style="width:100px">
-            <el-option
-              v-for="item in selectPerson"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form1.remark" size="small"/>
         </el-form-item>
@@ -166,189 +168,109 @@
         <el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="选择供应商" center style="min-height: 300px;width: 100%">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称">
-              <el-input v-model="supplierName" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业性质">
-              <el-input v-model="enterpriseNature" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="货期">
-              <el-input v-model="goodTime" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input v-model="registeredCapital" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号">
-              <el-input v-model="taxNum" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input v-model="EMail" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址">
-              <el-input v-model="address" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号">
-              <el-input v-model="account" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开户行">
-              <el-input v-model="openingBank" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码">
-              <el-input v-model="phone" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input v-model="fax" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button
-              type="success"
-              size="small"
-              icon="el-icon-search"
-              @click="searchSupplier">查询</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitSelectSupplier">确定</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-delete"
-              @click="emptySupplierDetail">清空</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="300px" border stripe highlight-current-row @row-click="showSupplierDetail">
-          <el-table-column align="center" label="供应商名称" min-width="250">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="企业性质" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.企业性质 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="创立日期" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="注册资本" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.注册资本 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="45%">
+      <div>
+        <span style="margin-left: 10px">供应商:</span>
+        <el-input v-model="Name" placeholder="供应商" size="small" clearable/>
+        <span style="margin-left: 10px">时间段:</span>
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          type="daterange"
+          align="center"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          style="width:260px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+        </el-tooltip>
+      </div>
+      <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+        <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.日期.split(' ')[0] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :current-page="pageCurrent4"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize4"
+          :total="total4"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange4"
+          @current-change="handleCurrentChange4"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入到货单</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
 
-<script>import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initPerson1, searchSupplier, initPurchase, searchInvoiceDetail } from '@/api/WorkshopProcurement/OutsourcingMaterialsInvoice'
+<script>import { searchInvoice, addInvoice, editInvoice, deleteInvoice, searchSupplier, searchInvoiceDetail, searchArriveOrder, addMateriel, deleteInvoiceMX } from '@/api/WorkshopProcurement/OutsourcingMaterialsInvoice'
 import { mapGetters } from 'vuex'
 export default {
   name: '', // 发票交接单
   data() {
     return {
       contractNumValue: '',
+      supplierName0: '',
       contractNums: [],
       invoiceNum: '',
       invoiceTime: '',
-      transmitValue: this.id,
-      selectPerson: [], // 接收人
-      selectPerson1: [], // 传送人
-      recipientValue: '',
-      contractNum: '',
+      Name: '',
+      arrest: [],
       pageCurrent1: 1,
       pageSize1: 10,
       total1: 0,
+      pageCurrent4: 1,
+      pageSize4: 10,
+      total4: 0,
       tableData1: [],
       tableData01: [],
+      tableData4: [],
+      dateRange: '',
       gridData: [],
       check1: 0,
       check2: 0,
       check3: 0,
       check4: 0,
       check5: 0,
-      supplierCheck1: 0,
-      supplierCheck2: 0,
-      supplierCheck3: 0,
-      supplierCheck4: 0,
-      supplierCheck5: 0,
-      supplierCheck6: 0,
-      supplierCheck7: 0,
-      supplierCheck8: 0,
-      supplierCheck9: 0,
-      supplierCheck10: 0,
-      supplierCheck11: 0,
-      supplierCheck12: 0,
-      supplierName0: '', // 供应商名称（外面的）
-      supplierName: '', // 供应商名称
-      supplierValue: '', // 供应商流水号
-      goodTime: '', // 货期
-      enterpriseNature: '', // 企业性质
-      createDate: '', // 创立日期
-      registeredCapital: '', // 注册资本
-      taxNum: '', // 税号
-      EMail: '', // 电子邮箱
-      address: '', // 地址
-      account: '', // 账号
-      openingBank: '', // 开户行
-      phone: '', // 电话号码
-      fax: '', // 传真
+      发票流水号: '',
+      到货单流水号组: [],
+      supplierNames: [],
       dialogVisible: false,
       dialogVisible1: false,
       title1: '',
+      expands: [],
       form1: {
-        供应商名称: '',
-        供应商流水号: '',
-        contractNum: [],
+        supplierNameValue: '',
+        Number: '',
         invoiceNumValue: '',
         invoiceTime: '',
         money: '',
-        sendPersonValue: '',
-        receivePersonValue: '',
         remark: ''
       },
       rules1: {
-        contractNum: [
-          { required: true, message: '请选择采购单号', trigger: 'change' }
-        ]
+        supplierNameValue: [{ required: true, message: '请选择供应商' }]
       }
     }
   },
@@ -365,27 +287,11 @@ export default {
   },
   methods: {
     fetchData() {
-      initPerson().then(response => {
+      searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          this.selectPerson.push({
-            label: response.data[i].姓名,
-            value: response.data[i].人员编号
-          })
-        }
-      })
-      initPerson1().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.selectPerson1.push({
-            label: response.data[i].姓名,
-            value: response.data[i].人员编号
-          })
-        }
-      })
-      initPurchase().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.contractNums.push({
-            label: response.data[i].采购单号,
-            value: response.data[i].采购计划流水号
+          this.supplierNames.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
           })
         }
       })
@@ -393,10 +299,7 @@ export default {
     searchTable1() {
       this.invoiceNum ? this.check1 = 1 : this.check1 = 0
       this.supplierName0 ? this.check2 = 1 : this.check2 = 0
-      this.transmitValue ? this.check3 = 1 : this.check3 = 0
-      this.recipientValue ? this.check4 = 1 : this.check4 = 0
-      searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.supplierName0, this.check3, this.transmitValue, this.check4, this.recipientValue).then(response => {
-        console.log(response.data)
+      searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.supplierName0).then(response => {
         for (let j = 0; j < response.data.rows.length; j++) {
           response.data.rows[j].开票金额 = parseInt(response.data.rows[j].开票金额 * 100) / 100
           if (response.data.rows[j].开票时间 !== null) {
@@ -419,62 +322,48 @@ export default {
       this.pageCurrent1 = val
       this.searchTable1()
     },
+    // 查询到货单
+    searchTable4() {
+      console.log(this.dateRange)
+      this.Name ? this.check = 1 : this.check = 0
+      this.dateRange ? this.check = 1 : (this.check = 0, this.dateRange = '')
+      searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
+        this.tableData4 = response.data.rows
+        this.total4 = response.data.total
+      })
+    },
+    handleSizeChange4(val) { // 采购单列表分页
+      this.pageSize4 = val
+      this.pageCurrent4 = 1
+      this.searchTable4()
+    },
+    handleCurrentChange4(val) { // 采购单列表分页
+      this.pageCurrent4 = val
+      this.searchTable4()
+    },
     searchTable02(row) { // 查看详情（发票包含的合同）
-      searchInvoiceDetail(row.发票流水号).then(response => {
+      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.发票流水号
+        }
+      }
+      this.发票流水号 = row.发票流水号
+      searchInvoiceDetail(this.发票流水号).then(response => {
         this.gridData = response.data
       })
     },
-    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
-      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
-      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
-      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
-      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
-      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
-      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
-      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
-      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
-      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
-      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
-      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
-      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
-      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
-        this.tableData01 = response.data
-      })
-    },
-    showSupplierDetail(row) {
-      this.form1.供应商流水号 = row.供应商流水号
-      this.form1.供应商名称 = row.供应商名称
-      this.supplierValue = row.供应商流水号
-      this.supplierName = row.供应商名称
-      this.enterpriseNature = row.企业性质
-      this.createDate = row.创立日期
-      this.registeredCapital = row.注册资本
-      this.taxNum = row.税号
-      this.EMail = row.电子信箱
-      this.address = row.地址
-      this.account = row.帐号
-      this.openingBank = row.开户行
-      this.phone = row.电话号码
-      this.fax = row.传真
-      this.goodTime = row.货期
-    },
-    emptySupplierDetail() {
-      this.supplierValue = ''
-      this.supplierName = ''
-      this.enterpriseNature = ''
-      this.createDate = ''
-      this.registeredCapital = ''
-      this.taxNum = ''
-      this.EMail = ''
-      this.address = ''
-      this.account = ''
-      this.openingBank = ''
-      this.phone = ''
-      this.fax = ''
-      this.goodTime = ''
-    },
-    submitSelectSupplier() { // 确定选择供应商
-      this.dialogVisible = false
+    getRowKeys(row) {
+      return row.发票流水号
     },
     addTable1() {
       if (this.$refs['form1'] !== undefined) {
@@ -482,25 +371,17 @@ export default {
       }
       this.title1 = '新增备料发票'
       this.dialogVisible1 = true
-      this.form1.供应商名称 = ''
-      this.form1.供应商流水号 = ''
-      this.form1.contractNum = []
-      this.contractNumValue = ''
+      console.log(this.supplierNames)
+      this.form1.supplierNameValue = ''
+      this.form1.Number = ''
       this.form1.invoiceTime = ''
       this.form1.money = ''
-      this.form1.sendPersonValue = parseInt(this.id)
-      this.form1.receivePersonValue = ''
       this.form1.remark = ''
     },
     submitAdd1(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.contractNumValue = this.form1.contractNum[0]
-          for (let h = 1; h < this.form1.contractNum.length; h++) {
-            this.contractNumValue += ',' + this.form1.contractNum[h]
-          }
-          addInvoice(this.form1.contractNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, this.form1.供应商流水号, this.contractNumValue).then(response => {
-            console.log(response.data)
+          addInvoice(this.form1.invoiceTime, this.form1.money, this.form1.Number, this.form1.remark, this.form1.supplierNameValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogVisible1 = false
@@ -518,34 +399,22 @@ export default {
         this.$refs['form1'].resetFields()
       }
       this.title1 = '编辑备料发票'
-      console.log(row)
       this.dialogVisible1 = true
-      this.form1.contractNum = (row.采购计划流水号.split(',')).map(Number)
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间
       this.form1.money = row.开票金额
-      this.form1.sendPersonValue = parseInt(row.传送人)
-      this.form1.receivePersonValue = parseInt(row.接收人)
+      this.form1.Number = row.发票号
       this.form1.remark = row.备注
-      this.form1.供应商流水号 = row.供应商
-      this.form1.供应商名称 = row.供应商名称
-      console.log(row.开票时间)
+      this.form1.supplierNameValue = row.供应商
       if (row.开票时间 === '1900/1/1') {
         this.form1.invoiceTime = null
       }
-      if (parseInt(row.传送人) === 0) {
-        this.form1.sendPersonValue = ''
-      }
-      if (parseInt(row.接收人) === 0) {
-        this.form1.receivePersonValue = ''
-      }
     },
     submitEdit1(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           console.log(this.form1.remark)
-          editInvoice(this.form1.invoiceNumValue, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, this.form1.供应商流水号).then(response => {
-            console.log(response.data)
+          editInvoice(this.form1.invoiceNumValue, this.form1.invoiceTime, this.form1.money, this.form1.Number, this.form1.remark, this.form1.supplierNameValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
               this.dialogVisible1 = false
@@ -569,7 +438,6 @@ export default {
           console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
-            this.dialogVisible1 = false
             this.searchTable1()
           } else { this.$message.error('删除失败') }
         })
@@ -579,6 +447,53 @@ export default {
           message: '已取消操作'
         })
       })
+    },
+    aboutArrival(row) {
+      this.发票流水号 = row.发票流水号
+      this.dialogVisible = true
+    },
+    handleSelectionChange(val) {
+      this.arrest = val
+    },
+    // 选入
+    addMateriel() {
+      if (this.arrest.length === 0) {
+        this.$message.warning('请勾选需要关联的到货单')
+      } else {
+        this.到货单流水号组 = []
+        this.arrest.map(v => {
+          this.到货单流水号组.push(v.到货单流水号)
+        })
+        addMateriel(this.发票流水号, this.到货单流水号组).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('关联成功')
+            this.dialogVisible = false
+            this.tableData4 = []
+          } else { this.$message.error('关联失败') }
+        })
+      }
+    },
+    deleteTable10(row) {
+      this.$confirm('确认删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteInvoiceMX(row.发票明细流水号, row.到货单流水号).then(response => {
+          console.log(response.data)
+          if (response.data[0].result === '1') {
+            this.$message.success('取消成功')
+            searchInvoiceDetail(this.发票流水号).then(response => {
+              this.gridData = response.data
+            })
+          } else { this.$message.error('取消失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
     }
   }
 }
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 5f85bb5e..cdfc1c20 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -35,19 +35,19 @@
           <template slot-scope="scope">
             <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">
               <el-table-column width="50" align="center" type="index" label="序号"/>
-              <el-table-column min-width="150" align="center" label="采购单号">
+              <el-table-column min-width="150" align="center" label="发票号">
                 <template slot-scope="scope">
-                  {{ scope.row.采购单号 }}
+                  {{ scope.row.发票号 }}
                 </template>
               </el-table-column>
-              <el-table-column min-width="150" align="center" label="采购单名称">
+              <el-table-column min-width="150" align="center" label="供应商">
                 <template slot-scope="scope">
-                  {{ scope.row.采购单名称 }}
+                  {{ scope.row.供应商名称 }}
                 </template>
               </el-table-column>
-              <el-table-column min-width="100" align="center" label="计划总额" prop="请款金额">
+              <el-table-column min-width="150" align="center" label="开票金额">
                 <template slot-scope="scope">
-                  {{ scope.row.请款金额 }}
+                  {{ scope.row.开票金额 }}
                 </template>
               </el-table-column>
             </el-table>
@@ -139,14 +139,9 @@
         @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">查询</el-button>
       <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
-        <el-table-column label="采购单号" align="center" min-width="120">
+        <el-table-column label="发票号" align="center" min-width="120">
           <template slot-scope="scope">
-            {{ scope.row.采购单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购单名称" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.采购单名称 }}
+            {{ scope.row.发票号 }}
           </template>
         </el-table-column>
         <el-table-column label="供应商" align="center" min-width="250">
@@ -154,24 +149,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="70">
+        <el-table-column label="开票金额" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.总价 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已付金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额" fixed="right">
-          <template slot-scope="scope">
-            <el-input-number :max="scope.row.总价 - scope.row.已付金额" :disabled="(scope.row.总价 - scope.row.已付金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width:100%"/>
+            {{ scope.row.开票金额 }}
           </template>
         </el-table-column>
       </el-table>
@@ -305,9 +285,9 @@ export default {
       this.contractGroup = []
       this.sumGroup = []
       for (let i = 0; i < val.length; i++) {
-        this.SUM += parseFloat(val[i].请款金额)
-        this.contractGroup.push(val[i].采购计划流水号)
-        this.sumGroup.push(val[i].请款金额)
+        this.SUM += parseFloat(val[i].开票金额)
+        this.contractGroup.push(val[i].发票流水号)
+        this.sumGroup.push(val[i].开票金额)
       }
     },
     selectable(row, index) { // 控制某行是否可选