diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/api/ManufacturingCenter/EquipmentMonitoring.js
new file mode 100644
index 00000000..867714f8
--- /dev/null
+++ b/src/api/ManufacturingCenter/EquipmentMonitoring.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+// 查询加工工时统计表
+export function getwork_state() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_设备数据采集_工作状态_查询'
+    }
+  })
+}
+// 查询工位状态
+export function getOP_state() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_设备数据采集_工位状态_查询'
+    }
+  })
+}
+// 查询零件图号
+export function searchtooltip(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_工位零件图号查询',
+      param: '工位号=' + num
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
index 2ce93a00..2f9738e1 100644
--- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -33,7 +33,7 @@ export function saveWeight(num1, num2, num3, num4) {
     data: {
       type: '2',
       name: '备料管理_采购计划明细_保存重量和备注',
-      param: `采购计划明细流水号=${num1}&重量=${num2}&备注=${num3}&单价=${num4}`
+      param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}`
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index 85e039b5..c0c62822 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -26,38 +26,39 @@ export function searchMateriel(num) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(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}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 新增到货单
-export function addPurchaseOrder(num1, num2, num3, num4, num5) {
+export function addPurchaseOrder(num5, num6, num7) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_新增到货单',
-      param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}`
+      param: `备注=${num5}&供应商流水号=${num6}&日期=${num7}`
     }
   })
 }
 // 编辑采购单
-export function editPurchaseOrder(num1, num2, num3, num4, num5, num6) {
+export function editPurchaseOrder(num5, num6, num7, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '备料管理_编辑到货单',
-      param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}`
+      param: `备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}}&日期=${num8}`
     }
   })
 }
@@ -85,15 +86,83 @@ 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}`
+    }
+  })
+}
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件',
+      param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
     }
   })
 }
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/assets/img/img17.png b/src/assets/img/img17.png
new file mode 100644
index 00000000..58266f70
Binary files /dev/null and b/src/assets/img/img17.png differ
diff --git a/src/assets/img/img23.png b/src/assets/img/img23.png
new file mode 100644
index 00000000..0afa04b7
Binary files /dev/null and b/src/assets/img/img23.png differ
diff --git a/src/assets/img/img24.png b/src/assets/img/img24.png
new file mode 100644
index 00000000..31643022
Binary files /dev/null and b/src/assets/img/img24.png differ
diff --git a/src/assets/img/img25.png b/src/assets/img/img25.png
new file mode 100644
index 00000000..9c03c12f
Binary files /dev/null and b/src/assets/img/img25.png differ
diff --git a/src/utils/request.js b/src/utils/request.js
index 400de537..cbdb9a8d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,6 +3,7 @@ import axios from 'axios'
 export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
 export const name = `OP8888`
 export const name1 = `OP1000`
+export const name3 = `OP2000`
 
 // 创建axios实例
 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
