diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index e2f5e2d7..1bebf117 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -1,5 +1,41 @@
 import request from '@/utils/request'
 
+// 典艺查询<高精原有数据>
+export function searchProcess11(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺查询_MESWORK',
+      param: '零件图号=' + num
+    }
+  })
+}
+// 典艺查询<高精原有数据>
+export function numChange(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
+      param: '典艺流水号=' + num
+    }
+  })
+}
+// 保存主表工艺
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
+      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
 // 初始化 工艺员A
 export function initCraftmen() {
   return request({
@@ -8,7 +44,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=20'
     }
   })
 }
@@ -322,18 +358,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
     }
   })
 }
-// 选择工艺要求
-export function selectRequest(num0, num1, num2, num3, request0) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
-      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
-    }
-  })
-}
+
 // 粘贴
 export function pasteTable(oldNum, newNum) {
   return request({
diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
index 95fa4391..8b763061 100644
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -129,7 +129,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=20'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 539d1ef1..913bdf76 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -17,7 +17,7 @@ export function getMachines() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询',
       param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
     }
   })
diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
index 4d63337f..f9e29fd9 100644
--- a/src/api/ManufacturingCenter/ProductionCapacityBalance.js
+++ b/src/api/ManufacturingCenter/ProductionCapacityBalance.js
@@ -127,8 +127,8 @@ export function discharge(a) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_新排产算法_工序应完成时间_平均算法',
-      param: '工艺计划流水号=' + a + '=int'
+      name: '车间生产管理_能力平衡_循环执行',
+      param: '工艺计划流水号组=' + a
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
new file mode 100644
index 00000000..52ab573a
--- /dev/null
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+export function getProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+    }
+  })
+}
+export function getCustomerName() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+    }
+  })
+}
+export function getToolNum() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+    }
+  })
+}
+export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目计划管理_项目总计划_查询数据',
+      param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&@机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function searchtable2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/api/ManufacturingCenter/QuotaFormulation.js
index 939492c8..2b3f6421 100644
--- a/src/api/ManufacturingCenter/QuotaFormulation.js
+++ b/src/api/ManufacturingCenter/QuotaFormulation.js
@@ -32,7 +32,7 @@ export function getPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=20'
     }
   })
 }
diff --git a/src/api/Outsourcing/InterBudgetaryBudgets.js b/src/api/Outsourcing/InterBudgetaryBudgets.js
index 50046a4e..ee365243 100644
--- a/src/api/Outsourcing/InterBudgetaryBudgets.js
+++ b/src/api/Outsourcing/InterBudgetaryBudgets.js
@@ -10,14 +10,13 @@ export function machine() {
     }
   })
 }
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协预算机床查询'
     }
   })
 }
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index b3cbc855..afa0a20c 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -68,7 +68,7 @@ export function getParts(Number, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协加工任务单流水号=' + Number + '=int',
+      param: '外协厂家流水号=' + Number + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js
new file mode 100644
index 00000000..5aae6564
--- /dev/null
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js
@@ -0,0 +1,125 @@
+import request from '@/utils/request'
+
+// 初始化 外协厂商
+export function initOutHelp() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
+    }
+  })
+}
+// 查询表格数据
+export function searchtable(check, num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_序间外协付款查询',
+      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询发票信息
+export function getParts(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协发票管理_查询数据',
+      param: '外协厂家流水号=' + Number + '=int',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 增加
+export function edittype(num1, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_增加数据',
+      param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+    }
+  })
+}
+// 编辑
+export function handlechange(num, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_编辑数据',
+      param: 'id=' + num + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+    }
+  })
+}
+// 删除
+export function handledelete(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协发票管理_删除数据',
+      param: 'id=' + num
+    }
+  })
+}
+
+// 查询付款数据
+export function getParts3(num, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_序间外协付款明细查询',
+      param: '外协厂家流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 外协付款增加
+export function outPay(num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_增加数据',
+      param: '外协厂家流水号=' + num1 + '&付款金额=' + num2 + '&付款日期=' + num3 + '&备注=' + num4
+    }
+  })
+}
+// 外协付款编辑
+export function edit(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_修改数据',
+      param: '外协付款流水号=' + num1 + '&付款金额=' + num2 + '&备注=' + num3
+    }
+  })
+}
+// 外协付款删除
+export function handledelete3(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外协付款计划_删除数据',
+      param: '外协付款流水号=' + num1
+    }
+  })
+}
diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index e0f7fc7c..6cb9d904 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单
+// 初始化获取已生成的外协加工任务单
 export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
   return request({
     url: '',
@@ -97,26 +97,26 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight
   })
 }
 // 外协加工任务单修改
-export function editData(Number, manufacturers, freight, documentStatus, sign, Explain) {
+export function editData(Number, manufacturers, freight, Explain) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain
     }
   })
 }
 // 成交
-export function editData1(Number, manufacturers, freight, documentStatus, sign, Explain) {
+export function editData1(Number, manufacturers, freight, Explain) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=' + documentStatus + '=int&入库标志=' + sign + '=int&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
     }
   })
 }
diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js
index f421df05..eabfa6ff 100644
--- a/src/api/Outsourcing/PreorderAssociation.js
+++ b/src/api/Outsourcing/PreorderAssociation.js
@@ -10,14 +10,13 @@ export function machine() {
     }
   })
 }
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
-      param: '项目流水号=' + num
+      name: '车间生产管理工艺_零件工艺计划_序间外协机床查询'
     }
   })
 }
diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js
index 7e9efae5..7189ec4b 100644
--- a/src/api/TechnologyCenter/CreatePackingList.js
+++ b/src/api/TechnologyCenter/CreatePackingList.js
@@ -184,7 +184,7 @@ export function getSpareData(num) {
     data: {
       type: '1',
       name: 'PDM_装箱单_备件_查询数据',
-      param: `装箱单编号=${num}`
+      param: `项目流水号=${num}&机床流水号=${num}`
     }
   })
 }
@@ -201,26 +201,26 @@ export function deleteSpareData(num) {
   })
 }
 
-export function editSpareData(name, specification, unit, number, remark, num) {
+export function editSpareData(MapNumber, name, specification, unit, number, remark, num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: 'PDM_装箱单_备件_修改数据',
-      param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
+      param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
     }
   })
 }
 
-export function addSpareData(name, specification, unit, number, remark, num) {
+export function addSpareData(MapNumber, name, specification, unit, number, remark, num, num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: 'PDM_装箱单_备件_增加数据',
-      param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}`
+      param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}&项目流水号=${num1}&机床流水号=${num2}`
     }
   })
 }
diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js
index 78f6b224..65480ad3 100644
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -242,18 +242,6 @@ export function searchMachine(project) {
     }
   })
 }
-
-export function searchMachine2(project) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_零件明细表_外购件和标准件_数据导入保存_机床_查询数据gj',
-      param: `项目=${project}`
-    }
-  })
-}
 // 查询组号
 export function searchGroupNum(project, name) {
   return request({
diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
index 70092be1..5e240d46 100644
--- a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
+++ b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=20'
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
index 0c4b846b..f0b425a4 100644
--- a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
+++ b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
@@ -8,7 +8,7 @@ export function getPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=20'
     }
   })
 }
diff --git a/src/icons/svg/OutsourcingPaymentPlanManagement2.svg b/src/icons/svg/OutsourcingPaymentPlanManagement2.svg
new file mode 100644
index 00000000..3644bfe7
--- /dev/null
+++ b/src/icons/svg/OutsourcingPaymentPlanManagement2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543302138984" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1877" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M762.503311 141.113925c-14.285355-9.653871-33.714869-5.90243-43.363623 8.393157-9.658987 14.295588-5.907547 33.709753 8.388041 43.367717 106.359376 71.861678 169.863712 191.280488 169.863712 319.443449 0 212.412784-172.811858 385.220548-385.220548 385.220548S126.956484 724.732056 126.956484 512.318248c0-128.168078 63.49922-247.586888 169.858596-319.443449 14.295588-9.658987 18.057261-29.073152 8.398274-43.363623-9.648754-14.295588-29.073152-18.052145-43.363623-8.398274C138.267087 224.602408 64.488757 363.373984 64.488757 512.318248c0 246.854201 200.827935 447.687252 447.682136 447.687252S959.859167 759.173472 959.859167 512.318248C959.859167 363.373984 886.075721 224.607524 762.503311 141.113925z" p-id="1878"></path><path d="M400.698055 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L431.931407 95.869465C431.931407 78.621639 417.946904 64.636113 400.698055 64.636113z" p-id="1879"></path><path d="M623.649869 64.636113c-17.248849 0-31.233352 13.984503-31.233352 31.233352l0 30.470989c0 17.248849 13.985526 31.233352 31.233352 31.233352 17.248849 0 31.233352-13.985526 31.233352-31.233352L654.883221 95.869465C654.883221 78.621639 640.897695 64.636113 623.649869 64.636113z" p-id="1880"></path><path d="M425.695379 227.656977c11.209296 18.047028 41.974997 48.588625 86.157265 48.588625 43.958164 0 75.100442-30.3134 86.573751-48.223305 9.302877-14.528901 5.068436-33.846876-9.455349-43.149752-14.544251-9.29776-33.846876-5.063319-43.149752 9.455349-0.121773 0.198521-13.379729 19.449981-33.968649 19.449981-20.008706 0-32.443923-18.127869-33.276894-19.373233-9.165754-14.427594-28.285207-18.799158-42.829458-9.760295C421.089477 193.749726 416.59 213.006302 425.695379 227.656977z" p-id="1881"></path><path d="M356.00311 591.05859c-17.248849 0-31.233352 13.984503-31.233352 31.233352s13.984503 31.233352 31.233352 31.233352L480.93754 653.525294l0 98.250698c0 17.248849 13.984503 31.238468 31.233352 31.238468 17.248849 0 31.233352-13.989619 31.233352-31.238468l0-98.250698 124.93443 0c17.248849 0 31.238468-13.984503 31.238468-31.233352s-13.989619-31.233352-31.238468-31.233352L543.405267 591.05859l0-83.289961 124.93443 0c17.248849 0 31.238468-13.985526 31.238468-31.233352 0-17.248849-13.989619-31.233352-31.238468-31.233352l-80.761372 0 68.041676-68.038606c12.20088-12.20088 12.20088-31.976272 0.005117-44.171012-12.195763-12.20088-31.976272-12.195763-44.171012-0.005117l-99.280144 99.276051-99.280144-99.276051c-12.190647-12.190647-31.971156-12.195763-44.171012 0.005117-12.195763 12.195763-12.195763 31.971156 0.005117 44.171012l68.041676 68.038606-80.766488 0c-17.248849 0-31.233352 13.984503-31.233352 31.233352 0 17.248849 13.984503 31.233352 31.233352 31.233352L480.93754 507.768629l0 83.289961L356.00311 591.05859z" p-id="1882"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/ProjectPlanningManagement.svg b/src/icons/svg/ProjectPlanningManagement.svg
new file mode 100644
index 00000000..033a4a6b
--- /dev/null
+++ b/src/icons/svg/ProjectPlanningManagement.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1551162791632" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1213" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M792.9 482.2H405.8c-11.4 0-21.2 9.8-21.2 21.2 0 11.4 9.8 21.2 21.2 21.2h387.1c11.4 0 21.2-9.8 21.2-21.2 0-13-9.8-21.2-21.2-21.2z m0 178.1H405.8c-11.4 0-21.2 9.8-21.2 21.2s9.8 21.2 21.2 21.2h387.1c11.4 0 21.2-9.8 21.2-21.2s-9.8-21.2-21.2-21.2zM904 248.7H626.3l-4.9-13.1c-32.7-91.5-96.4-114.3-143.7-116H118.4c-31 0-55.5 24.5-55.5 53.9v681.1c0 29.4 24.5 53.9 55.5 53.9H904c31 0 55.5-24.5 55.5-53.9v-552c0-29.4-24.5-53.9-55.5-53.9z m-785.6-50.6c0-42.5 14.7-35.9 76.8-35.9h222.1c94.7 0 119.2 21.2 137.2 52.3l13.1 32.7H118.4v-49.1z m788.8 597.7c0 62.1-21.2 63.7-73.5 63.7H191.9c-63.7 0-73.5-4.9-73.5-73.5V299.3h728.4c68.6 0 60.4 26.1 60.4 73.5v423z m-699-329.9h68.6v68.6h-68.6v-68.6z m0 181.3h68.6v68.6h-68.6v-68.6z m0 0" p-id="1214"></path></svg>
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 908de161..d45a05a4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index da432e2d..ae7686dd 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -5,14 +5,11 @@
       <el-input v-model="Partpaint" clearable size="small" style="width:200px" />
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
       <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" @click="Empty()">清空</el-button>
