From e26a30f68a1d04436cf52520fef3c23cbab49ff0 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sun, 6 Oct 2019 21:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/WorkshopProcurement/NewArrivalList.js |  74 ++-
 .../OutsourcingMaterialsInvoice.js            |  48 +-
 src/assets/img/img16.png                      | Bin 0 -> 74837 bytes
 .../EquipmentMonitoring/index.vue             |   6 +-
 .../ManufacturingCenter/ParseQuery/index.vue  |   2 +-
 .../CreatingPurchasingMaterials/index.vue     |   4 +-
 .../NewArrivalList/index.vue                  | 601 ++++++++++++------
 .../OutsourcingMaterialsInvoice/index.vue     | 515 +++++++--------
 .../RequestOutsourcingMaterials/index.vue     |  46 +-
 9 files changed, 746 insertions(+), 550 deletions(-)
 create mode 100644 src/assets/img/img16.png

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 0000000000000000000000000000000000000000..427e81dd0d797747c29fe72fe1f22301ca684be1
GIT binary patch
literal 74837
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
F{{h<iHE93<

literal 0
HcmV?d00001

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) { // 控制某行是否可选