@@ -23,7 +24,11 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
   baseURL: `http://localhost:8005/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+>>>>>>> 86989987e2fefa8d0084dce8a0f3b020afa872e7
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index 6dbf76b1..50e85d8d 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -1,234 +1,363 @@
 <template>
   <el-card>
     <div class="process">
-      <div style="position: relative;left:39px;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 class="fang"/><div 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>
+          <!--<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:39px;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 class="fang"/><div 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>
+          <!--<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:39px;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 class="fang"/><div 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">{{ OPNAME139 }}</div>
+          <!--<div :id="OPNAME139+fang" class="fang"/>-->
+          <div :id="OPNAME139+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">{{ OPNAME139 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:39px;top:396px; width: 100px;height: 28px;">
+      <div :id="OPNAME140" :title="tooltip" style="position: relative;left:48px;top:396px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME140 }}</div>
+          <!--<div :id="OPNAME140+fang" class="fang"/>-->
+          <div :id="OPNAME140+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">{{ OPNAME140 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:39px;top:403px; width: 100px;height: 28px;">
+      <div :id="OPNAME141" :title="tooltip" style="position: relative;left:48px;top:403px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME141 }}</div>
+          <!--<div :id="OPNAME141+fang" class="fang"/>-->
+          <div :id="OPNAME141+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">{{ OPNAME141 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:39px;top:410px; width: 100px;height: 28px;">
+      <div :id="OPNAME142" :title="tooltip" style="position: relative;left:48px;top:410px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME142 }}</div>
+          <!--<div :id="OPNAME142+fang" class="fang"/>-->
+          <div :id="OPNAME142+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">{{ OPNAME142 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:39px;top:417px; width: 100px;height: 28px;">
+      <div :id="OPNAME143" :title="tooltip" style="position: relative;left:48px;top:417px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME143 }}</div>
+          <!--<div :id="OPNAME143+fang" class="fang"/>-->
+          <div :id="OPNAME143+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">{{ OPNAME143 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:39px;top:424px; width: 100px;height: 28px;">
+      <div :id="OPNAME144" :title="tooltip" style="position: relative;left:48px;top:424px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME144 }}</div>
+          <!--<div :id="OPNAME144+fang" class="fang"/>-->
+          <div :id="OPNAME144+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">{{ OPNAME144 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:140px;top:395px; width: 100px;height: 28px;">
+      <div :id="OPNAME136" :title="tooltip" style="position: relative;left:149px;top:395px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div 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">{{ OPNAME136 }}</div>
+          <!--<div :id="OPNAME136+fang" class="fang"/>-->
+          <div :id="OPNAME136+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">{{ OPNAME136 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:25px; width: 100px;height: 28px;">
+      <div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:76px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div>
+          <div :id="OPNAME102+circle" class="circle"/>
+          <!--<div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
+      <div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:71px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div>
+          <div :id="OPNAME103+circle" class="circle"/>
+          <!--<div :id="OPNAME103+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:64px; width: 100px;height: 28px;">
+      <div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:66px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div>
+          <div :id="OPNAME104+circle" class="circle"/>
+          <!--<div :id="OPNAME104+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:60px; width: 100px;height: 28px;">
+      <div :id="OPNAME105" :title="tooltip" style="position: relative;left:788px;top:61px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
+          <div :id="OPNAME105+circle" class="circle"/>
+          <!--<div :id="OPNAME105+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:892px;top:76px; width: 100px;height: 28px;">
+      <div :id="OPNAME145" :title="tooltip" style="position: relative;left:788px;top:55px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 9px"/><div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME145 }}</div>
+          <div :id="OPNAME145+circle" class="circle"/>
+          <!--<div :id="OPNAME105+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
+      <div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:50px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div>
+          <div :id="OPNAME106+circle" class="circle"/>
+          <!--<div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:43px; width: 100px;height: 28px;">
+      <div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div>
+          <div :id="OPNAME107+circle" class="circle"/>
+          <!--<div :id="OPNAME107+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:38px; width: 100px;height: 28px;">
+      <div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div>
+          <div :id="OPNAME108+circle" class="circle"/>
+          <!--<div :id="OPNAME108+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:32px; width: 100px;height: 28px;">
+      <div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div>
+          <div :id="OPNAME109+circle" class="circle"/>
+          <!--<div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:27px; width: 100px;height: 28px;">
+      <div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div>
+          <div :id="OPNAME110+circle" class="circle"/>
+          <!--<div :id="OPNAME110+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:21px; width: 100px;height: 28px;">
+      <div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div>
+          <div :id="OPNAME111+circle" class="circle"/>
+          <!--<div :id="OPNAME111+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:788px;top:15px; width: 100px;height: 28px;">
+      <div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div>
+          <div :id="OPNAME112+circle" class="circle"/>
+          <!--<div :id="OPNAME112+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;">
+      <div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div>
+          <div :id="OPNAME113+circle" class="circle"/>
+          <!--<div :id="OPNAME113+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;">
+      <div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div>
+          <div :id="OPNAME114+circle" class="circle"/>
+          <!--<div :id="OPNAME114+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;">
+      <div :id="OPNAME101" :title="tooltip" style="position: relative;left:895px;top:-225px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div>
+          <div :id="OPNAME101+circle" class="circle"/>
+          <!--<div :id="OPNAME101+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;">
+      <div :id="OPNAME149" :title="tooltip" style="position: relative;left:895px;top:-190px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME149 }}</div>
+          <div :id="OPNAME149+circle" class="circle"/>
+          <!--<div :id="OPNAME149+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;">
+      <div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-186px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div>
+          <div :id="OPNAME115+circle" class="circle"/>
+          <!--<div :id="OPNAME115+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:1022px;top:-326px; width: 100px;height: 28px;">
+      <div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-152px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div>
+          <div :id="OPNAME116+circle" class="circle"/>
+          <!--<div :id="OPNAME116+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:1022px;top:-311px; width: 100px;height: 28px;">
+      <div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-150px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div>
+          <div :id="OPNAME117+circle" class="circle"/>
+          <!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div style="position: relative;left:1022px;top:-295px; width: 100px;height: 28px;">
+      <div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-381px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
+          <!--<div :id="OPNAME118+fang" class="fang"/>-->
+          <div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1020px;top:-190px; width: 100px;height: 28px;">
+      <div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-366px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
+          <!--<div :id="OPNAME119+fang" class="fang"/>-->
+          <div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1020px;top:-120px; width: 100px;height: 28px;">
+      <div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-350px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
+          <!--<div :id="OPNAME120+fang" class="fang"/>-->
+          <div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1118px;top:-585px; width: 100px;height: 28px;">
+      <div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-255px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
+          <!--<div :id="OPNAME121+fang" class="fang"/>-->
+          <div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1118px;top:-568px; width: 100px;height: 28px;">
+      <div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-175px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
+          <!--<div :id="OPNAME122+fang" class="fang"/>-->
+          <div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1118px;top:-553px; width: 100px;height: 28px;">
+      <div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-685px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
+          <!--<div :id="OPNAME123+fang" class="fang"/>-->
+          <div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1118px;top:-537px; width: 100px;height: 28px;">
+      <div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-666px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
+          <!--<div :id="OPNAME124+fang" class="fang"/>-->
+          <div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1124px;top:-341px; width: 100px;height: 28px;">
+      <div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-651px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
+          <!--<div :id="OPNAME125+fang" class="fang"/>-->
+          <div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1120px;top:-319px; width: 100px;height: 28px;">
+      <div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-635px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
+          <!--<div :id="OPNAME126+fang" class="fang"/>-->
+          <div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-769px; width: 100px;height: 28px;">
+      <div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-395px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
+          <!--<div :id="OPNAME127+fang" class="fang"/>-->
+          <div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-759px; width: 100px;height: 28px;">
+      <div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-374px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
+          <!--<div :id="OPNAME128+fang" class="fang"/>-->
+          <div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-719px; width: 100px;height: 28px;">
+      <div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-828px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
+          <!--<div :id="OPNAME129+fang" class="fang"/>-->
+          <div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-649px; width: 100px;height: 28px;">
+      <div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-818px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
+          <!--<div :id="OPNAME130+fang" class="fang"/>-->
+          <div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1273px;top:-640px; width: 100px;height: 28px;">
+      <div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-778px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 10px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
+          <!--<div :id="OPNAME131+fang" class="fang"/>-->
+          <div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-545px; width: 100px;height: 28px;">
+      <div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-700px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
+          <!--<div :id="OPNAME132+fang" class="fang"/>-->
+          <div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
         </el-row>
       </div>
-      <div style="position: relative;left:1270px;top:-535px; width: 100px;height: 28px;">
+      <div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-697px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
+          <!--<div :id="OPNAME133+fang" class="fang"/>-->
+          <div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
+        </el-row>
+      </div>
+      <div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-605px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+        <el-row>
+          <!--<div :id="OPNAME134+fang" class="fang"/>-->
+          <div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
+        </el-row>
+      </div>
+      <div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-590px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+        <el-row>
+          <!--<div :id="OPNAME135+fang" class="fang"/>-->
+          <div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
+        </el-row>
+      </div>
+      <div :id="OPNAME146" :title="tooltip" style="position: relative;left:1450px;top:-1057px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+        <el-row>
+          <!--<div :id="OPNAME135+fang" class="fang"/>-->
+          <div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME146 }}</div>
+        </el-row>
+      </div>
+      <div :id="OPNAME148" :title="tooltip" style="position: relative;left:1568px;top:-1085px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+        <el-row>
+          <!--<div :id="OPNAME135+fang" class="fang"/>-->
+          <div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>
+          <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME148 }}</div>
+        </el-row>
+      </div>
+      <div :id="OPNAME147" :title="tooltip" style="position: relative;left:1336px;top:-548px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME147 }}</div>
+          <div :id="OPNAME147+circle" class="circle"/>
+          <!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
     </div>
   </el-card>
 </template>
 
-<script>import { wsuri, name } from '@/utils/request'
+<script>
+import $ from 'jquery'
+import { getwork_state, getOP_state, searchtooltip } from '@/api/ManufacturingCenter/EquipmentMonitoring'
+import { wsuri, name3 } from '@/utils/request'
 export default {
   data() {
     return {
+      fang: '_fang',
+      circle: '_circle',
+      tooltip: '',
       socketConnect: true,
       OPNAME101: 'OP1010',
       OPNAME102: 'OP1020',
@@ -274,18 +403,109 @@ export default {
       OPNAME142: 'OP1420',
       OPNAME143: 'OP1430',
       OPNAME144: 'OP1440',
-      timer: null
+      OPNAME145: 'OP1450',
+      OPNAME146: 'OP1460',
+      OPNAME147: 'OP1470',
+      OPNAME148: 'OP1480',
+      OPNAME149: 'OP1490',
+      timer: null,
+      opname: ''
     }
   },
   mounted() {
     this.connect()
-    this.timer = setInterval(this.searchState, 15 * 1000) // 工位状态 15秒 一刷新
+    this.getwork_state()
+    this.getOP_state()
+    this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
   },
   beforeDestroy() {
     // 页面结束之前关闭所有timer，防止资源占用
     clearInterval(this.timer)
   },
   methods: {
+    // 工作状态 0 黄色 1 绿色
+    getwork_state() {
+      this.getOP_state()
+
+      // function opclickshowPanel() {
+      //   console.log(this.opname)
+      //   if (this.opname != undefined) {
+      //     var aaa = 'http://localhost:8065/webpage/MesWebFun02.htm?opname=' + this.opname + '&ip=192.168.1.103&port=8015'
+      //     window.open(aaa)
+      //   }
+      // }
+
+      getwork_state().then(response => {
+        console.log(response.data)
+        // 通过jQuery添加类选择器和移除类选择器
+        for (let i = 0; i < response.data.length; i++) {
+          // 点击工位事件
+          // 通过“事件监听”的方式来绑定事件（也叫Dom2级事件处理程序）
+          // document.getElementById(response.data[i].设备号).onclick = _this.opclickshowPanel(); //鼠标单击的时候调用showMes这个函数
+          // $('#' + response.data[i].设备号).bind('click', opclickshowPanel)
+          if (response.data[i].设备状态 === '1') {
+            $('#' + response.data[i].设备号 + '_fang').removeClass('fang1')
+            $('#' + response.data[i].设备号 + '_fang').addClass('fang')
+          } else if (response.data[i].设备状态 === '0') {
+            $('#' + response.data[i].设备号 + '_fang').removeClass('fang')
+            $('#' + response.data[i].设备号 + '_fang').addClass('fang1')
+          }
+        }
+      })
+    },
+    opclickshowPanel($event) {
+      if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') {
+        var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.231&port=61101'
+        window.open(aaa)
+      }
+    },
+    // 工位电流值
+    // 1停机灰色 2开机黄色 3运行绿色 4报警红色
+    getOP_state() {
+      getOP_state().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].状态代码 === '1') {
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle2')
+          } else if (response.data[i].状态代码 === '2') {
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle1')
+          } else if (response.data[i].状态代码 === '3') {
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle')
+          } else if (response.data[i].状态代码 === '4') {
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
+            $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle3')
+          }
+        }
+      })
+    },
+    // 鼠标移入加入class
+    changeActive($event) {
+      searchtooltip($event.path[2].id).then(response => {
+        console.log(response.data)
+        if (response.data.length > 0) {
+          if (response.data[0].工艺计划流水号 === 0) {
+            response.data[0].零件图号_零件工艺计划 = '-'
+          }
+          this.tooltip = '当前正在加工:' + response.data[0].零件图号_零件工艺计划
+        } else {
+          this.tooltip = '没有零件加工'
+        }
+      })
+      // $event.currentTarget.className="active";
+    },
+    removeActive($event) {
+      // $event.currentTarget.className="";
+    },
     /* socket连接*/
     connect() {
       if (this.socketConnect === true) {
@@ -304,19 +524,61 @@ export default {
     // 打开
     websocketopen() {
       console.log('WebSocket连接成功')
-      this.websock.send('{<' + name + '>}')
+      this.websock.send('{<' + name3 + '>}')
     },
     // 数据接收
     websocketonmessage(msg) {
-      this.msg = msg
-      console.log(msg)
-      const aa = this.msg.data.split('|')
-      console.log(aa[1])
-      // if (aa[1] === '') {
-      //
-      // } else if (aa[1] === '') {
-      //
-      // }
+      this.msg = msg.data
+      // console.log(msg)
+      var msgArray = this.msg.split('|')
+      if (msgArray !== '' && msgArray.length >= 4) {
+        var command = msgArray[1]
+        var opname = msgArray[2]
+        var value = msgArray[3]
+        switch (command) {
+          case 'MachineStatusAlarm':// hight 报错不管心跳
+          case 'Alarm':
+            if (value === 1) {
+              console.log(1)
+            } else {
+              console.log(2)
+            }
+            break
+          case 'PartPalletStatus':// 托盘到位
+            if (value === 1) {
+              console.log(1)
+            } else {
+              console.log(2)
+            }
+            break
+          case 'OEE':// 托盘到位
+            if (value === '1') {
+              $('#' + opname + '_circle').removeClass('circle3')
+              $('#' + opname + '_circle').removeClass('circle1')
+              $('#' + opname + '_circle').removeClass('circle')
+              $('#' + opname + '_circle').addClass('circle2')
+            } else if (value === '2') {
+              $('#' + opname + '_circle').removeClass('circle')
+              $('#' + opname + '_circle').removeClass('circle3')
+              $('#' + opname + '_circle').removeClass('circle2')
+              $('#' + opname + '_circle').addClass('circle1')
+            } else if (value === '3') {
+              $('#' + opname + '_circle').removeClass('circle3')
+              $('#' + opname + '_circle').removeClass('circle1')
+              $('#' + opname + '_circle').removeClass('circle2')
+              $('#' + opname + '_circle').addClass('circle')
+            } else if (value === '4') {
+              $('#' + opname + '_circle').removeClass('circle')
+              $('#' + opname + '_circle').removeClass('circle1')
+              $('#' + opname + '_circle').removeClass('circle2')
+              $('#' + opname + '_circle').addClass('circle3')
+            }
+            // getOP_state() // 初始化设备状态
+            break
+          default:
+            break
+        }
+      }
     },
     // 关闭
     websocketclose() {
@@ -340,10 +602,11 @@ export default {
     width: 1690px;
     height: 830px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img22.png') repeat;
+    background: url('../../../assets/img/img25.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
+  /*绿色*/
   .circle{
     float: left;
     width: 10px;
@@ -353,15 +616,17 @@ export default {
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
   }
+   /*黄色*/
   .circle1{
     float: left;
     width: 10px;
     height: 10px;
-    background-color:yellow;
+    background-color:#FFBB00 ;
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
   }
+  /*灰色*/
   .circle2{
     float: left;
     width: 10px;
@@ -371,6 +636,7 @@ export default {
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
   }
+  /*红色*/
   .circle3{
     float: left;
     width: 10px;
@@ -390,6 +656,6 @@ export default {
     float: left;
     width: 10px;
     height: 10px;
-    background-color:yellow;
+    background-color:#FFBB00 ;
   }
 </style>
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index d76f8a29..0d8f492e 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -18,7 +18,7 @@
           </div>
           <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">装配质检合格率：{{ `${data2[0].装配质检}%` }}</div>
+              <div slot="content">装配质检合格率：{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
             </el-tooltip>
           </div>
@@ -54,13 +54,13 @@
           </div>
           <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 280px;top:95px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">自制质检合格率：{{ `${data2[0].自制质检}%` }}</div>
+              <div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 197px;top:286px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">采购质检合格率：{{ `${data2[0].采购质检}%` }}</div>
+              <div slot="content">采购质检合格率：{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button>
             </el-tooltip>
           </div>
@@ -96,8 +96,8 @@
           </div>
           <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1295px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">回款进度：{{ `${data2[0].签订合同}%` }}</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
+              <div slot="content">回款进度：{{ parseInt(`${data2[0].签订合同}`) + '%' }}</div>
+              <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ parseInt(`${data2[0].签订合同}`) + '%' }}</el-button>
             </el-tooltip>
           </div>
           <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1280px;top:238px; width: 80px;height: 48px;">
@@ -319,7 +319,7 @@
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
                 <div style="margin-top: 17px">
-                  <span>机床设计者：</span><el-tag size="mini">{{ '李玉萍' }}</el-tag>
+                  <span>机床设计者：</span><el-tag size="mini">{{ dataDiv2.负责人 }}</el-tag>
                   <span style="margin-left: 10px">组件总数：</span><el-tag size="mini">{{ dataDiv2.组件总数 }}</el-tag>
                   <span style="margin-left: 10px">整改组数：</span><el-tag size="mini">{{ dataDiv2.整改组数 }}</el-tag>
                 </div>
@@ -964,12 +964,7 @@
       <el-card class="showDiv">
         <h3 style="align-content: center">{{ Machine }} : 车间加工</h3>
         <el-row style="margin-top: 10px">
-          <el-col :span="8">
-            <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
-              <div id="barDiv10" style="width:600px;height:400px; display: block; float: left"/>
-            </div>
-          </el-col>
-          <el-col :span="16">
+          <el-col :span="24">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
                 :data="tableDataDiv10"
@@ -985,13 +980,7 @@
                   align="center"
                   type="index"
                   width="50"/>
-                <el-table-column align="center" label="是否完成">
-                  <template slot-scope="scope">
-                    <el-tag v-if="scope.row.实际完成时间" type="success" size="mini" style="width: 80px">完成</el-tag>
-                    <el-tag v-else type="danger" size="mini" style="width: 80px">未完成</el-tag>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="组号" width="80px">
+                <el-table-column align="center" label="组号">
                   <template slot-scope="scope">
                     {{ scope.row.组号 ? scope.row.组号 : '--' }}
                   </template>
@@ -1001,7 +990,12 @@
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="负责人" width="80px">
+                <el-table-column align="center" label="组别进度">
+                  <template slot-scope="scope">
+                    {{ scope.row.进度 ? scope.row.进度 : '--' }}
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="负责人">
                   <template slot-scope="scope">
                     {{ scope.row.负责人 ? scope.row.负责人 : '--' }}
                   </template>
@@ -1333,6 +1327,11 @@
               align="center"
               type="index"
               width="50"/>
+            <el-table-column align="center" label="发货状态">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="发货单编号">
               <template slot-scope="scope">
                 {{ scope.row.发货单编号 ? scope.row.发货单编号 : '--' }}
@@ -1343,34 +1342,19 @@
                 {{ scope.row.发货单名称 ? scope.row.发货单名称 : '--' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="制单人">
+            <el-table-column align="center" label="货品编号">
               <template slot-scope="scope">
-                {{ scope.row.制单人 ? scope.row.制单人 : '--' }}
+                {{ scope.row.货品编号 ? scope.row.货品编号 : '--' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="发货人">
+            <el-table-column align="center" label="货品名称">
               <template slot-scope="scope">
-                {{ scope.row.执行人 ? scope.row.执行人 : '--' }}
+                {{ scope.row.货品名称 ? scope.row.货品名称 : '--' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="发出时间">
+            <el-table-column align="center" label="货品类别">
               <template slot-scope="scope">
-                {{ scope.row.发出时间 ? scope.row.发出时间 : '--' }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="车辆牌号">
-              <template slot-scope="scope">
-                {{ scope.row.车辆牌号 ? scope.row.车辆牌号 : '--' }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="司机姓名">
-              <template slot-scope="scope">
-                {{ scope.row.司机姓名 ? scope.row.司机姓名 : '--' }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="联系电话">
-              <template slot-scope="scope">
-                {{ scope.row.联系电话 ? scope.row.联系电话 : '--' }}
+                {{ scope.row.货品类别 ? scope.row.货品类别 : '--' }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="收货单位">
@@ -1378,9 +1362,9 @@
                 {{ scope.row.收货单位 ? scope.row.收货单位 : '--' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="收货地址">
+            <el-table-column align="center" label="发出时间">
               <template slot-scope="scope">
-                {{ scope.row.收货地址 ? scope.row.收货地址 : '--' }}
+                {{ scope.row.发出时间 ? scope.row.发出时间 : '--' }}
               </template>
             </el-table-column>
           </el-table>
@@ -2082,6 +2066,7 @@ export default {
       dataDiv2: {
         组件总数: '',
         整改组数: '',
+        负责人: '',
         data: []
       },
       dataDiv3: {
@@ -2529,6 +2514,9 @@ export default {
         }
       }).then(res => {
         this.tableDataDiv2 = res.data
+        if (this.tableDataDiv2.length !== 0) {
+          this.dataDiv2.负责人 = res.data[0].负责人
+        }
         request({
           url: '',
           method: 'post',
@@ -3409,71 +3397,13 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select COUNT(*) as 未完成
-                   from 项目计划管理_组件计划_视图
-                   where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is null`
+            name: `select CONVERT(nvarchar(50),round(CONVERT(float,sum(case when [机加工实际完成时间] is not null then [投产总数量] else 0 end ))/CONVERT(float,sum([投产总数量]))*100,2) ) as 进度
+             from 综合查询_车间加工
+             where 机床流水号 = ${this.machineValue1} and 计划类型 = 4`
           }