+      <el-button type="primary" size="small" class="el-icon-success" style="margin: 0 0 0 10px" @click="Innumber">入库</el-button>
     </el-card>
+
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        border
-        size="mini"
-        style="width: 100%;height: 650px" >
+      <el-table v-loading="listLoading" :data="tableData" border size="mini" style="width: 100%" height="650px">
         <el-table-column
           label="序号"
           align="center"
@@ -33,7 +30,6 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-
         <el-table-column label="计划数量" align="center" min-width="100">
           <template slot-scope="scope" align="center">
             <el-input v-model="tableData[scope.$index].plannumber" readonly size="small"/>
@@ -71,9 +67,8 @@
             <el-input v-model="tableData[scope.$index].note" clearable size="small"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="150">
+        <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" class="el-icon-success" @click="Innumber">入库</el-button>
             <el-button
               :disabled="scope.row.是否禁用"
               size="mini"
@@ -82,10 +77,9 @@
               @click="handleDelete(scope.$index, scope.row)">移除</el-button>
           </template>
         </el-table-column>
-
       </el-table>
-
     </el-card>
+
   </div>
 </template>
 
@@ -188,17 +182,21 @@ export default {
     },
     // 扫描查询
     getscantable() {
-      if (this.partNumber === '') {
+      if (this.partNumber === '' || this.partNumber === null) {
         this.$message.error('请输入零件号')
       } else {
         this.listLoading = true
         searchTable(this.partNumber).then(response => {
           if (response.data.length === 0) {
             this.listLoading = false
-            this.$message.warning('无此零件')
-          } else if (response.data[0].剩余数量 === 0) {
-            this.$message.warning('该零件已入库完毕')
-          } else {
+            this.$message.warning('该零件未加工完成')
+          } else if (response.data[0].考核状态 === 8) {
+            this.listLoading = false
+            this.$message.warning('该零件已入库')
+          } else if (response.data[0].考核状态 === 9) {
+            this.listLoading = false
+            this.$message.warning('该零件已出库')
+          } else if (response.data[0].考核状态 === 7) {
             for (let i = 0; i < this.tableData.length; i++) {
               if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
                 this.ace = this.ace + 1
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index fb609a94..44903572 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -37,14 +37,7 @@
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchBasciPartinfo()">基本件查询</el-button><br>
       </el-card>
         <el-card v-show="basicshow">
-          <el-table
-            v-loading="listLoading"
-            :data="tableDataBasic"
-            size="mini"
-            border
-            style="width: 100%;"
-            height="200"
-            @row-click="searchBasicPartRecord">
+          <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="200" @row-click="searchBasicPartRecord">
             <el-table-column
               label="序号"
               align="center"
@@ -321,21 +314,6 @@
           </el-table>
         </el-card>
       </el-tab-pane>
-      <!--编辑零件数量对话框-->
-      <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
-        <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
-          <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
-            <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
-          </el-form-item>
-          <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
-            <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="callOff2('form2')">取消</el-button>
-          <el-button type="primary" @click="submitChannge()">确 定</el-button>
-        </div>
-      </el-dialog>
       <el-tab-pane label="采购" name="second">
         <el-card v-show="purchaseshow">
           <el-radio-group
@@ -1150,6 +1128,21 @@
         </el-card>
       </el-tab-pane>
     </el-tabs>
+    <!--编辑零件数量对话框-->
+    <el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
+        <el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
+          <el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="修改原因" prop="AlterReason" label-width="100px">
+          <el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff2('form2')">取消</el-button>
+        <el-button type="primary" @click="submitChannge()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1570,12 +1563,12 @@ export default {
         } else {
           this.$message.error('添加失败')
         }
-        this.form = {}
+        this.form.safeNumber = ''
       })
     },
     // 重置表单
     callOff(formName) {
-      this.form = {}
+      this.form.safeNumber = ''
       this.dialogFormVisible2 = false
       this.$refs[formName].resetFields()
     },
@@ -1734,7 +1727,8 @@ export default {
       })
     },
     AlterNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1753,7 +1747,8 @@ export default {
       this.material = row.材料
     },
     AlterBasicNumber(row) {
-      this.form2 = []
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1764,12 +1759,12 @@ export default {
       this.receive = row.收件信息id
       this.materiallocate = row.物料与货位对照流水号
       this.materialType = row.零件类型
-      this.dialogFormVisible = true
       this.name = row.零件名称
       this.mode = row.物料规格
       this.picture = row.零件图号
       this.type = row.物料型号
       this.material = row.材料
+      this.dialogFormVisible = true
     },
     submitChannge() {
       CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => {
@@ -1784,7 +1779,8 @@ export default {
     },
     callOff2() {
       this.dialogFormVisible = false
-      this.form2 = {}
+      this.form2.AlterReason = ''
+      this.form2.Number = ''
     }
   }
 }
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index e1925c75..eae2fabc 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -157,157 +157,157 @@
 </template>
 
 <script>
-  import { initProject, searchmachine, searchTeam, searchPart, searchPeople, outlinePartOut, outRecord } from '@/api/Inventory/OfflinePartOut'
-  import { mapGetters } from 'vuex'
-  export default {
-    data() {
-      return {
-        Project: [],
-        ProjectValue_check: 1,
-        MachineValue: ' ',
-        Machine: [],
-        MachineValue_check: 1,
-        GroupNumValue: ' ',
-        GroupNumValue_check: 1,
-        GroupNum: [],
-        tableDataBasic: [],
-        People: [],
-        PeopleValue: '',
-        dialogFormVisible: false,
-        form: {
-          ProjectValue: '',
-          DirectNumber: '',
-          DirectNote: ''
-        },
-        rules: { // 表单验证规则
-          ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
-          DirectNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }],
-          DirectNote: [{ required: true, message: '请输入直达件备注', trigger: 'change' }]
-        },
-        contractNumber: '',
-        locateNumber: '',
-        materialNumber: '',
-        PeopleNumber: '',
-        tableDataOut: [],
-        listLoading: '',
-        listLoading1: '',
-        partnumber: '',
-        offlineContract: null // 离线合同编号
+import { initProject, searchmachine, searchTeam, searchPart, searchPeople, outlinePartOut, outRecord } from '@/api/Inventory/OfflinePartOut'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      Project: [],
+      ProjectValue_check: 1,
+      MachineValue: ' ',
+      Machine: [],
+      MachineValue_check: 1,
+      GroupNumValue: ' ',
+      GroupNumValue_check: 1,
+      GroupNum: [],
+      tableDataBasic: [],
+      People: [],
+      PeopleValue: '',
+      dialogFormVisible: false,
+      form: {
+        ProjectValue: '',
+        DirectNumber: '',
+        DirectNote: ''
+      },
+      rules: { // 表单验证规则
+        ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
+        DirectNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }],
+        DirectNote: [{ required: true, message: '请输入直达件备注', trigger: 'change' }]
+      },
+      contractNumber: '',
+      locateNumber: '',
+      materialNumber: '',
+      PeopleNumber: '',
+      tableDataOut: [],
+      listLoading: '',
+      listLoading1: '',
+      partnumber: '',
+      offlineContract: null // 离线合同编号
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'token'
+    ])
+  },
+  created() {
+    this.searchPurchasePartinfo()
+    this.fetchData()
+    this.searchPeopleData()
+    this.getpeopleid()
+  },
+  methods: {
+    fetchData() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
+    },
+    // 获取人员编号
+    getpeopleid() {
+      this.PeopleNumber = this.id
+    },
+    searchMachine() { // 查询机床
+      if (this.ProjectValue === '') {
+        this.ProjectValue_check = 0
       }
-    },
-    computed: {
-      ...mapGetters([
-        'id',
-        'token'
-      ])
-    },
-    created() {
-      this.searchPurchasePartinfo()
-      this.fetchData()
-      this.searchPeopleData()
-      this.getpeopleid()
-    },
-    methods: {
-      fetchData() {
-        this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
-      },
-      // 获取人员编号
-      getpeopleid() {
-        this.PeopleNumber = this.id
-      },
-      searchMachine() { // 查询机床
-        if (this.ProjectValue === '') {
-          this.ProjectValue_check = 0
-        }
-        searchmachine(this.ProjectValue_check, this.form.ProjectValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machine.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      },
-      searchGroupList() { // 查询组号
-        searchTeam(this.MachineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.GroupNum.push({
-              label: response.data[i].组件名称,
-              value: response.data[i].组件流水号
-            })
-          }
-        })
-      },
-      // 离线件查询
-      searchPurchasePartinfo() {
-        this.listLoading = true
-        this.tableDataBasic = []
-        searchPart(this.offlineContract).then(response => {
-          this.tableDataBasic = response.data
-          this.listLoading = false
-        })
-      },
-      // 离线记录查询
-      searchoutRecord(row) {
-        this.contractNumber = row.离线合同明细流水号
-        this.listLoading1 = true
-        outRecord(this.contractNumber).then(response => {
-          this.tableDataOut = response.data
-          this.listLoading1 = false
-        })
-      },
-      // 打开表单
-      parOut(row) {
-        this.form = []
-        this.MachineValue = ''
-        this.GroupNumValue = ''
-        this.dialogFormVisible = true
-        this.contractNumber = row.离线合同明细流水号
-        this.locateNumber = row.货位流水号
-        this.materialNumber = row.物料流水号
-        this.partnumber = row.货位存量
-        this.searchoutRecord()
-      },
-      // 重置表单
-      callOff() {
-        this.form.DirectNumber = ''
-        this.form.DirectNumberx = ''
-        this.form.DirectNote = ''
-        this.dialogFormVisible = false
-      },
-      searchPeopleData() { // 查询人员
-        searchPeople(this.token).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.People.push({
-              label: response.data[i].姓名,
-              value: response.data[i].考勤编号
-            })
-          }
-        })
-      },
-      // 离线外购件出库
-      addDirectPartm() {
-        if (this.partnumber < this.form.DirectNumber) {
-          this.$message.error('请正确输入数量')
-        } else {
-          outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('零件出库成功')
-              this.dialogFormVisible = false
-              this.searchPurchasePartinfo()
-              outRecord(this.contractNumber).then(response => {
-                this.tableDataOut = response.data
-                this.listLoading1 = false
-              })
-            } else {
-              this.$message.error('零件出库失败')
-            }
+      searchmachine(this.ProjectValue_check, this.form.ProjectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
           })
-          this.dialogFormVisible = false
         }
+      })
+    },
+    searchGroupList() { // 查询组号
+      searchTeam(this.MachineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.GroupNum.push({
+            label: response.data[i].组件名称,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    // 离线件查询
+    searchPurchasePartinfo() {
+      this.listLoading = true
+      this.tableDataBasic = []
+      searchPart(this.offlineContract).then(response => {
+        this.tableDataBasic = response.data
+        this.listLoading = false
+      })
+    },
+    // 离线记录查询
+    searchoutRecord(row) {
+      this.contractNumber = row.离线合同明细流水号
+      this.listLoading1 = true
+      outRecord(this.contractNumber).then(response => {
+        this.tableDataOut = response.data
+        this.listLoading1 = false
+      })
+    },
+    // 打开表单
+    parOut(row) {
+      this.form = []
+      this.MachineValue = ''
+      this.GroupNumValue = ''
+      this.dialogFormVisible = true
+      this.contractNumber = row.离线合同明细流水号
+      this.locateNumber = row.货位流水号
+      this.materialNumber = row.物料流水号
+      this.partnumber = row.货位存量
+      this.searchoutRecord()
+    },
+    // 重置表单
+    callOff() {
+      this.form.DirectNumber = ''
+      this.form.DirectNumberx = ''
+      this.form.DirectNote = ''
+      this.dialogFormVisible = false
+    },
+    searchPeopleData() { // 查询人员
+      searchPeople(this.token).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.People.push({
+            label: response.data[i].姓名,
+            value: response.data[i].考勤编号
+          })
+        }
+      })
+    },
+    // 离线外购件出库
+    addDirectPartm() {
+      if (this.partnumber < this.form.DirectNumber) {
+        this.$message.error('请正确输入数量')
+      } else {
+        outlinePartOut(this.contractNumber, this.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.MachineValue, this.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('零件出库成功')
+            this.dialogFormVisible = false
+            this.searchPurchasePartinfo()
+            outRecord(this.contractNumber).then(response => {
+              this.tableDataOut = response.data
+              this.listLoading1 = false
+            })
+          } else {
+            this.$message.error('零件出库失败')
+          }
+        })
+        this.dialogFormVisible = false
       }
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index d4df1b65..2b5d6148 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -45,6 +45,11 @@
           align="center"
           type="index"
           width="50"/>
+        <el-table-column label="零件图号" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -87,8 +92,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
-            <el-button :disabled="scope.row.是否出库" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
+            <el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
+            <el-button :disabled="parseInt(scope.row.是否出库)" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -286,15 +291,13 @@ export default {
         this.listLoading = false
       })
     },
-    // 查询交换单
-    searchExchange() {
-      ExchangeOut(this.pickingListNumberx).then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
-        }
-        this.tableDataExchange = data
-      })
+    // 选择领料单
+    chooseListinfor(row) {
+      this.pickingListNumberx = row.领料单流水号
+      this.getpicikingPeople = row.领料人流水号
+      console.log(this.pickingListNumberx, 223344)
+      this.searchListDetailt()
+      this.searchExchange()
     },
     // 查询领料单明细
     searchListDetailt() {
@@ -309,13 +312,15 @@ export default {
         this.listLoading1 = false
       })
     },