-        }).then(res => {
-          if (res.data[0].未完成 !== 0) {
-            this.dataDiv10.data.push({
-              name: '未完成',
-              value: res.data[0].未完成
-            })
-          }
-        }).then(() => {
-          request({
-            url: '',
-            method: 'post',
-            data: {
-              type: '3',
-              name: `select COUNT(*) as 已完成
-                     from 项目计划管理_组件计划_视图
-                     where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is not null`
-            }
-          }).then(res => {
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv10.data.push({
-                name: '已完成',
-                value: res.data[0].已完成
-              })
-            }
-            this.drawLineDiv10()
-          })
         })
       })
     },
-    // 绘制油漆div饼图
-    drawLineDiv10() {
-      const bar = echarts.init(document.getElementById('barDiv10'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
-          data: ['已完成', '未完成']
-        },
-        series: [
-          {
-            name: '状态比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '45%'],
-            data: this.dataDiv10.data,
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      })
-    },
     // 查询自家备料div数据
     async searchDiv11() {
       this.showDiv0 = false
@@ -4501,10 +4431,11 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue1} and 是否发出 = 1`
+          name: `select * from 综合查询_发货_查询视图 where 机床流水号 = ${this.machineValue1}`
         }
       }).then(res => {
         this.tableDataDiv23 = res.data
+        console.log(this.tableDataDiv23)
       })
     }
   }
@@ -4516,16 +4447,22 @@ export default {
     background: red;
   }
   .jixingzhong{
+    width: 80px;
+    height: 40px;
     background: #7eaced;
     color: black;
     font-weight: bold;
   }
   .yiwancheng{
+    width: 80px;
+    height: 40px;
     background: #ff9759;
     color: black;
     font-weight: bold;
   }
   .weikaishi{
+    width: 80px;
+    height: 40px;
     background: #EAEAEA;
     color: black;
     font-weight: bold;
@@ -4554,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/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index f9e57956..10066577 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -2,8 +2,8 @@
   <div>
     <el-card>
       <div style="width: 900px;margin: 0 auto">
-        <span>机床名称：</span>
-        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px;width: 200px;" @change="getGroups">
+        <span>机床图号：</span>
+        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床图号" style="margin-top: 3px;width: 200px;" @change="getGroups">
           <el-option
             v-for="item in machineNames"
             :key="item.value"
@@ -465,6 +465,7 @@ export default {
     },
     getMachineNames() {
       getMachineNames(this.machineValue).then(response => {
+        console.log(response.data, 1111)
         this.machineName = response.data[0].机床名称
         this.machineNum = response.data[0].机床数量
       })
@@ -551,6 +552,7 @@ export default {
         this.err = 0
         if (this.groupValue) {
           this.listLoading = true
+          alert(122)
           if (this.groupName.indexOf('MX') > -1) {
             for (let i = 0; i < this.tableDataAll.length; i++) {
               const data = this.tableDataAll[i]
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index f697dd8c..9b6ed9dc 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -187,9 +187,9 @@
             <el-input v-model="scope.row.成品尺寸" size="mini" style="width:120px" @change="saveWeight(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" >
+        <el-table-column label="单位" align="center">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.单价" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
+            <el-input v-model="scope.row.单位" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="备注">
@@ -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">
@@ -564,11 +564,11 @@ export default {
         this.$message.error('请输入正确的单价')
         row.单价 = ''
       } else {
-        saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
+        saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
       }
     },
     saveRemarks(index, row) {
-      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
     },
     // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
     useqrcode(contractNum) {
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 5fe1a994..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.物料零件编码 }}
@@ -81,91 +147,170 @@
             {{ 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 }}
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100" 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-delete" @click="deleteMateriel(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <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="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+          <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>
-        <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">
+      <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.材料 }}
+            {{ scope.row.采购单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" min-width="170">
+        <el-table-column label="采购单名称" align="center">
           <template slot-scope="scope">
-            {{ scope.row.单位 }}
+            {{ scope.row.采购单名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column label="供应商" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" min-width="80">
+        <el-table-column label="采购员" align="center">
           <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ 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.备注 }}
+            {{ scope.row.下单日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="创建日期" align="center" width="150">
+        <el-table-column label="计划完成日期" align="center">
           <template slot-scope="scope">
-            {{ scope.row.日期 }}
+            {{ scope.row.计划完成日期.split(' ')[0] }}
           </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-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)"/>
-              </div>
-            </el-tooltip>
-          </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">
@@ -178,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>
@@ -188,86 +333,44 @@
             {{ 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="备注">
-              <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 } 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,
+      Name: '',
       tableData2: [],
       total2: 0,
       pageCurrent2: 1,
       pageSize2: 10,
       tableData3: [],
+      tableData6: [],
       采购计划流水号: '',
       tableData4: [],
       total4: 0,
@@ -275,21 +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: '请填写金额' }],
-        备注: [{ required: true, message: '请填写备注' }]
+        单位: [{ required: true, message: '请填写单位' }],
+        单价: [{ required: true, message: '请填写单价' }]
       },
       工艺计划流水号组: [],
       采购计划明细流水号组: []
@@ -332,37 +448,46 @@ export default {
     },
     // 查询到货单
     searchTable4() {
-      searchArriveOrder(this.pageCurrent4, this.pageSize4).then(response => {
+      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.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
+      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.supplierNames.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
     },
     // 新增
-    submitAddPurchaseOrder() {
+    submitAddArrivalOrder() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注).then(response => {
+          addPurchaseOrder(this.form.备注, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建到货单成功')
               this.pageCurrent4 = 1
@@ -377,22 +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.到货单流水号).then(response => {
+          editPurchaseOrder(this.form.备注, this.到货单流水号, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('修改到货单成功')
               this.searchTable4()
@@ -404,7 +527,7 @@ export default {
         }
       })
     },
-    deletePurchaseOrder(row) { // 删除采购单
+    deleteArrivalOrder(row) { // 删除采购单
       this.$confirm('确定删除该合同?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -429,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.采购计划明细流水号组 = []
@@ -445,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 d1de84a1..43c1891d 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -5,23 +5,7 @@
       <el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 130px" clearable/>
       <span style="margin-left: 10px">供应商:</span>
       <el-input v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable/>
-      <span style="margin-left: 10px">传送人:</span>
-      <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:130px">
-        <el-option
-          v-for="item in selectPerson1"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span style="margin-left: 10px">接收人:</span>
-      <el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:130px">
-        <el-option
-          v-for="item in selectPerson"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
+      <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
         <el-button
           type="success"
           size="small"
@@ -34,27 +18,50 @@
         size="small"
         icon="el-icon-circle-plus-outline"
         style="margin-left: 10px"
-        @click="addTable1()">新增</el-button>
+        @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>
@@ -80,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>
@@ -132,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>
@@ -182,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: '请选择供应商' }]
       }
     }
   },
@@ -381,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].供应商流水号
           })
         }
       })
@@ -409,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) {
@@ -435,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) {
@@ -498,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
@@ -534,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
@@ -585,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('删除失败') }
         })
@@ -595,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) { // 控制某行是否可选