-    // 选择领料单
-    chooseListinfor(row) {
-      this.pickingListNumberx = row.领料单流水号
-      this.getpicikingPeople = row.领料人流水号
-      console.log(this.pickingListNumberx, 223344)
-      this.searchListDetailt()
-      this.searchExchange()
+    // 查询交换单
+    searchExchange() {
+      ExchangeOut(this.pickingListNumberx).then(response => {
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
+        }
+        this.tableDataExchange = data
+      })
     },
     // 出库
     partOut(row) {
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 36c46677..17957901 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -6,6 +6,7 @@
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchListinfor()">查询</el-button>
       <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addListinfor()">创建</el-button>
     </el-card>
+
     <el-card>
       <el-table
         v-loading="listLoading2"
@@ -121,6 +122,7 @@
         </el-table-column>
       </el-table>
     </el-card>
+
     <el-card>
       <span>项目名称:</span>
       <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -148,6 +150,7 @@
       </el-select>
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button><br>
     </el-card>
+
     <el-card>
       <el-table
         v-loading="listLoading"
@@ -617,7 +620,6 @@ export default {
     // 获取人员编号
     getpeopleid() {
       this.picikingPeople = this.id
-      console.log(this.picikingPeople)
     },
     searchMachine() { // 查询机床
       this.MachineValue = ''
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 0073eb2c..fe0d40b5 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -185,11 +185,14 @@ export default {
       } else {
         this.a = 0
         for (let i = 0; i < this.tableData2.length; i++) {
-          edit(this.tableData2[i].工艺计划流水号)
-          this.a = this.a + 1
-        }
-        if (this.a === this.tableData2.length) {
-          this.searchTable()
+          edit(this.tableData2[i].工艺计划流水号).then(response => {
+            this.a += parseInt(response.data[0].result)
+            if (this.a === this.tableData2.length) {
+              this.pageSize = 10
+              this.pageCurrent = 1
+              this.searchTable()
+            }
+          })
         }
       }
     },
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index e8943e1f..a8d981ee 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -51,8 +51,10 @@
       <el-table
         v-loading="loading"
         :data="tableData"
+        :summary-method="getSummaries"
         style="width: 100%;max-height: 600px"
-        height="300"
+        height="400"
+        show-summary
         highlight-current-row
         border>
         <el-table-column align="center" label="序号" type="index" width="60"/>
@@ -114,7 +116,7 @@
         :data="tableDataPurchase"
         border
         style="width: 100%;"
-        height="300">
+        height="400">
         <el-table-column
           label="序号"
           align="center"
@@ -179,7 +181,7 @@
         :data="tableData1"
         border
         style="width: 100%;"
-        height="300">
+        height="400">
         <el-table-column
           label="序号"
           align="center"
@@ -424,6 +426,8 @@ export default {
       total4: 0,
       total5: 0,
       title: '',
+      totalNum: 0,
+      totalNum1: 0,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
       dialogFormVisible4: false,
@@ -482,6 +486,7 @@ export default {
   },
   methods: {
     searchData() {
+      this.totalNum = 0
       this.loading = true
       this.listLoading1 = true
       this.listLoading2 = true
@@ -518,10 +523,11 @@ export default {
         }
         searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
           for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== null) {
+            if (response.data.rows[i].入库时间 !== '') {
+              this.totalNum += 1
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
             }
-            if (response.data.rows[i].计划完成时间 !== null) {
+            if (response.data.rows[i].计划完成时间 !== '') {
               response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
             }
           }
@@ -622,6 +628,7 @@ export default {
       this.dialogFormVisible3 = false
     },
     handleSizeChange(val) {
+      this.totalNum = 0
       this.pageCurrent = 1
       this.pageSize = val
       if (this.entryNameValue !== null && this.entryNameValue !== '') {
@@ -657,10 +664,11 @@ export default {
         }
         searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
           for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== null) {
+            if (response.data.rows[i].入库时间 !== '') {
+              this.totalNum += 1
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
             }
-            if (response.data.rows[i].计划完成时间 !== null) {
+            if (response.data.rows[i].计划完成时间 !== '') {
               response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
             }
           }
@@ -674,6 +682,7 @@ export default {
       }
     },
     handleCurrentChange(val) {
+      this.totalNum = 0
       this.pageCurrent = val
       if (this.entryNameValue !== null && this.entryNameValue !== '') {
         if (this.entryNameValue !== null && this.entryNameValue !== '') {
@@ -708,10 +717,11 @@ export default {
         }
         searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
           for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].入库时间 !== null) {
+            if (response.data.rows[i].入库时间 !== '') {
+              this.totalNum += 1
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
             }
-            if (response.data.rows[i].计划完成时间 !== null) {
+            if (response.data.rows[i].计划完成时间 !== '') {
               response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
             }
           }
@@ -919,6 +929,39 @@ export default {
         this.loading = false
         this.$message.warning('请先选择项目')
       }
+    },
+    getSummaries(param) {
+      const { columns } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 4) {
+          sums[index] = '总件数'
+          return
+        } else if (index === 5) {
+          sums[index] = this.total + '件'
+        } else if (index === 6) {
+          sums[index] = '入库数量'
+        } else if (index === 7) {
+          sums[index] = this.totalNum + ' 件'
+          // const values = data.map(item => item['入库时间'])
+          // console.log(values)
+          // if (!values.every(value => value !== '')) {
+          //   sums[index] = values.reduce((prev, curr) => {
+          //     const value = curr
+          //     console.log(value)
+          //     if (value !== '') {
+          //       return this.totalNum1 + 1
+          //     } else {
+          //       return this.totalNum1
+          //     }
+          //   }, '')
+          //   sums[index] += '件'
+          // } else {
+          //   sums[index] = 'N/A'
+          // }
+        }
+      })
+      return sums
     }
   }
 }
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index dff9fd8a..e80ac537 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -24,7 +24,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="分组">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
               <el-option
                 v-for="item in Num"
                 :key="item.value"
@@ -321,7 +321,7 @@
           <el-col :span="14"/>
           <el-form-item >
             <el-button size="small" @click="callOff('form')">取消</el-button>
-            <el-button size="small" type="primary" @click="submit('form')">确 定</el-button>
+            <el-button size="small" type="primary" @click="submit('form')">确定</el-button>
           </el-form-item>
         </el-row>
       </el-form>
@@ -528,10 +528,10 @@ export default {
         this.$message.error('请选择机床组号')
       } else {
         this.listLoading = true
-        this.tableData = []
         this.tableData1 = []
         getTable(this.NumValue, this.pageList, this.pageSize).then(response => {
           this.total = parseInt(response.data.total)
+          this.tableData = []
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
               零件图号: response.data.rows[i].零件图号,
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 25c28f09..71ecd628 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -3,7 +3,7 @@
 
     <el-card>
       <span>工位号:</span>
-      <el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;">
+      <el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;" @change="searchTable()">
         <el-option
           v-for="item in Machine"
           :key="item.value"
@@ -87,7 +87,7 @@
         </el-table-column>
         <el-table-column property="name" label="调序权限" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.调序权限===1" type="success" size="small">已开放</el-tag>
+            <el-tag v-if="scope.row.调序权限==='1'" type="success" size="small">已开放</el-tag>
             <el-tag v-else type="info" size="small">未开放</el-tag>
           </template>
         </el-table-column>
@@ -129,6 +129,11 @@ export default {
       total: 0
     }
   },
+  watch: {
+    MachineValue(val) {
+      this.searchTable()
+    }
+  },
   created() {
     this.Jurisdiction()
     this.fetchData()
@@ -145,6 +150,8 @@ export default {
             value: response.data[i].MES终端号
           })
         }
+      }).then(() => {
+        this.MachineValue = this.Machine[0].value
       })
     },
     searchTable() {
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 140c71a6..19203fd9 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -1101,7 +1101,7 @@ export default {
           this.MaterialName[i] = val[i].零件名称
           this.PartToolNumber[i] = val[i].零件图号
           this.Material[i] = val[i].材料
-          this.NumberOfParts[i] = val[i].需求数量
+          this.NumberOfParts[i] = val[i].零件数量
           this.ReMarks[i] = val[i].零件备注
         }
       } else if (this.PartType === '外购件') {
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index dcfe4c35..136a33b1 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -41,13 +41,10 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
-      </el-button>
+      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询</el-button>
       <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
-      </el-button>
-      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
-      </el-button>
+      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
+      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>
       <div v-show="isShow">
         <span>种类:</span>
         <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
@@ -82,8 +79,8 @@
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
-            ∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>
+            <!--∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()-->
+            <!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
           </el-col>
 
           <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -144,16 +141,11 @@
         <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin: 10px">
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
-          <el-button v-if="false" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
-          </el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
-          </el-button>
-          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
-          </el-button>
-          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
-          </el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
-          </el-button>
+          <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有</el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺</el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除</el-button>
+          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存</el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
         </el-button-group>
       </el-row>
       <el-table
@@ -274,7 +266,7 @@
     <el-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
       <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
         <el-form-item label="工艺名称分类">
-          <el-select v-model="processNameClassValue" placeholder="分类" size="small" @change="cChange()">
+          <el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()">
             <el-option
               v-for="item in processNameClass"
               :key="item.value"
@@ -283,7 +275,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工艺名称">
-          <el-select v-model="processNameValue" placeholder="名称" size="small" @change="nChange()">
+          <el-select v-model="processNameValue" filterable placeholder="名称" size="small" @change="nChange()">
             <el-option
               v-for="item in processName"
               :key="item.value"
@@ -306,72 +298,29 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible" title="典型工艺选择" center width="800px">
+    <el-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
       <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺零件分类">
-              <el-select
-                v-model="typicalClassValue"
-                placeholder="分类"
-                size="small"
-                style="width:150px"
-                @change="classChange()">
-                <el-option
-                  v-for="item in typicalClass"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-input v-model="partNameValue1" size="small" placeholder="输入零件图号" style="width: 150px" clearable/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 20px" @click="searchProcess()">查询</el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="零件名称">
-              <el-select
-                id="name"
-                v-model="partNameValue1"
-                placeholder="零件名称"
-                size="small"
-                style="width:150px"
-                @change="nameChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button type="success" size="small" icon="el-icon-search" @click="searchProcess()">查询</el-button>
-          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺号">
-              <el-select
-                id="num"
-                v-model="processNumValue"
-                placeholder="工艺号"
-                style="width:150px"
-                size="small"
-                @change="numChange()">
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-select id="num" v-model="processNumValue" placeholder="零件图号" style="width:150px" size="small" @change="numChange()">
                 <el-option
                   v-for="item in partName1"
                   :key="item.value"
-                  :label="item.num"
+                  :label="item.label"
                   :value="item.value"/>
               </el-select>
+              <el-button size="small" style="margin-left: 20px" @click="processCopy()">工艺拷贝</el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="备注">
-              <el-input v-model="remark" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
-          </el-col>
         </el-row>
         <el-table
           :data="tableData2"
@@ -381,7 +330,7 @@
           size="mini">
           <el-table-column align="center" label="工艺序号" width="80">
             <template slot-scope="scope">
-              {{ scope.row.工艺序号 }}
+              {{ scope.row.工序顺序 }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="工艺名称" width="180">
@@ -453,6 +402,7 @@
                 v-model="tuhaoValue"
                 placeholder="零件图号"
                 size="small"
+                filterable
                 style="width:150px"
                 @change="numChange1()">
                 <el-option
@@ -472,12 +422,7 @@
             <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
           </el-col>
         </el-row>
-        <el-table
-          :data="tableData4"
-          style="width: 97%;max-height: 250px;margin-top: 15px"
-          size="mini"
-          border
-          height="250px">
+        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
           <el-table-column align="center" label="工艺序号" width="80">
             <template slot-scope="scope">
               {{ scope.row.工序顺序 }}
@@ -552,6 +497,8 @@
 <script>
 import '@/icon/iconfont.css'
 import {
+  numChange,
+  searchProcess11,
   WeightCopy,
   initCraftmen,
   getPartnames1,
@@ -562,8 +509,6 @@ import {
   searchMaterial,
   typicalProcess,
   initTolerance,
-  FcK,
-  searchProcess,
   searchWYgongyi,
   gongyiCopy,
   initPerson,
@@ -869,7 +814,6 @@ export default {
     insertThestring(NewCode) {
       this.lastFocusText = event.srcElement
       this.lastFocusText.focus()
-      console.log(this.lastFocusText)
       var sel = document.selection.createRange()
       sel.text = NewCode
       return
@@ -1099,83 +1043,42 @@ export default {
       this.remark1 = ''
       this.tuhaoValue = ''
     },
-    classChange() { // 当分类改变时，获取零件名称和典型工艺流水号
-      this.partNameValue1 = ''
+    // 典艺工艺查询
+    searchProcess() {
       this.processNumValue = ''
-      for (let i = 0; i < this.typicalClass.length; i++) {
-        if (this.typicalClassValue === this.typicalClass[i].value) {
-          this.serialNumValue1 = this.serialNum1[i].value
-          FcK(this.serialNumValue1).then(response => {
-            this.partName1 = []
-            this.processNum = []
-            this.remark = response.data[0].备注
-            for (let j = 0; j < response.data.length; j++) {
-              this.partName1.push({
-                label: response.data[j].典型工艺名称,
-                num: response.data[j].典型工艺号,
-                value: response.data[j].典型工艺流水号
-              })
-            }
+      this.partName1 = []
+      this.tableData2 = []
+      searchProcess11(this.partNameValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partName1.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].典艺流水号
           })
         }
-      }
+      })
     },
-    nameChange() { // 当零件名称改变时，典型工艺号改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.partNameValue1 === this.partName1[i].value) {
-          this.processNumValue = this.partName1[i].num
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    numChange() { // 当典型工艺号改变时，零件名称改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.processNumValue === this.partName1[i].value) {
-          this.partNameValue1 = this.partName1[i].value
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    searchProcess() { // 典艺工艺查询
-      if (this.typicalClassValue === '') {
-        this.serialNumValue1check = false
-      } else {
-        this.serialNumValue1check = true
-      }
-
-      if (this.partNameValue1 === '') {
-        this.partNameValue1check = false
-      } else {
-        this.partNameValue1check = true
-      }
-
-      if (this.processNumValue === '') {
-        this.processNumValuecheck = false
-      } else {
-        this.processNumValuecheck = true
-      }
-      this.tableData2 = []
-      searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
+    // 典艺选择查表格
+    numChange() {
+      numChange(this.processNumValue).then(response => {
         this.tableData2 = response.data
       })
     },
-    processCopy() { // 典艺工艺拷贝
+    // 典艺工艺拷贝
+    processCopy() {
       if (this.partNumValue === '') {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
         this.dialogFormVisible = false
-      } else if (this.partNameValue1 === '') {
-        this.$message.error('请选择零件名称')
+      } else if (this.processNumValue === '') {
+        this.$message.error('请选择零件图号')
       } else {
         for (let i = 0; i < this.tableData2.length; i++) {
           this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
           this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
           this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
-          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
-          })
-          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
-          })
-          this.dialogFormVisible = false
+          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求)
+          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级)
         }
+        this.dialogFormVisible = false
       }
     },
     searchProcess1() { // 完艺工艺查询
@@ -1216,12 +1119,13 @@ export default {
       if (this.partNumValue === '') {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
       } else {
-        gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
+        gongyiCopy(this.num, this.partNumValue).then(res => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
           this.searchDetail()
         })
       }
     },
-    numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+    // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+    numChange1() {
       this.remark1 = ''
       this.tableData4 = null
       for (let i = 0; i < this.tuhao.length; i++) {
@@ -1310,8 +1214,7 @@ export default {
       this.str = this.str + this.processRequestValue
       this.tableData[this.index].工艺要求 = this.str
       this.dialogFormVisible2 = false
-      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
-      })
+      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求)
     },
     calTol() { // 计算公差
       this.tolerance = ''
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 17b6b8ab..60ef6e27 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -32,7 +32,8 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;height: 550px;"
+        style="width: 100%;"
+        height="580"
         highlight-current-row
         border
         @selection-change="handleSelectionChange">
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 144c8ffd..52ddebc1 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -460,8 +460,17 @@ export default {
                 if (response.data[k].工艺计划流水号 === this.liushuihao) {
                   this.process[i][k] = response.data[k].工艺名称简称
                   this.planDate[i][k] = response.data[k].计划日期_短
-                  this.worker[i][k] = response.data[k].员工姓名
                   this.realDate[i][k] = response.data[k].完成日期_短
+                  if (response.data[k].工艺编号 === 29) {
+                    response.data[k].员工姓名 = '备料'
+                  }
+                  if (response.data[k].工序间是否外协 === 2) {
+                    response.data[k].员工姓名 = '外协'
+                  }
+                  if (response.data[k].员工姓名 === '超级管理员') {
+                    response.data[k].员工姓名 = '无'
+                  }
+                  this.worker[i][k] = response.data[k].员工姓名
                   if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库
                     this.colorCode[i][k] = 'grey'
                   } else {
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index fc808831..6df8260a 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -319,8 +319,7 @@
             style="width: 150px;float: left"
             height="400"
             accordion
-            @node-click="handleNodeClick"
-          />
+            @node-click="handleNodeClick"/>
         </div>
         <el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
           <el-table-column label="考勤编号" align="center" >
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 2369f17c..5e853f2b 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -621,6 +621,7 @@ export default {
   directives: { elDragDialog },
   data() {
     return {
+      bianliang1: [],
       count: 0,
       是否扫描: false,
       dataX1: [], // 图表1横坐标
@@ -1202,7 +1203,6 @@ export default {
         if (this.零件图号.length !== 0) {
           for (let i = 0; i < this.零件图号.length; i++) {
             selection2(this.工艺计划流水号[i]).then(response => {
-              console.log(response.data, 2)
               for (let k = 0; k < response.data.length; k++) {
                 this.process[i][k] = response.data[k].工艺名称简称
                 this.planDate[i][k] = response.data[k].计划日期_短
@@ -1438,19 +1438,15 @@ export default {
     },
     // 虚拟排产
     Discharge() {
-      this.result1 = 0
       for (let i = 0; i < this.tableData1.length; i++) {
-        discharge(this.tableData1[i].工艺计划流水号).then(response => {
-          this.result1 += parseInt(response.data[0].result)
-          if (this.result1 === this.tableData1.length) {
-            this.result1 = 0
-            this.total1 = 0
-            this.pageSize1 = 10
-            this.pageList1 = 1
-            this.Selection1()
-          }
-        })
+        this.bianliang1.push(this.tableData1[i].工艺计划流水号)
       }
+      discharge(this.bianliang1).then(response => {
+        this.total1 = 0
+        this.pageSize1 = 10
+        this.pageList1 = 1
+        this.Selection1()
+      })
     },
     // 4.1 确定零件计划
     Plan() {
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
new file mode 100644
index 00000000..2518359c
--- /dev/null
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <div>
+    <el-card>
+      <el-row>
+        <span>项目名称:</span>
+        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
+          <el-option
+            v-for="item in project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>机床名称:</span>
+        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
+          <el-option
+            v-for="item in toolNum"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>客户名称:</span>
+        <el-select v-model="CustomerNameValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="客户名称">
+          <el-option
+            v-for="item in CustomerName"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+      </el-row>
+      <el-row>
+        <span>签订日期:</span>
+        <el-date-picker v-model="time_SignStart" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>~
+        <el-date-picker v-model="time_SignFinish" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
+        <span>交货期:</span>
+        <el-date-picker v-model="time_deliveryStart" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>~
+        <el-date-picker v-model="time_deliveryFinish" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
+        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column min-width="300px" label="项目编号" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.项目编号" class="edit-input" size="small"/>
+            </template>
+            <span v-else>{{ scope.row.项目编号 }}</span>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="项目编号" align="center" width="220px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.项目编号 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="项目名称" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.机床名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" width="100px">
+          <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">
+          <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">
+          <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="操作" width="300px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.edit" type="success" size="small" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">保存</el-button>
+            <el-button v-else type="primary" size="small" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { getProject, getCustomerName, getToolNum, searchtable } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+export default {
+  data() {
+    return {
+      time_SignStart: '', // 签订开始
+      time_SignFinish: '', // 签订结束
+      time_deliveryStart: '', // 交货开始
+      time_deliveryFinish: '', // 交货结束
+      projectValue: '',
+      project: [], // 项目名称
+      CustomerNameValue: '',
+      CustomerName: [], // 客户名称
+      toolNumValue: '',
+      toolNum: [], // 机床
+      loading: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.fetchData()
+    this.getCustomerName()
+    this.searchTable()
+  },
+  methods: {
+    cancelEdit(row) {
+      row.title = row.originalTitle
+      row.edit = false
+      this.$message({
+        message: 'The title has been restored to the original value',
+        type: 'warning'
+      })
+    },
+    confirmEdit(row) {
+      row.edit = false
+      row.originalTitle = row.title
+      this.$message({
+        message: 'The title has been edited',
+        type: 'success'
+      })
+    },
+    fetchData() {
+      this.projectValue = ''
+      this.project = []
+      getProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+    },
+    getCustomerName() {
+      this.CustomerNameValue = ''
+      this.CustomerName = []
+      getCustomerName().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.CustomerName.push({
+            label: response.data[i].客户名称,
+            value: response.data[i].客户流水号
+          })
+        }
+      })
+    },
+    typeChange() {
+      this.toolNumValue = ''
+      this.toolNum = []
+      getToolNum().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.toolNum.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      this.tableData = []
+      if (this.projectValue !== '' && this.projectValue !== null) { this.projectValuecheck = 1 } else { this.projectValuecheck = 0 }
+      if (this.CustomerNameValue !== '' && this.CustomerNameValue !== null) { this.CustomerNameValuecheck = 1 } else { this.CustomerNameValuecheck = 0 }
+      if (this.toolNumValue !== '' && this.toolNumValue !== null) { this.toolNumValuecheck = 1 } else { this.toolNumValuecheck = 0 }
+      if (this.time_SignStart !== '' && this.time_SignStart !== null && this.time_SignFinish !== '' && this.time_SignFinish) { this.time_Signcheck = 1 } else { this.time_Signcheck = 0 }
+      if (this.time_deliveryStart !== '' && this.time_deliveryStart !== null && this.time_deliveryFinish !== '' && this.time_deliveryFinish) { this.time_deliverycheck = 1 } else { this.time_deliverycheck = 0 }
+      searchtable(this.projectValuecheck, this.projectValue, this.CustomerNameValuecheck, this.CustomerNameValue, this.toolNumValuecheck, this.toolNumValue, this.time_Signcheck, this.time_deliveryStart, this.time_deliveryFinish, this.time_deliverycheck, this.time_deliveryStart, this.time_deliveryFinish, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        this.loading = false
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
index 22dac643..f7dfed94 100644
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -15,7 +15,7 @@
             :value="item.value"/>
         </el-select>
         <span style="margin: 10px">零件号:</span>
-        <el-select v-model="partNumValue" size="small" filterable placeholder="零件号" style="margin: 10px">
+        <el-select v-model="partNumValue" size="small" filterable placeholder="零件号" style="margin: 10px" @change="typeChange()">
           <el-option
             v-for="item in partNum"
             :key="item.value"
@@ -26,60 +26,41 @@
         <span v-if="radio === 1" style="color: #53A3F7;font-size: 14px"> 未编制的数量{{ partNum.length }}</span>
         <span v-if="radio === 2" style="color: #53A3F7;font-size: 14px"> {{ shuliang }}</span>
       </div>
-
       <div>
         <span>种类:</span>
-        <el-input
-          v-model="typeValue"
-          size="small"
-          placeholder="种类"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="typeValue" size="small" placeholder="种类" readonly style="margin: 10px;width:180px"/>
         <span>零件名称:</span>
-        <el-input
-          v-model="partName"
-          size="small"
-          placeholder="零件名称"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="partName" size="small" placeholder="零件名称" readonly style="margin: 10px;width:180px"/>
         <span>投产总数量:</span>
-        <el-input
-          v-model="batchNum"
-          size="small"
-          placeholder="投产总数量"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="batchNum" size="small" placeholder="投产总数量" readonly style="margin: 10px;width:180px"/>
         <span>材质:</span>
-        <el-input
-          v-model="material"
-          size="small"
-          placeholder="材质"
-          readonly
-          style="margin: 10px;width:180px"/>
+        <el-input v-model="material" size="small" placeholder="材质" readonly style="margin: 10px;width:180px"/>
+        <el-button v-if="radio === 2" type="primary" icon="el-icon-cjn-09" size="small" @click="ADD">保存</el-button>
+        <el-button v-if="radio === 1" type="primary" icon="el-icon-cjn-09" size="small" @click="ADD1">保存</el-button>
       </div>
     </el-card>
     <el-card>
       <div>
-        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px">
+        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px" size="small">
           <el-table-column type="index" label="序号" width="50" align="center"/>
           <el-table-column prop="name" label="工艺名称" width="180" align="center">
             <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].name" style="width:150px" placeholder="工艺名称" readonly/>
+              <el-input v-model="tableData[scope.$index].name" style="width:150px" size="small" placeholder="工艺名称" readonly/>
             </template>
           </el-table-column>
           <el-table-column prop="request" label="工艺要求" align="center">
             <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].request" :rows="1" placeholder="工艺要求" type="textarea" readonly/>
+              <el-input v-model="tableData[scope.$index].request" :rows="1" size="small" placeholder="工艺要求" type="textarea" readonly/>
             </template>
           </el-table-column>
           <el-table-column prop="singleton" label="单件" width="180" align="center">
             <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].singleton" :readonly="tableData[scope.$index].name===''" style="width:150px" placeholder="单件"/>
+              <el-input v-model="tableData[scope.$index].singleton" :readonly="tableData[scope.$index].name===''" style="width:150px" size="small" placeholder="单件"/>
             </template>
           </el-table-column>
           <el-table-column prop="Settlement" label="准结" width="180" align="center">
             <template slot-scope="scope">
-              <el-input v-model="tableData[scope.$index].Settlement" :readonly="tableData[scope.$index].name===''" style="width:150px" placeholder="准结"/>
+              <el-input v-model="tableData[scope.$index].Settlement" :readonly="tableData[scope.$index].name===''" style="width:150px" size="small" placeholder="准结"/>
             </template>
           </el-table-column>
           <el-table-column v-if="isShow" prop="budget" label="外协预算" width="180" align="center">
@@ -88,9 +69,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-button v-if="radio === 2" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="ADD">保存</el-button>
-        <el-button v-if="radio === 1" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="ADD1">保存</el-button>
-
       </div>
     </el-card>
   </div>
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index d08953ef..f2855422 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -8,7 +8,7 @@
     </el-card>
 
     <el-card>
-      <el-table :data="List" border size="small">
+      <el-table :data="List" border size="small" height="500px">
         <el-table-column label="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -111,7 +111,7 @@
           </el-col>
           <el-col :span = "12">
             <el-form-item label="设备加工工艺" prop="设备加工工艺" >
-              <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" size="small" style="width:200px" clearable >
+              <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" filterable size="small" style="width:200px" clearable >
                 <el-option
                   v-for="item in processingName"
                   :key="item.value"
@@ -311,7 +311,6 @@ export default {
             type: 'success'
           })
           this.dialogFormVisible = false
-          this.title = ''
           this.fetchData()
         } else {
           this.$message.error('信息添加失败')
@@ -390,3 +389,8 @@ export default {
   }
 }
 </script>
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 1f04e907..a5ae2b45 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -3,26 +3,36 @@
 
     <el-card>
       <el-row>
-        <el-radio-group v-model="radio" style="margin: 10px;" @change="radioChange">
+        <el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange">
           <el-radio :label="1">未编制</el-radio>
           <el-radio :label="2">已编制</el-radio>
         </el-radio-group>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--<span>项目名称:</span>-->
+        <!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
+        <!--<el-option-->
+        <!--v-for="item in entryName"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>机床名称:</span>
-        <el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
           <el-option
             v-for="item in toolNum"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
         </el-select>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>分组:</span>
         <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
           <el-option
@@ -115,7 +125,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" border style="width: 100%;max-height: 390px;" height="340px" stripe show-summary>
+      <el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" border style="width: 100%;max-height: 390px;" height="340px" size="small" stripe show-summary>
         <el-table-column label="序号" width="80" align="center" type="index"/>
         <el-table-column label="工艺名称" width="200" align="center">
           <template slot-scope="scope">
@@ -124,7 +134,7 @@
         </el-table-column>
         <el-table-column label="工艺要求" align="center">
           <template slot-scope="scope">
-            <el-input v-model="tableData[scope.$index].工艺要求" size="mini" readonly type="textarea"/>
+            <el-input v-model="tableData[scope.$index].工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
           </template>
         </el-table-column>
         <el-table-column label="单件" width="110" align="center">
@@ -204,7 +214,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.searchPartNum()
   },
   methods: {
@@ -231,11 +241,12 @@ export default {
       this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 40a0e54a..18707c81 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -575,12 +575,16 @@ export default {
       this.zhongjianbianliang = row.外协加工任务单流水号
       this.fukuanshijian = row.实际付款时间
       getParts(row.外协加工任务单流水号, this.pageCurrent2, this.pageSize2).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
-          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        if (response.data.rows.length === 0) {
+          this.loading2 = false
+        } else {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+            response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+          }
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
         }
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
       }).then(() => {
         this.loading2 = false
       })
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue
new file mode 100644
index 00000000..17b4d858
--- /dev/null
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue
@@ -0,0 +1,668 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <span>外协厂家:</span>
+      <el-select v-model="ManufacturerNameValue" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
+        <el-option
+          v-for="item in ManufacturerName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;total=null;pageCurrent2=1;pageSize2=10;total2=null;searchTable()">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="400" style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts3">
+        <el-table-column
+          label=" "
+          type="index"
+          align="center"
+          width="50"/>
+        <el-table-column label="外协厂家" align="center" width="280px">
+          <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="300px" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              class="el-icon-check"
+              @click="editType1(scope.row, 'form');param = 0">到票</el-button>
+            <el-button
+              size="mini"
+              type="success"
+              class="el-icon-check"
+              @click="payment(scope.row, 'form2');param2 = 0">付款</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+    <el-tabs type="border-card">
+      <el-tab-pane label="付款明细">
+        <el-table v-loading="loading3" :data="tableData3" height="370" style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="付款金额" align="center" width="230px">
+            <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="200px" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" class="el-icon-edit" @click="handleChange3(scope.row, 'form2')">编辑</el-button>
+              <el-button size="mini" type="danger" class="el-icon-delete" @click="handleDelete3(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading3"
+            :current-page="pageCurrent3"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="到票明细">
+        <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="发票号" align="center" width="230px">
+            <template slot-scope="scope">
+              {{ scope.row.发票号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="接收人" align="center" width="180px">
+            <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="150px" prop="开票金额">
+            <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="200px" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
+              <el-button size="mini" type="danger" class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading2"
+            :current-page="pageCurrent2"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize2"
+            :total="total2"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"/>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发票号" prop="发票号">
+              <el-input v-model="form.发票号" placeholder="发票号" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票金额" prop="开票金额">
+              <el-input v-model="form.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开票时间" prop="开票时间">
+              <el-date-picker
+                v-model="form.开票时间"
+                style="width:200px"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                clearable
+                placeholder="开票时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户行" prop="开户行">
+              <el-input v-model="form.开户行" placeholder="开户行" style="width:200px" clearable 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.接收人" placeholder="接收人" style="width:200px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接收时间" prop="接收时间">
+              <el-date-picker
+                v-model="form.接收时间"
+                style="width:200px"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                clearable
+                placeholder="接收时间"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.备注" :rows="2" placeholder="备注" type="textarea" style="width:527px" clearable size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="submit('form')" >确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible2" title="付款" center style="min-height: 300px" width="500px">
+      <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
+        <el-form-item label="付款金额" prop="付款金额" style="margin-left: 80px">
+          <el-input v-model="form2.付款金额" placeholder="付款金额" size="small" style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="备注" style="margin-left: 80px">
+          <el-input :autosize="{ minRows: 2, maxRows: 4}" v-model="form2.备注" type="textarea" placeholder="备注" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff2('form2')">取消</el-button>
+        <el-button type="primary" @click="submit2('form2')">确定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { initOutHelp, searchtable, getParts, edittype, handlechange, handledelete, getParts3, outPay, edit, handledelete3 } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement2'
+export default {
+  data() {
+    return {
+      factury: '',
+      fukuanshijian: '',
+      title1: '',
+      dialogFormVisible: false,
+      renwudan: '',
+      count1: 0,
+      count2: 0,
+      count3: 0,
+      count4: 0,
+      form: {
+        发票号: '',
+        开户行: '',
+        开票时间: '',
+        开票金额: '',
+        接收人: '',
+        接收时间: '',
+        备注: ''
+      },
+      实际付款时间: '',
+      loading: false,
+      loading2: false,
+      loading3: false,
+      zhongjianbianliang1: '',
+      zhongjianbianliang2: '',
+      dialogFormVisible2: false,
+      form2: {
+        付款金额: '',
+        备注: ''
+      },
+      rules: {
+        发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
+        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
+        扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }],
+        付款金额: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
+      },
+      date1: '',
+      date2: '',
+      date3: '',
+      date4: '',
+      FormNumber: '',
+      ManufacturerNameValue: '',
+      ManufacturerName: [], // 厂家名称
+      FormNumber_check: false,
+      ManufacturerNameValue_check: false,
+      date1_check: false,
+      date3_check: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      tableData2: [], // 表格数据
+      total2: null, // 总条数
+      pageSize2: 10, // 每页显示条数
+      pageCurrent2: 1, // 后台获取页
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 10, // 每页显示条数
+      pageCurrent3: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.fetchData()
+    this.searchTable()
+  },
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总金额'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ' 元'
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
+    },
+    // 初始化外协厂家
+    fetchData() {
+      this.ManufacturerName = []
+      initOutHelp().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ManufacturerName.push({
+            label: response.data[i].外协厂家名称,
+            value: response.data[i].外协厂家流水号
+          })
+        }
+      })
+    },
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      if (this.ManufacturerNameValue === '' || this.ManufacturerNameValue === null) {
+        this.ManufacturerNameValue_check = 0
+      } else {
+        this.ManufacturerNameValue_check = 1
+      }
+      this.tableData = []
+      this.tableData2 = []
+      this.tableData3 = []
+      searchtable(this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+      }).then(() => {
+        this.loading = false
+      })
+    },
+    getParts3(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      this.zhongjianbianliang1 = row.外协厂家流水号
+      getParts3(row.外协厂家流水号, this.pageCurrent3, this.pageSize3).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].付款日期 = response.data.rows[i].付款日期.split(' ')[0]
+        }
+        this.tableData3 = response.data.rows
+        this.total3 = response.data.total
+      }).then(() => {
+        this.loading3 = false
+      })
+      this.loading2 = true
+      this.tableData2 = []
+      this.zhongjianbianliang2 = row.外协厂家流水号
+      getParts(this.zhongjianbianliang2, this.pageCurrent2, this.pageSize2).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        }
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    getParts4() {
+      this.loading3 = true
+      this.tableData3 = []
+      getParts3(this.zhongjianbianliang1, this.pageCurrent3, this.pageSize3).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].付款日期 = response.data.rows[i].付款日期.split(' ')[0]
+        }
+        this.tableData3 = response.data.rows
+        this.total3 = response.data.total
+      }).then(() => {
+        this.loading3 = false
+      })
+    },
+    // 新增付款打开
+    payment(row, formName) {
+      this.param2 = 0
+      this.count3 = this.count3 + 1
+      if (this.count3 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.factury = row.外协厂家流水号
+      var time = new Date()
+      var month = time.getMonth() + 1
+      var day = time.getDate()
+      if (month >= 1 && month <= 9) {
+        month = '0' + month
+      }
+      if (day >= 1 && day <= 9) {
+        day = '0' + day
+      }
+      this.payDate = time.getFullYear() + '/' + month + '/' + day
+      this.form2.付款金额 = ''
+      this.form2.备注 = ''
+      this.dialogFormVisible2 = true
+    },
+    // 新增付款确定
+    outPay() {
+      outPay(this.factury, this.form2.付款金额, this.payDate, this.form2.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息增加成功')
+          this.searchTable()
+          this.getParts4()
+        } else {
+          this.$message.error('信息增加失败')
+        }
+      })
+    },
+    // 编辑付款打开
+    handleChange3(row, formName) {
+      this.param2 = 1
+      this.count4 = this.count4 + 1
+      if (this.count4 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.factury = row.外协付款流水号
+      this.form2.付款金额 = row.付款金额
+      this.form2.备注 = row.备注
+      this.dialogFormVisible2 = true
+    },
+    // 编辑付款确定
+    edit() {
+      edit(this.factury, this.form2.付款金额, this.form2.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息修改成功')
+          this.searchTable()
+          this.getParts4()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 删除
+    handleDelete3(index, row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handledelete3(row.外协付款流水号).then(response => {
+          if (this.tableData3 && this.tableData3.length === 1 && this.pageCurrent3 > 1) {
+            this.pageCurrent3--
+          }
+          if (response.data[0].result === '1') {
+            this.$message.success('信息删除成功')
+            this.searchTable()
+            this.getParts4()
+          } else {
+            this.$message.error('信息删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    submit2(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.param2 === 0) {
+            this.outPay()
+            this.dialogFormVisible2 = false
+          } else {
+            this.edit()
+            this.dialogFormVisible2 = false
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    callOff2(formName) {
+      this.dialogFormVisible2 = false
+      this.$refs[formName].resetFields()
+    },
+    // 获取表格2数据
+    getParts2() {
+      this.loading2 = true
+      this.tableData2 = []
+      getParts(this.zhongjianbianliang2, this.pageCurrent2, this.pageSize2).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        }
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    // 增加发票
+    editType1(row, formName) {
+      this.count1 = this.count1 + 1
+      if (this.count1 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.title1 = '增加'
+      this.renwudan = row.外协厂家流水号
+      this.form.发票号 = ''
+      this.form.开户行 = ''
+      this.form.开票时间 = ''
+      this.form.开票金额 = ''
+      this.form.接收人 = ''
+      this.form.接收时间 = ''
+      this.form.备注 = ''
+      this.dialogFormVisible = true
+    },
+    // 增加确定
+    editType() {
+      edittype(this.renwudan, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.error('信息增加成功')
+          this.getParts2()
+        } else {
+          this.$message.error('信息增加失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 编辑发票
+    handleChange1(index, row, formName) {
+      this.count2 = this.count2 + 1
+      if (this.count2 !== 1) {
+        this.$refs[formName].resetFields()
+      }
+      this.form.发票号 = row.发票号
+      this.form.开户行 = row.开户行
+      this.form.开票时间 = row.开票时间
+      this.form.开票金额 = row.开票金额
+      this.form.接收人 = row.接收人
+      this.form.接收时间 = row.接收时间
+      this.form.备注 = row.备注
+      this.dialogFormVisible = true
+      this.title1 = '编辑'
+      this.CoManufacturerFlowNumber1 = row.id
+    },
+    // 编辑确定
+    handleChange() {
+      handlechange(this.CoManufacturerFlowNumber1, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息编辑成功')
+          this.getParts2()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+      this.dialogFormVisible = false
+    },
+    // 提交添加或者修改
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.param === 0) {
+            this.editType()
+          } else {
+            this.handleChange()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    // 重置表单
+    callOff(formName) {
+      this.dialogFormVisible = false
+      this.$refs[formName].resetFields()
+    },
+    // 删除
+    handleDelete(index, row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handledelete(row.id).then(response => {
+          if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
+            this.pageCurrent2--
+          }
+          if (response.data[0].result === '1') {
+            this.$message.success('信息删除成功')
+            this.getParts2()
+          } else {
+            this.$message.error('信息删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    },
+    handleSizeChange2(val) {
+      this.pageCurrent2 = 1
+      this.pageSize2 = val
+      this.getParts2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.tableData2 = []
+      this.getParts2()
+    },
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.getParts3()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.getParts3()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 10px;
+  }
+  .el-table .fukuan {
+    background: #AEF199;
+  }
+</style>
+
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 20f7c440..f48e1ff4 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -404,7 +404,7 @@
 
     <el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
       <div align="center">
-        <el-input v-model="input" size="small" style="width:200px"/>
+        <el-input v-model="input" size="small" clearable style="width:200px"/>
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
       </div>
       <el-table :data="List2" max-height="370" highlight-current-row @row-click="handleCurrentChange3">
@@ -1207,14 +1207,12 @@ export default {
     },
     // 成交
     Deal() {
-      this.documentStatus = 2
-      this.sign = 1
       this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        editData1(this.Number, this.ManufactorNumber, this.freight, this.documentStatus, this.sign, this.Explain).then(response => {
+        editData1(this.Number, this.ManufactorNumber, this.freight, this.Explain).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('提交成功')
             this.fetchData()
@@ -1265,7 +1263,7 @@ export default {
     },
     // 提交编辑
     submitEdit() {
-      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, 1, this.Explain).then(response => {
+      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.Explain).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           this.dialogFormVisible = false
@@ -1436,7 +1434,8 @@ export default {
     handleSelectionChange(val) {
       this.processNum = val
     },
-    getSpareParts() { // 选入零件
+    // 选入零件
+    getSpareParts() {
       if (this.Number !== null) {
         this.result = 0
         for (let i = 0; i < this.processNum.length; i++) {
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index b63cd08f..9575e0fe 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -315,7 +315,6 @@ export default {
           for (let i = 0; i < this.gongxulsh.length; i++) {
             handlechange(this.gongxulsh[i].工序流水号, '0000')
             if (i === this.gongxulsh.length - 1) {
-              console.log(1)
               shouhuo(row.外协加工任务单流水号).then(response => {
                 if (response.data[0].result === '1') {
                   this.fetchData()
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index cdce2a23..db9112cd 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -2,22 +2,32 @@
   <div>
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--<span>项目名称:</span>-->
+        <!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
+        <!--<el-option-->
+        <!--v-for="item in entryName"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>机床名称:</span>
-        <el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
+        <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
           <el-option
             v-for="item in toolNum"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
         </el-select>
+        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
+        <!--<el-option-->
+        <!--v-for="item in toolNum"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <span>分组:</span>
         <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
           <el-option
@@ -79,7 +89,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中">
+      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
         <el-table-column
           label=" "
           type="index"
@@ -88,14 +98,14 @@
         <el-table-column label="加工状态" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
-            <el-tag v-if="parseInt(scope.row.工序状态)===4" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</el-tag>
             <el-tag v-if="parseInt(scope.row.工艺编号)===29" size="small">备料</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="序间外协" width="100" align="center">
           <template slot-scope="scope">
-            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
+            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
           </template>
         </el-table-column>
         <el-table-column label="是否外协" width="100" align="center">
@@ -166,7 +176,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.searchTable()
   },
   methods: {
@@ -187,11 +197,12 @@ export default {
       this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })
@@ -244,6 +255,7 @@ export default {
       this.checkBox = []
       this.tableData2 = []
       searchTable2(row.工艺计划流水号).then(response => {
+        console.log(response.data)
         this.num1 = row.工艺计划流水号
         if (response.data.length === 0) {
           this.loading0 = false
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 5b683f91..8aa4088a 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
-      <el-button type="warning" size="small" icon="el-icon-download">导出</el-button>
+      <el-button type="warning" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
       <div class="title">总装箱单</div>
       <el-table
         v-loading="loading"
@@ -80,7 +80,7 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-table
-              :data="props.row.groupData"
+              :data="groupData"
               border
               size="mini"
               style="width: 90%">
@@ -91,34 +91,28 @@
                 width="100px"/>
               <el-table-column
                 align="center"
-                prop="类别"
                 label="类别"
-              />
+              ><template slot-scope="scope">{{ scope.row.类别 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="代号"
                 label="代号"
-              />
+              ><template slot-scope="scope">{{ scope.row.代号 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="名称"
                 label="名称"
-              />
+              ><template slot-scope="scope">{{ scope.row.名称 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="address"
                 label="规格"
-              />
+              ><template slot-scope="scope">{{ scope.row.规格 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="数量"
                 label="数量"
-              />
+              ><template slot-scope="scope">{{ scope.row.数量 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="备注"
                 label="备注"
-              />
+              ><template slot-scope="scope">{{ scope.row.备注 }}</template></el-table-column>
             </el-table>
           </template>
         </el-table-column>
@@ -190,7 +184,7 @@
           label="代号"
           align="center"
           min-width="100px">
-          <template slot-scope="scope">{{ scope.row.图号 }}</template>
+          <template slot-scope="scope">{{ scope.row.代号 }}</template>
         </el-table-column>
         <el-table-column
           label="数量"
@@ -385,6 +379,11 @@
     <el-dialog :visible.sync="spareVisible" :title="spareTitle" center style="min-height: 200px" width="400px">
       <el-form ref="spareForm" :rules="spareRule" :model="spareForm" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="图号" prop="图号">
+              <el-input v-model="spareForm.图号" size="small" style="width:200px"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="名称" prop="名称">
               <el-input v-model="spareForm.名称" size="small" style="width:200px"/>
@@ -418,14 +417,174 @@
         <el-button v-else-if="spareTitle==='编辑备件'" type="primary" @click="submitEditSpare">确定</el-button>
       </div>
     </el-dialog>
+    <div v-show="false" id="cjn">
+      <!--封面-->
+      <table class="tg" style="width: 900px">
+        <colgroup>
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+        </colgroup>
+        <tr>
+          <td class="tg-cw9i" colspan="6"><p style="margin-top:170px">数 控 轧 辊 铣 扁 专机</p></td>
+        </tr>
+        <tr>
+          <td class="tg-qj3h" colspan="6"><p style="margin-top:50px">装&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;箱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单</p></td>
+        </tr>
+        <tr>
+          <td class="tg-qj3h" colspan="6">GJR1322-ZD</td>
+        </tr>
+        <tr>
+          <td class="tg-qj3h" colspan="6">
+            <img style="margin-top:120px" src="data:image/jpeg;base64,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">
+          </td>
+        </tr>
+        <tr>
+          <td class="tg-a8eg" colspan="6"><p style="margin-left:30px">出厂编号：</p></td>
+        </tr>
+        <tr>
+          <td class="tg-qj3h" colspan="6"><p style="margin-top:70px">中&nbsp;&nbsp;&nbsp;华&nbsp;&nbsp;&nbsp;人&nbsp;&nbsp;&nbsp;民&nbsp;&nbsp;&nbsp;共&nbsp;&nbsp;&nbsp;和&nbsp;&nbsp;&nbsp;国</p></td>
+        </tr>
+        <tr>
+          <td class="tg-qj3h" colspan="6"><p >江&nbsp;&nbsp;&nbsp;苏&nbsp;&nbsp;&nbsp;高&nbsp;&nbsp;&nbsp;精&nbsp;&nbsp;&nbsp;机&nbsp;&nbsp;&nbsp;电&nbsp;&nbsp;&nbsp;装&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;有&nbsp;&nbsp;&nbsp;限&nbsp;&nbsp;&nbsp;公&nbsp;&nbsp;&nbsp;司</p></td>
+        </tr>
+      </table>
+      <!--内容-->
+      <table class="tg1" style="table-layout: fixed; width: 900px;margin-top:50px">
+        <colgroup>
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+          <col style="width: 150px">
+        </colgroup>
+        <tr>
+          <td class="tg-8zau" colspan="5">装&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;箱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单</td>
+          <td class="tg-hjji">{{ receiptName }}</td>
+        </tr>
+        <tr>
+          <td class="tg-13k7" colspan="6">本装箱单所列的包装品开箱后应立即清点<br></td>
+        </tr>
+        <tr>
+          <td class="tg-13pz">箱号</td>
+          <td class="tg-baqh" rowspan="2"/>
+          <td class="tg-13pz">箱体尺寸<br></td>
+          <td class="tg-baqh" colspan="3" rowspan="2"/>
+        </tr>
+        <tr>
+          <td class="tg-13pz">毛中</td>
+          <td class="tg-13pz">净重<br></td>
+        </tr>
+        <tbody>
+          <tr>
+            <td class="tg-60hs" colspan="6">一、主机</td>
+          </tr>
+          <tr>
+            <td class="tg-13pz">序号<br></td>
+            <td class="tg-13pz">代号</td>
+            <td class="tg-13pz" colspan="2">名称</td>
+            <td class="tg-13pz">数量<br></td>
+            <td class="tg-13pz">备注<br></td>
+          </tr>
+          <tr v-for="(list, index) in machineTableData" :key="index">
+            <td class="tg-0lax">{{ list.序号 }}</td>
+            <td class="tg-0lax">{{ list.代号 }}</td>
+            <td class="tg-0lax" colspan="2">{{ list.机床名称 }}</td>
+            <td class="tg-0lax">{{ list.数量 }}</td>
+            <td class="tg-0lax">{{ list.备注 }}</td>
+          </tr>
+        </tbody>
+        <tbody>
+          <tr>
+            <td class="tg-60hs" colspan="6">二、机床所属部件</td>
+          </tr>
+          <tr>
+            <td class="tg-13pz">序号</td>
+            <td class="tg-13pz">代号</td>
+            <td class="tg-13pz">名称<br></td>
+            <td class="tg-13pz">规格</td>
+            <td class="tg-13pz">数量</td>
+            <td class="tg-13pz">备注</td>
+          </tr>
+          <tr v-for="(list, index) in groupData" :key="index">
+            <td class="tg-0lax">{{ index + 1 }}</td>
+            <td class="tg-0lax">{{ list.代号 }}</td>
+            <td class="tg-0lax">{{ list.名称 }}</td>
+            <td class="tg-0lax">{{ list.规格 }}</td>
+            <td class="tg-0lax">{{ list.数量 }}</td>
+            <td class="tg-0lax">{{ list.备注 }}</td>
+          </tr>
+        </tbody>
+        <tbody>
+          <tr>
+            <td class="tg-60hs" colspan="6">三、随机供应备件</td>
+          </tr>
+          <tr>
+            <td class="tg-13pz">序号<br></td>
+            <td class="tg-13pz">名称</td>
+            <td class="tg-13pz" colspan="2">代号<br></td>
+            <td class="tg-13pz">数量<br></td>
+            <td class="tg-13pz">备注<br></td>
+          </tr>
+          <tr v-for="(list, index) in spareData" :key="index">
+            <td class="tg-0lax">{{ index + 1 }}</td>
+            <td class="tg-0lax">{{ list.名称 }}</td>
+            <td class="tg-0lax" colspan="2">{{ list.代号 }}</td>
+            <td class="tg-0lax">{{ list.数量 }}</td>
+            <td class="tg-0lax">{{ list.备注 }}</td>
+          </tr>
+        </tbody>
+        <tbody>
+          <tr>
+            <td class="tg-60hs" colspan="6">四、随机技术文件</td>
+          </tr>
+          <tr>
+            <td class="tg-13pz">序号<br></td>
+            <td class="tg-13pz">名称<br></td>
+            <td class="tg-13pz" colspan="2">代号</td>
+            <td class="tg-13pz">数量</td>
+            <td class="tg-13pz">备注</td>
+          </tr>
+          <tr v-for="(list, index) in fileData" :key="index">
+            <td class="tg-0lax" align="center">{{ index + 1 }}</td>
+            <td class="tg-0lax" align="center">{{ list.名称 }}</td>
+            <td class="tg-0lax" colspan="2" align="center">{{ list.代号 }}</td>
+            <td class="tg-0lax" align="center">{{ list.数量 }}</td>
+            <td class="tg-0lax" align="center">{{ list.备注 }}</td>
+          </tr>
+        </tbody>
+        <tr>
+          <td class="tg-baqh">标记<br></td>
+          <td class="tg-baqh">处数<br></td>
+          <td class="tg-baqh">更改文件号<br></td>
+          <td class="tg-baqh">签字<br></td>
+          <td class="tg-baqh">日期<br></td>
+          <td class="tg-0lax"/>
+        </tr>
+        <tr>
+          <td class="tg-0lax"/>
+          <td class="tg-0lax"/>
+          <td class="tg-0lax"/>
+          <td class="tg-0lax"/>
+          <td class="tg-0lax"/>
+          <td class="tg-0lax"/>
+        </tr>
+      </table>
+    </div>
   </div>
 </template>
 
 <script>
 import { projectSelect, getReciptData, insertReciptData, updateReciptData, deleteReciptData, getMachineData, getGroupData, machineSelect, addMachineData, updateMachineData, deleteMachineData, getFileData, addFileData, editFileData, deleteFileData, getSpareData, addSpareData, editSpareData, deleteSpareData } from '@/api/TechnologyCenter/CreatePackingList'
+import $ from 'jquery'
 export default {
   data() {
     return {
+      groupData: [],
       project: [],
       projectValue: '',
       machine: [],
@@ -442,6 +601,7 @@ export default {
       spareTitle: '',
       spareForm: {
         备件编号: '',
+        图号: '',
         名称: '',
         规格: '',
         单位: '',
@@ -601,6 +761,7 @@ export default {
       const response = await getMachineData(this.receiptNum)
       const data = response.data
       console.log(data, 1111)
+      this.groupData = []
       for (let i = 0; i < data.length; i++) {
         const resp = await getGroupData(data[i].机床号)
         console.log(resp)
@@ -608,15 +769,15 @@ export default {
           item.类别 = '机床所属部件'
           return item
         })
-        console.log(groupData)
+        this.groupData = groupData
         this.machineTableData.push({
           序号: data[i].序号,
           代号: data[i].代号,
           机床名称: data[i].名称,
           数量: data[i].数量,
-          备注: data[i].备注,
-          groupData: groupData
+          备注: data[i].备注
         })
+        console.log(this.groupData, 11112)
       }
     },
     addMachine() {
@@ -692,10 +853,14 @@ export default {
       })
     },
     async getSpareData() {
-      const response = await getSpareData(this.receiptNum)
+      const response = await getSpareData(this.projectValue, this.machineValue)
       console.log(response)
       for (let i = 0; i < response.data.length; i++) {
-        response.data[i].图号 = response.data[i].图号 + response.data[i].规格
+        if (response.data[i].图号 !== undefined && response.data[i].规格 !== undefined) {
+          response.data[i].代号 = response.data[i].图号 + ' ' + response.data[i].规格
+        } else {
+          response.data[i].代号 = ''
+        }
       }
       this.spareData = response.data
     },
@@ -706,7 +871,7 @@ export default {
       })
     },
     async submitAddSpare() {
-      this.addTable(addSpareData, [this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.receiptNum], 'spareForm', function() {
+      this.addTable(addSpareData, [this.spareForm.图号, this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.receiptNum, this.projectValue, this.machineValue], 'spareForm', function() {
         this.spareVisible = false
         this.getSpareData()
       })
@@ -723,7 +888,7 @@ export default {
       })
     },
     async submitEditSpare() {
-      this.editTable(editSpareData, [this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.spareForm.备件编号], 'spareForm', function() {
+      this.editTable(editSpareData, [this.spareForm.图号, this.spareForm.名称, this.spareForm.规格, this.spareForm.单位, this.spareForm.数量, this.spareForm.备注, this.spareForm.备件编号], 'spareForm', function() {
         this.spareVisible = false
         this.getSpareData()
       })
@@ -737,6 +902,16 @@ export default {
       this.deleteRow(deleteSpareData, row.备件编号, function() {
         this.getSpareData()
       })
+    },
+    exportTable() {
+      const htmlNode = $('#cjn').html()
+      const body = $('body')
+      body.children().hide()
+      const printNode = $(htmlNode)
+      body.append(printNode)
+      window.print()
+      body.children().not('script').show()
+      printNode.remove()
     }
   }
 }
@@ -753,3 +928,27 @@ span{
   font-weight: bolder;
 }
 </style>
+<style type="text/css">
+  .tg {border-collapse: collapse;border-spacing: 0;border-width: 1px;border-style: solid;border-color: black;}
+  .tg td {font-family: Arial, sans-serif;font-size: 14px;padding: 10px 5px;border-style: solid;border-width: 0px;overflow: hidden;word-break: normal;}
+  .tg th {font-family: Arial, sans-serif;font-size: 14px;font-weight: normal;padding: 10px 5px;border-style: solid;border-width: 0px;overflow: hidden;word-break: normal;}
+  .tg .tg-auka {font-size: 26px;text-align: center;vertical-align: top;}
+  .tg .tg-qj3h {font-size: 36px;text-align: center;vertical-align: top;}
+  .tg .tg-s268 {text-align: center;}
+  .tg .tg-0lax {text-align: center;vertical-align: top;}
+  .tg .tg-cw9i {font-size: 28px;text-align: center;vertical-align: top;}
+  .tg .tg-a8eg {font-size: 28px;text-align: center;vertical-align: top;}
+  .tg1  {border-collapse:collapse;border-spacing:0;}
+  .tg1 td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg1 th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg1 .tg-hjji{font-size:24px;text-align:center;vertical-align:top}
+  .tg1 .tg-13k7{font-size:20px;text-align:left}
+  .tg1 .tg-auka{font-size:26px;text-align:center;vertical-align:top}
+  .tg1 .tg-baqh{text-align:center;vertical-align:top}
+  .tg1 .tg-qj3h{font-size:36px;text-align:center;vertical-align:top}
+  .tg1 .tg-8zau{font-size:32px;text-align:center}
+  .tg1 .tg-13pz{font-size:18px;text-align:center;vertical-align:top}
+  .tg1 .tg-60hs{font-size:20px;text-align:left;vertical-align:top}
+  .tg1 .tg-0lax{text-align:center;vertical-align:top}
+  .tg1 .tg-a8eg{font-size:28px;text-align:center;vertical-align:top}
+</style>
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index a62636bd..42fd6277 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -29,6 +29,7 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
+        highlight-current-row
         @row-click="searchMaterial1">
         <el-table-column
           label="序号"
@@ -122,7 +123,6 @@
         :data="tableData10"
         :cell-class-name="cell"
         style="width: 100%"
-        height="440"
         size="mini"
         highlight-current-row
         border>
@@ -185,20 +185,13 @@
                   :value="item.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="type === 2" label="材料" prop="材料">
-              <el-input v-model="form.物料名称" clearable size="small" style="width: 200px;" placeholder="物料流水号" @dblclick.native="materialShow"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="规格" prop="规格">
+            <el-form-item v-if="type === 2" label="规格" prop="规格">
               <el-input
                 v-model="form.规格"
                 size="small"
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="备件数量" prop="数量">
               <el-input
@@ -207,6 +200,8 @@
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="装机数量" prop="数量">
               <el-input
@@ -215,8 +210,6 @@
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="部件数量" prop="数量">
               <el-input
@@ -225,6 +218,8 @@
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="制造商" prop="供货商">
               <el-input
@@ -233,8 +228,6 @@
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="分类码" prop="分类码">
               <el-input
@@ -243,6 +236,8 @@
                 style="width: 200px;"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="备注">
               <el-input
@@ -259,52 +254,6 @@
         <el-button v-show="title==='编辑零件信息'" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>
-
-    <el-dialog :visible.sync="dialogMaterial" title="物料选择">
-      <el-input v-model="inputMaterial" placeholder="材质" size="small" style="width:200px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchMaterial()">查询</el-button>
-      <el-table
-        :data="MaterialData"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectMaterial">
-        <el-table-column align="center" label="物料代码">
-          <template slot-scope="scope">
-            {{ scope.row.物料代码 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料名称">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料规格">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料型号">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrentMaterial"
-          :page-sizes="[10, 20]"
-          :page-size="pageSizeMaterial"
-          :total="totalMaterial"
-          small
-          layout="sizes, prev, pager, next"
-          @size-change="handleSizeChangeMaterial"
-          @current-change="handleCurrentChangeMaterial"/>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogMaterial=false">提交</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -362,7 +311,6 @@ export default {
       },
       err: 0,
       dialogFormVisibleWB: false,
-      dialogMaterial: false,
       MaterialData: [],
       inputMaterial: '',
       rules: {
@@ -558,22 +506,12 @@ export default {
         console.log(response.data)
       })
     },
-    materialShow() {
-      this.inputMaterial = ''
-      this.getMaterialWB()
-      this.dialogMaterial = true
-    },
     getMaterialWB() {
       this.getTable(getMaterialWB, [this.pageCurrentMaterial, this.pageSizeMaterial], ['MaterialData', 'totalMaterial', 'loadingMaterial'])
     },
     searchMaterial() {
       this.getTable(searchMaterialWB, [this.inputMaterial, this.pageCurrentMaterial, this.pageSizeMaterial], ['MaterialData', 'totalMaterial', 'loadingMaterial'])
     },
-    selectMaterial(row) {
-      this.dialogMaterial = false
-      this.form.物料流水号 = row.物料流水号
-      this.form.物料名称 = row.物料名称
-    },
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
@@ -627,8 +565,9 @@ export default {
             }
           }
           if (this.err === 0) { // 传递成功后，清除该分组。当所有组都传递完成后，该项目下的机床和分组消失
-            const index = this.groupsNames.indexOf(this.groupValue)
-            this.groupsNames.splice(index, 1)
+            console.log(this.groupsNames.indexOf(this.groupValue), 22222)
+            // const index = this.groupsNames.indexOf(this.groupValue)
+            // this.groupsNames.splice(index, 1)
             if (this.groupsNames.length === 0) {
               const groupIndex = this.machineNames.indexOf(this.machineValue)
               this.machineNames.splice(groupIndex, 1)
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 60b377d3..5c56c35e 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -131,6 +131,7 @@
         border>
         <el-table-column
           label="序号"
+          align="center"
           type="index"
           width="50"/>
         <el-table-column align="center" label="物料名称">
diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
index afa3b525..97e20d1a 100644
--- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
+++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
@@ -331,17 +331,22 @@ export default {
       this.searchTable1()
     },
     requestFund(row) { // 请款
-      const day1 = new Date()
-      const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate()
-      requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('请款成功')
-          this.searchTable1()
-          this.startRequestDate = ''
-          this.endRequestDate = ''
-          this.tableData2 = []
-        } else { this.$message.error('请款失败') }
-      })
+      console.log(row.本次应请款)
+      if (row.本次应请款 !== '') {
+        const day1 = new Date()
+        const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate()
+        requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('请款成功')
+            this.searchTable1()
+            this.startRequestDate = ''
+            this.endRequestDate = ''
+            this.tableData2 = []
+          } else { this.$message.error('请款失败') }
+        })
+      } else {
+        this.$message.warning('请输入金额')
+      }
     },
     cancelRequestFund(row) { // 取消请款
       console.log(row)
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 79c2e1b7..2a7eeab4 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -14,7 +14,7 @@
           </el-dropdown-item>
         </router-link>
         <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">登出</span>
+          <span style="display:block;" @click="logout">退出</span>
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>