diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index b2fbb400..00000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/api/Assembly/SparePartsOutStockRecord.js b/src/api/Assembly/SparePartsOutStockRecord.js
index 09a480be..535fd937 100644
--- a/src/api/Assembly/SparePartsOutStockRecord.js
+++ b/src/api/Assembly/SparePartsOutStockRecord.js
@@ -24,14 +24,14 @@ export function searchgroup(num) {
   })
 }
 // 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据
-export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize) {
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize, ordername, order) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据',
-      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5,
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5 + '&排序名称=' + ordername + '&排序方式=' + order,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/BasicData/SystemRrolemaintenance.js b/src/api/BasicData/SystemRrolemaintenance.js
index c7d85663..fd345e26 100644
--- a/src/api/BasicData/SystemRrolemaintenance.js
+++ b/src/api/BasicData/SystemRrolemaintenance.js
@@ -21,15 +21,14 @@ export function deleteData(code) {
     }
   })
 }
-export function searchTable(num, pageCurrent, pageSize) {
+export function searchTable(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '菜单系统模块_项目角色_查询数据_MESWORK',
-      param: '角色功能=' + num + '=string',
-      Pagination: pageCurrent + '&' + pageSize
+      param: '角色功能=' + num + '=string'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js
index 6ea74d70..daf3800f 100644
--- a/src/api/ManufacturingCenter/InitialProduction.js
+++ b/src/api/ManufacturingCenter/InitialProduction.js
@@ -50,50 +50,50 @@ export function getTable(num, pageList, pageSize) {
   })
 }
 // 投产
-export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递',
-      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 合并投产
-export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
-      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 备料投产
-export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料',
-      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 合并备料投产
-export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料',
-      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
@@ -170,3 +170,14 @@ export function edit(num) {
     }
   })
 }
+// 用于提醒
+export function searchUrgentItem() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_加急件未打印条数查询'
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js
index a0b27598..f5a9001c 100644
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -11,6 +11,18 @@ export function initProject() {
     }
   })
 }
+// 三表下达时间查询
+export function DeliveryTimeSelect(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_三表下达时间_查询数据',
+      param: '组件流水号=' + num
+    }
+  })
+}
 // 组件查询
 export function searchgroup(num) {
   return request({
diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index 470c27a3..428d589e 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '设备管理_设备加工能力_查询数据_设备维护NEW',
-      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
-      pagination: pageCurrent + '&' + pageSize
+      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
+      // pagination: pageCurrent + '&' + pageSize
     }
   })
 }
diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js
index 9fc5abcd..1ce240e4 100644
--- a/src/api/Outsourcing/OutsourcingTaskQuery.js
+++ b/src/api/Outsourcing/OutsourcingTaskQuery.js
@@ -13,14 +13,14 @@ export function shouhuo(num) {
   })
 }
 // 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
+export function getTable(checked, contractNumber, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_查询页',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=0&单据状态=1&外协员编号_check=0&外协员编号=' + num,
+      name: '车间生产管理工艺_外协执行_查询外协任务单',
+      param: '厂家或表单号_check=' + checked + '&厂家或表单号=' + contractNumber,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -156,14 +156,14 @@ export function deleteData1(Number) {
   })
 }
 // 零件到货
-export function Arrival(Number, Num) {
+export function Arrival(num1, Number, Num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间生产管理_外协零件_到货',
-      param: `外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}`
+      param: '外协加工任务单流水号=' + num1 + `&外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}`
     }
   })
 }
@@ -174,7 +174,7 @@ export function getParts(Number) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单明细_查询数据',
+      name: '车间生产管理工艺_外协加工任务单明细_查询数据',
       param: '外协加工任务单流水号=' + Number + '=int'
     }
   })
diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js
index 273dbc85..1bbfcebe 100644
--- a/src/api/Outsourcing/PreorderAssociation.js
+++ b/src/api/Outsourcing/PreorderAssociation.js
@@ -39,7 +39,7 @@ export function searchTable(num1, num2, num3, num4, num5, num6, check, num7, pag
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新',
+      name: '车间生产管理工艺_序间外协_查询零件',
       param: '项目流水号_check=' + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&组件流水号_check=' + num5 + '&组件流水号=' + num6 + '&零件图号_check=' + check + '&零件图号=' + num7 + '&考核状态_check=0&考核状态=0&单件是否外协_check=1&单件是否外协=1&时间=0&机加工开始时间=0&机加工结束时间=0&零件类型=0',
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index 3c169558..56698104 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -62,14 +62,14 @@ export function searchLxMateriel(num, check, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) {
+export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`,
+      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js
index 7b693454..5ff7f799 100644
--- a/src/api/WorkshopProcurement/OfflineProcurement.js
+++ b/src/api/WorkshopProcurement/OfflineProcurement.js
@@ -109,14 +109,14 @@ export function getGroups(stepNumber) {
   })
 }
 
-export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) {
+export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
-      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m,
+      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 31f47928..5948c0da 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,7 +18,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
 export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
-export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel
+export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 19e20790..2f7b7a27 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -40,33 +40,33 @@
           type="date"
           placeholder="选择日期"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 840px;margin-top: 3px" height="550px">
-        <el-table-column label="项目名称" prop="项目名称" align="center" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 700px;margin-top: 3px" height="800px" @sort-change="sortChange">
+        <!--<el-table-column label="项目名称" prop="项目名称" align="center" width="150" show-overflow-tooltip>-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.项目名称 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="机床图号" prop="机床图号" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" prop="零件图号" align="center" width="225" show-overflow-tooltip>
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="233" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="150" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" prop="出库时间" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="出库时间" prop="出库时间" align="center" width="120" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库时间 | formatTime }}
           </template>
@@ -105,7 +105,7 @@ export default {
       tableData1: [],
       loading: false,
       total: null, // 总条数
-      pageSize: 20, // 每页显示条数
+      pageSize: 40, // 每页显示条数
       pageCurrent: 1 // 后台获取页
     }
   },
@@ -116,6 +116,26 @@ export default {
     this.initProject()
   },
   methods: {
+    sortChange(column) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '零件名称') {
+        this.ordername = 1
+      } else if (column.prop === '零件图号') {
+        this.ordername = 2
+      } else if (column.prop === '出库时间') {
+        this.ordername = 3
+      } else {
+        this.ordername = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      console.log(this.ordername, 9990999, this.order)
+
+      this.selecttable()
+    },
     initProject() {
       initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -146,7 +166,7 @@ export default {
       if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
-      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
         this.tableData1 = response.data.rows
         this.loading = false
         this.total = response.data.total
diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue
index 595fea12..6116e022 100644
--- a/src/views/BasicData/SystemRrolemaintenance/index.vue
+++ b/src/views/BasicData/SystemRrolemaintenance/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <!--      <span>角色功能:</span>-->
       <el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchData()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
     <el-card style="margin-top: 0px">
@@ -99,9 +99,6 @@ export default {
   data() {
     return {
       RoleFunctioning: '',
-      pageCurrent: 1,
-      pageSize: 10,
-      total: null,
       loading: false,
       tableData: [],
       dialogFormVisible1: false,
@@ -134,9 +131,8 @@ export default {
     },
     searchData() {
       this.loading = true
-      searchTable(this.RoleFunctioning, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData = response.data.rows
-        this.total = response.data.total
+      searchTable(this.RoleFunctioning).then(response => {
+        this.tableData = response.data
         this.loading = false
         console.log(response.data)
       })
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index b18e0f50..79c95e6f 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -421,14 +421,18 @@ export default {
     // 编辑
     handleEdit(index, row, formName) {
       this.temp = 2
-      this.dialogFormVisible = true
       this.form.WarehouseNumber = row.仓库编号
       this.form.WarehouseName = row.仓库名称
       this.form.WarehouseDescription = row.仓库描述
       this.form.Address = row.地址
-      this.form.ContactpeopleValue = row.人员编号
+      if (this.role !== '15') {
+        this.form.ContactpeopleValue = this.Contactpeople[0].value
+      } else {
+        this.form.ContactpeopleValue = parseInt(row.人员编号)
+      }
       this.form.Note = row.备注
       this.HouseNumber = row.仓库流水号
+      this.dialogFormVisible = true
     },
     // 执行修改
     chaEdit() {
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index db98467d..ba2627e9 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -20,7 +20,6 @@
         </el-tooltip>
         <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
           <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
-          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -51,39 +50,38 @@
             <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip>
-          <el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.零件名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
-            <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
-            <template slot-scope="scope">
-              {{ scope.row.零件图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" align="center" width="60">
-            <template slot-scope="scope">
-              {{ scope.row.批次数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.材料 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="重量" align="center" width="60" >
-            <template slot-scope="scope">
-              {{ scope.row.重量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.工艺要求 }}
-            </template>
-          </el-table-column>
-      </el-table-column></el-table>
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
+          <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" width="60">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="重量" align="center" width="60" >
+          <template slot-scope="scope">
+            {{ scope.row.重量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.工艺要求 }}
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="block">
         <el-pagination
           v-if="!loading"
@@ -160,13 +158,12 @@ export default {
   methods: {
     sortChange(column, prop, order) {
       console.log(column + '-' + column.prop + '-' + column.order, 11111)
-      this.ordername = column.prop
-      if (column.ordername === '零件名称') {
+      if (column.prop === '零件名称') {
         this.ordername = 1
-      } else if (column.ordername === '零件图号') { this.ordername = 2 } else {
+      } else if (column.prop === '零件图号') { this.ordername = 2 } else {
         this.ordername = ''
       }
-
+      console.log(this.ordername, 9990999)
       if (column.order === 'ascending') {
         this.order = 1
       } else if (column.order === 'descending') { this.order = 2 } else {
@@ -199,35 +196,32 @@ export default {
         this.partNamecheck = false
       }
       searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
-        searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response)
-          if (response.data.total === 0) {
-            this.loading = false
-          } else {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
           // this.tableData.push({
           //   重量: response.data.rows[0].重量
           // })
-            this.Data = response.data.rows
-            this.total = response.data.total
-          }
-        }).then(() => {
-          for (let i = 0; i < this.Data.length; i++) {
-            searchtable2(this.Data[i].工艺计划流水号).then(response => {
-              this.tableData.push({
-                工艺计划流水号: this.Data[i].工艺计划流水号,
-                零件名称: this.Data[i].零件名称,
-                零件图号: this.Data[i].零件图号,
-                备料打印: this.Data[i].备料打印,
-                是否外购备料: this.Data[i].是否外购备料,
-                工艺要求: response.data[0].工艺要求,
-                材料: this.Data[i].材料,
-                重量: this.Data[i].重量,
-                批次数量: this.Data[i].批次数量
-              })
+          this.Data = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+            this.tableData.push({
+              工艺计划流水号: this.Data[i].工艺计划流水号,
+              零件名称: this.Data[i].零件名称,
+              零件图号: this.Data[i].零件图号,
+              备料打印: this.Data[i].备料打印,
+              是否外购备料: this.Data[i].是否外购备料,
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              重量: this.Data[i].重量,
+              批次数量: this.Data[i].批次数量
             })
-            this.loading = false
-          }
-        })
+          })
+          this.loading = false
+        }
       })
     },
     handleSelectionChange(val) {
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 359e85f7..5fe39080 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -91,6 +91,7 @@
         <el-table
           v-loading="listLoading"
           :data="tableData"
+          :row-class-name="tableRowClassName"
           border
           stripe
           highlight-current-row
@@ -112,7 +113,7 @@
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="规格" prop="规格" align="center">
+          <el-table-column label="规格" prop="规格" align="center" width="170">
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
@@ -147,17 +148,19 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200px" fixed="right" align="center">
+          <el-table-column label="操作" width="170px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
                 :disabled="checked_hebing"
                 size="mini"
                 type="primary"
+                style="padding: 4px 8px"
                 plain
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
               <el-button
                 size="mini"
                 type="primary"
+                style="padding: 4px 8px"
                 plain
                 @click="handleEditNumber(scope.$index, scope.row)">更改数量</el-button>
             </template>
@@ -455,27 +458,27 @@ export default {
       'id'
     ])
   },
-  watch: {
-    // 如果路由有变化，会再次执行该方法
-    '$route'(to) {
-      const _this = this
-      console.log(to, 2222)
-      if (to.name === 'InitialProduction') {
-        _this.typeChange()
-      }
-    }
-    // '$route': {
-    //   handler(route) {
-    //     const _this = this
-    //     console.log(route.name)
-    //     if (route.name === 'InitialProduction') {
-    //       _this.typeChange()
-    //     }
-    //   }
-    // }
-  },
+  // watch: {
+  //   // 如果路由有变化，会再次执行该方法
+  //   '$route'(to) {
+  //     const _this = this
+  //     console.log(to, 2222)
+  //     if (to.name === 'InitialProduction') {
+  //       _this.typeChange()
+  //     }
+  //   }
+  //   // '$route': {
+  //   //   handler(route) {
+  //   //     const _this = this
+  //   //     console.log(route.name)
+  //   //     if (route.name === 'InitialProduction') {
+  //   //       _this.typeChange()
+  //   //     }
+  //   //   }
+  //   // }
+  // },
   created() {
-    // this.typeChange()
+    this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -615,6 +618,7 @@ export default {
               数据类型: response.data.rows[i].数据类型,
               零件备注: response.data.rows[i].零件备注,
               规格: response.data.rows[i].规格,
+              是否加急件: response.data.rows[i].是否加急件,
               材料流水号: response.data.rows[i].材料流水号,
               checked_dailiao: false,
               checked_waixie: false,
@@ -845,6 +849,7 @@ export default {
                   投产类型流水号: response.data.rows[i].投产类型流水号,
                   数据类型: response.data.rows[i].数据类型,
                   零件备注: response.data.rows[i].零件备注,
+                  是否加急件: response.data.rows[i].是否加急件,
                   规格: response.data.rows[i].规格,
                   材料流水号: response.data.rows[i].材料流水号,
                   checked_dailiao: false,
@@ -923,7 +928,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -971,7 +976,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1043,7 +1048,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1091,7 +1096,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1140,6 +1145,11 @@ export default {
         }
       }
     },
+    tableRowClassName({ row }) {
+      if (row.是否加急件 === '1') {
+        return 'IsUrgentItem'
+      }
+    },
     // 打回档案
     handleDele(index, row, formName) {
       this.count2 = this.count2 + 1
@@ -1248,3 +1258,8 @@ export default {
     /*margin-left: 120px;*/
   }
 </style>
+<style>
+  .el-table .IsUrgentItem{
+    background: #ff7575;
+  }
+</style>
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index 640fa768..d4dafd3d 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -20,7 +20,7 @@
       </el-select>
       <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
       <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-      <el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button>
+      <el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
     </el-card>
     <el-row>
       <el-card style="width: 50%; float: left">
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 8e79bcae..060763bd 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="padding-top: 10px">
       <el-row>
         <!--        <span>机床编号:</span>-->
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
@@ -21,6 +21,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
+        <span style="margin-left: 50px">三表下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
         <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
         <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
         <el-badge :value="value1" :max="99" class="item">
@@ -63,7 +64,7 @@
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
-          <el-table :data="tableData1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData1" :row-class-name="tableRowClassName1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="零件名称" align="center" width="120px">
               <template slot-scope="scope">
@@ -567,13 +568,14 @@
 </template>
 
 <script>
-import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
+import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
 export default {
   inject: ['reload'],
   data() {
     return {
+      DeliveryTime: '', // 三表下达时间
       projectFloatValue: '',
       machineNumberValue: '',
       machineFloatValue: '',
@@ -852,6 +854,11 @@ export default {
         return 'adopt'
       }
     },
+    tableRowClassName1({ row }) {
+      if (row.是否加急件 === 1) {
+        return 'isUrgentItem'
+      }
+    },
     machineChange() {
       this.groupNumberValue = ''
       this.groupNumber = []
@@ -864,12 +871,21 @@ export default {
         }
       })
     },
+    // 三表下达时间查询
+    DeliveryTimeSelect() {
+      this.DeliveryTime = ''
+      DeliveryTimeSelect(this.groupNumberValue).then(response => {
+        console.log(response.data)
+        this.DeliveryTime = response.data[0].操作日期.substring(0, 10)
+      })
+    },
     searchTable() {
       this.loading = true
       if (this.machineNumberValue !== '') {
         this.check2 = 1
       } else { this.check2 = 0 }
       if (this.groupNumberValue !== '') {
+        this.DeliveryTimeSelect() // 三表下达时间查询
         this.check3 = 1
       } else { this.check3 = 0 }
       searchTable(this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
@@ -1524,4 +1540,7 @@ export default {
   .el-table .adopt{
     background: limegreen;
   }
+  .el-table .isUrgentItem{
+    background: #ff7575;
+  }
 </style>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 3ff0d547..282a1c6a 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -36,7 +36,6 @@
         height="750"
         highlight-current-row
         border
-        stripe
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
         <el-table-column align="center" label="零件号" prop="零件号" width="160">
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 98f8ef2d..ebb621c9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,14 +3,27 @@
     <el-card>
       <span>设备名称:</span>
       <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
+      </el-tooltip>
+      <span style="margin-left: 40px">有效时间：</span>
+      <el-date-picker
+        v-model="time"
+        type="date"
+        size="small"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
+      </el-tooltip>
+      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
+        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
     </el-card>
 
     <el-card>
-      <el-table :data="List" border size="small" stripe highlight-current-row height="500px">
+      <el-table :data="List" border size="small" stripe highlight-current-row height="700px">
         <el-table-column label="设备名称" prop="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card>
-      <span>有效时间：</span>
-      <el-date-picker
-        v-model="time"
-        type="date"
-        size="small"
-        value-format="yyyy-MM-dd"
-        placeholder="选择日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
-      </el-tooltip>
-      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
-        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
-      </el-tooltip>
+    <!--      <div class="block" style="margin-top: 10px;">-->
+    <!--        <el-pagination-->
+    <!--          :current-page="pageCurrent"-->
+    <!--          :page-sizes="[10, 20, 30, 40]"-->
+    <!--          :page-size="pageSize"-->
+    <!--          :total="total"-->
+    <!--          layout="total, sizes, prev, pager, next, jumper"-->
+    <!--          @size-change="handleSizeChange"-->
+    <!--          @current-change="handleCurrentChange"/>-->
+    <!--      </div>-->
     </el-card>
+    <!--    <el-card>-->
+    <!--      <span>有效时间：</span>-->
+    <!--      <el-date-picker-->
+    <!--        v-model="time"-->
+    <!--        type="date"-->
+    <!--        size="small"-->
+    <!--        value-format="yyyy-MM-dd"-->
+    <!--        placeholder="选择日期"/>-->
+    <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
+    <!--        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
+    <!--        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--    </el-card>-->
 
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -240,8 +253,8 @@ export default {
         this.check = 0
       }
       getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
-        this.List = response.data.rows
-        this.total = response.data.total
+        this.List = response.data
+        // this.total = response.data.total
       })
     },
     initialization() {
@@ -399,4 +412,14 @@ export default {
   .el-card{
     margin-bottom: 1px;
   }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*  background: #fdf6ec;*/
+  /*  border-color: #ff9759;*/
+  /*  color: #ff9759;*/
+  /*}*/
 </style>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 38df33ef..4a7bafc3 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -39,11 +39,10 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
         </el-tooltip>
-        <!--        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
       </div>
     </el-card>
     <el-row>
@@ -74,7 +73,7 @@
             </el-table-column>
             <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
               <template slot-scope="scope">
-                {{ scope.row.合同签订日期 }}
+                {{ scope.row.合同签订日期.substring(0,10) }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="合同信息备注" min-width="150">
@@ -456,21 +455,21 @@ export default {
 </script>
 
 <style scoped>
-  .el-button--success {
-    background: #ffffff;
-    border-color: #2d72d5;
-    color: #2d72d5;
-  }
-  .el-button--primary {
-     background: #ffffff;
-     border-color: #ff9759;
-     color: #ff9759;
-   }
-  .el-button--info {
-    background: #ffffff;
-    border-color: #67c23a;
-    color: #67c23a;
-  }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*   background: #fdf6ec;*/
+  /*   border-color: #ff9759;*/
+  /*   color: #ff9759;*/
+  /* }*/
+  /*.el-button--info {*/
+  /*  background: #f0f9eb;*/
+  /*  border-color: #67c23a;*/
+  /*  color: #67c23a;*/
+  /*}*/
 </style>
 <style lang="scss">
   .subTableHeader {
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2e4839f4..ada8a541 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -4,7 +4,7 @@
       <span>零件号:</span>
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
       <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
-      <el-button type="danger" size="mini" icon="el-icon-caret-right" style="margin-left:10px" @click="getBack()">打回车间</el-button>
+      <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
       <el-table
         v-loading="loading1"
         ref="multipleTable"
@@ -139,15 +139,15 @@
           <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
           <!--</el-tooltip>-->
           <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
-          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出单据</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">成交</el-button>
+            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">提交</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
             <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button>
           </el-tooltip>
         </div>
-        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" :row-class-name="tableRowClassName" height="488" stripe size="mini" show-summary border>
+        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" stripe size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -205,13 +205,13 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete1(scope.$index)">移除</el-button>
+              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.$index)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-card>
-    <el-card v-show="true">
+    <el-card v-show="false">
       <div id="RWD">
         <table cellspacing="0px" align="center" width="100%" style="">
           <tbody id="1">
@@ -315,7 +315,7 @@
           <!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>-->
           <!--</el-input>-->
         </el-form-item>
-        <el-form-item label="运费" prop="运费" style="margin-left: 70px">
+        <el-form-item v-show="false" label="运费" prop="运费" style="margin-left: 70px">
           <el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
         </el-form-item>
       </el-form>
@@ -682,9 +682,9 @@ export default {
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '增加外协表单') {
+          if (this.title === '新增外协任务单') {
             this.submitAdd()
-          } else if (this.title === '编辑外协表单') {
+          } else if (this.title === '编辑外协任务单') {
             this.submitEdit()
           }
         }
@@ -694,7 +694,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '增加外协表单'
+      this.title = '新增外协任务单'
       var time = new Date()
       var month = time.getMonth() + 1
       var day = time.getDate()
@@ -1145,7 +1145,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '编辑外协表单'
+      this.title = '编辑外协任务单'
       this.dialogFormVisible = true
       this.form.表单号 = row.表单号
       this.form.运费 = row.运费
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 5faed134..a4dd7a02 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -5,7 +5,7 @@
         <!--<span>表单号:</span>-->
         <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>-->
         <span>厂家:</span>
-        <el-input v-model="manufacturers" size="small" placeholder="厂家" style="width:160px" clearable @keyup.enter.native="pageSize=10;pageList=1;fetchData()"/>
+        <el-input v-model="manufacturers" size="small" placeholder="厂家或外协任务单号" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()"/>
         <!--<span>下达任务日期:</span>-->
         <!--<el-date-picker-->
         <!--v-model="time"-->
@@ -15,7 +15,7 @@
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
       </el-card>
       <el-card>
-        <el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="550" border @row-click="searchProcess" >
+        <el-table v-loading="loading2" :data="List" :row-class-name="tableData1ClassName" highlight-current-row size="mini" height="550" border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
             <template slot-scope="scope">
               {{ scope.row.表单号 }}
@@ -23,7 +23,7 @@
           </el-table-column>
           <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
             <template slot-scope="scope">
-              {{ scope.row.外协厂家 }}
+              {{ scope.row.外协厂家名称 }}
             </template>
           </el-table-column>
         </el-table>
@@ -43,9 +43,6 @@
     <el-col :span="14">
       <el-card>
         <el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">收货</el-button>
-        <!--<el-tooltip :open-delay="1200" effect="dark" content="打印外协任务单" placement="top">-->
-        <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;float: right" @click="exportTable('RWD')">导出单据</el-button>-->
-        <!--</el-tooltip>-->
         <el-table v-loading="loading" :data="List3" border stripe size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column
             :selectable="selectable"
@@ -73,93 +70,21 @@
               {{ 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>
       </el-card>
     </el-col>
-    <el-card v-show="false">
-      <div id="RWD">
-        <table cellspacing="0px" align="center" width="100%" style="">
-          <tbody id="1">
-            <tr>
-              <td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
-              <td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="2">任务单号:</td>
-              <td colspan="6">{{ 任务单号 }}</td>
-              <td colspan="4">任务下达日期:</td>
-              <td colspan="4">{{ 任务下达日期 }}</td>
-              <td colspan="3">外协厂家:</td>
-              <td colspan="9">{{ 外协厂家 }}</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="2">外协员:</td>
-              <td colspan="6">{{ 外协员 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="6">{{ 外协员电话 }}</td>
-              <td colspan="3">联系人:</td>
-              <td colspan="3">{{ 联系人 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="4">{{ 联系人电话 }}</td>
-            </tr>
-            <tr id="tableHead">
-              <td style="width: 2%">序号</td>
-              <td colspan="5">零件图号</td>
-              <td colspan="2" style="width: 4%">零件名称</td>
-              <td colspan="2" style="width: 2%">数量</td>
-              <td colspan="9" width="30%">内容</td>
-              <td colspan="1">零件类型</td>
-              <td>外协类别</td>
-              <td>加工价格</td>
-              <td>材料价格</td>
-              <td>其他价格</td>
-              <td colspan="2">计划开始</td>
-              <td colspan="2">计划结束</td>
-            </tr>
-
-          </tbody>
-          <tfoot>
-            <tr id="tableFoot">
-              <td>费用</td>
-              <td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
-              <td colspan="1">0</td>
-              <td colspan="1"/>
-              <td/>
-              <td>{{ 加工价格合计 }}</td>
-              <td>{{ 材料价格合计 }}</td>
-              <td>{{ 其他价格合计 }}</td>
-              <td colspan="2">{{ 最早时间 }}</td>
-              <td colspan="2">{{ 最晚时间 }}</td>
-            </tr>
-            <tr class="foot">
-              <td colspan="4">外协员:</td>
-              <td colspan="4">外协科长:</td>
-              <td colspan="4">采购二部长:</td>
-              <td colspan="4">制品部长:</td>
-              <td colspan="4">定额科统计员:</td>
-              <td colspan="4">定额科长:</td>
-              <td colspan="4">外协厂:</td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-    </el-card>
-
   </div>
 </template>
 
 <script>
-import { handlechange, shouhuo, getTable, getprocedure, spareParts, Arrival, getParts } from '@/api/Outsourcing/OutsourcingTaskQuery'
-import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
-import { convertCurrency } from '@/vendor/int2Chinese'
+import { getTable, Arrival, getParts } from '@/api/Outsourcing/OutsourcingTaskQuery'
 import { mapGetters } from 'vuex'
 import elInput from 'element-ui/packages/input'
-import $ from 'jquery'
 
 export default {
   components: {
@@ -263,7 +188,7 @@ export default {
       机加工结束时间: [],
       外协加工任务单明细流水号: [],
       total: null, // 总条数
-      pageSize: 10, // 每页显示条数
+      pageSize: 20, // 每页显示条数
       pageList: 1, // 后台获取页
       currentPage: 1 // 显示当前页
     }
@@ -280,320 +205,32 @@ export default {
     this.fetchData()
   },
   methods: {
-    exportTable() {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        const htmlNode = $('#RWD').html()
-        const body = $('body')
-        body.children().hide()
-        const printNode = $(htmlNode)
-        body.append(printNode)
-        window.print()
-        body.children().not('script').show()
-        printNode.remove()
-      }
-    },
-    shouhuo(row) {
-      this.$confirm('此操作将不可更改, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.wancheng === 1) {
-          for (let i = 0; i < this.gongxulsh.length; i++) {
-            handlechange(this.gongxulsh[i].工序流水号, '0000')
-            if (i === this.gongxulsh.length - 1) {
-              shouhuo(row.外协加工任务单流水号).then(response => {
-                if (response.data[0].result === '1') {
-                  this.fetchData()
-                }
-              })
-            }
-          }
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        })
-      })
-    },
     fetchData() {
       this.loading2 = true
-      var day3 = new Date(this.time)
-      var day4 = new Date(this.time)
-      day3.setTime(day3.getTime() - 24 * 60 * 60 * 1000)
-      day4.setTime(day4.getTime() + 24 * 60 * 60 * 1000)
-      var month1 = day3.getMonth() + 1
-      var month2 = day4.getMonth() + 1
-      var day1 = day3.getDate()
-      var day2 = day4.getDate()
-      if (month1 >= 1 && month1 <= 9) {
-        month1 = '0' + month1
-      }
-      if (day1 >= 1 && day1 <= 9) {
-        day1 = '0' + day1
-      }
-      if (month2 >= 1 && month2 <= 9) {
-        month2 = '0' + month2
-      }
-      if (day2 >= 1 && day2 <= 9) {
-        day2 = '0' + day2
-      }
-      this.time1 = day3.getFullYear() + '/' + month1 + '/' + day1
-      this.time2 = day4.getFullYear() + '/' + month2 + '/' + day2
-      if (this.formNumber !== '') {
-        this.num = 1
-      } else {
-        this.num = 0
-      }
-      if (this.manufacturers !== '') {
-        this.num1 = 1
-      } else {
-        this.num1 = 0
-      }
-      if (this.time === '' || this.time === null) {
-        this.num2 = 0
-      } else {
-        this.num2 = 1
-      }
-      if (this.time1 === 'NaN/NaN/NaN') {
-        this.time1 = ''
-      }
-      if (this.time2 === 'NaN/NaN/NaN') {
-        this.time2 = ''
-      }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
+      var check
+      this.manufacturers ? check = 1 : check = 0
+      getTable(check, this.manufacturers, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].任务下达日期 !== null) {
-            response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
-          }
-        }
         this.List = response.data.rows
       })
       this.loading2 = false
     },
-    selectable(row, index) { // 控制某行是否可选
+    // 控制某行是否可选
+    selectable(row, index) {
       return parseInt(row.到货状态) !== 1 // 已经到货
     },
     // 查询
     searchProcess(row) {
-      this.wancheng = ''
-      this.gongxulsh = []
-      this.任务单号 = row.表单号
-      this.任务下达日期 = row.任务下达日期
-      this.外协厂家 = row.外协厂家
-      this.外协员 = row.外协计划员
-      // 以上是新增的
-      this.contrast = 3000000000000
-      this.contrast1 = 0
+      this.Number = row.外协加工任务单流水号
       this.loading = true
       this.List3 = []
-      this.bianliang = []
-      this.零件图号 = []
-      this.零件名称 = []
-      this.批次数量 = []
-      this.外协预算总价格 = []
-      this.加工价格_成交 = []
-      this.外协分类 = []
-      this.材料费 = []
-      this.材料价格_价格 = []
-      this.其他价格 = []
-      this.机加工开始时间 = []
-      this.机加工结束时间 = []
-      this.外协加工任务单明细流水号 = []
-      this.process = []
-      this.freight = row.运费
-      this.Number = row.外协加工任务单流水号
-      getParts(this.Number).then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-        }
-        this.returns = data
-        for (let j = 0; j < data.length; j++) {
-          this.List3.push({
-            零件图号: data[j].零件图号,
-            零件名称: data[j].零件名称,
-            批次数量: data[j].批次数量,
-            到货状态: data[j].到货状态,
-            工艺计划流水号: data[j].工艺计划流水号,
-            外协加工任务单明细流水号: data[j].外协加工任务单明细流水号,
-            单件是否外协: data[j].单件是否外协,
-            外协工序: ''
-          })
-        }
-        this.getProcedure(this.List3)
-        this.加工价格合计 = 0
-        this.材料价格合计 = 0
-        this.其他价格合计 = 0
-        if (response.data.length !== 0) {
-          this.外协员电话 = response.data[0].联系电话
-          this.联系人 = response.data[0].联系人
-          this.联系人电话 = response.data[0].电话
-          this.运费 = response.data[0].运费
-          this.card = true
-        } else {
-          this.card = false
-        }
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('1')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
-          }
-        }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-              '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-          $('#tableHead').after(tr[i])
-        }
-        for (let j = 0; j < this.returns.length; j++) {
-          document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-          document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-          document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-          document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-          if (response.data[j].机加工开始时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-          }
-          if (response.data[j].机加工结束时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-          }
-          this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-          this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-          this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-        }
-        this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-        this.大写金额 = convertCurrency(this.总计)
-        // RWD end
-        for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-          this.零件图号.push(response.data[i].零件图号)
-          this.零件名称.push(response.data[i].零件名称)
-          this.批次数量.push(response.data[i].批次数量)
-          this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-          this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-          this.外协分类.push(response.data[i].外协分类)
-          this.材料费.push(response.data[i].材料费.toFixed(2))
-          this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-          this.其他价格.push(response.data[i].其他价格.toFixed(2))
-          if (response.data[i].机加工开始时间 !== null) {
-            this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-          } else {
-            this.机加工开始时间.push(' ')
-          }
-          if (response.data[i].机加工结束时间 !== null) {
-            this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-          } else {
-            this.机加工结束时间.push(' ')
-          }
-          this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-          this.process[i] = []
-        }
-        for (let i = 0; i < this.returns.length; i++) {
-          spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-            for (let k = 0; k < response.data.length; k++) {
-              this.gongxulsh.push({
-                工序流水号: response.data[k].工序流水号
-              })
-              this.process[i][k] = response.data[k].工艺名称简称
-              document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-            }
-          }).then(() => {
-            this.wancheng = 1
-          })
-        }
-      }).then(() => {
-        // this.List3 = this.bianliang
+      getParts(row.外协加工任务单流水号).then(response => {
+        this.List3 = response.data
         this.loading = false
       })
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    getProcedure(row) {
-      for (let i = 0; i < row.length; i++) {
-        getprocedure(row[i].工艺计划流水号, row[i].单件是否外协).then(response => {
-          this.List3[i].外协工序 = ''
-          this.procedure[i] = ''
-          for (let j = 0; j < response.data.length; j++) {
-            this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
-          }
-          this.List3[i].外协工序 = this.procedure[i]
-        })
-      }
-    },
-    getSummaries(param) {
-      const { data } = param
-      const sums = ['', '', '', 0, '', 0, '', 0, '', 0, '', 0, '', '', '', '', '', '', '', '', '', '', '', '', 0, 0, '', 0, 0, 0, '', '']
-      sums[1] = '费用'
-      sums[2] = '加工费:'
-      sums[4] = '材料费:'
-      sums[6] = '其他费用:'
-      sums[8] = '运费:'
-      sums[9] = parseInt(this.freight)
-      sums[10] = '合计:'
-      for (let i = 0; i < data.length; i++) {
-        sums[24] += Math.round(parseFloat(data[i].外协预算总价格) * 100) / 100
-      }
-      sums[24] = Math.round(sums[24] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[25] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
-      }
-      sums[25] = Math.round(sums[25] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[27] += Math.round(parseFloat(data[i].材料费) * 100) / 100
-      }
-      sums[27] = Math.round(sums[27] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[28] += Math.round(parseFloat(data[i].材料价格_价格) * 100) / 100
-      }
-      sums[28] = Math.round(sums[28] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[29] += Math.round(parseFloat(data[i].其他价格) * 100) / 100
-      }
-      sums[29] = Math.round(sums[29] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].机加工开始时间 !== null) {
-          if (Date.parse(data[i].机加工开始时间) <= this.contrast) {
-            this.contrast = Date.parse(data[i].机加工开始时间)
-            sums[30] = data[i].机加工开始时间.substr(0, 10)
-            this.最早时间 = data[i].机加工开始时间.substr(0, 10)
-          }
-        }
-      }
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].机加工结束时间 !== null) {
-          if (Date.parse(data[i].机加工结束时间) >= this.contrast1) {
-            this.contrast1 = Date.parse(data[i].机加工结束时间)
-            sums[31] = data[i].机加工结束时间.substr(0, 10)
-            this.最晚时间 = data[i].机加工结束时间.substr(0, 10)
-          }
-        }
-      }
-      sums[3] = sums[25]
-      sums[5] = sums[28]
-      sums[7] = sums[29]
-      sums[11] = Math.round((sums[3] + sums[5] + sums[7] + sums[9]) * 100) / 100
-      sums[26] = '---'
-      return sums
-    },
-    indexMethod(index) {
-      return index + 1
-    },
     handleSelectionChange(val) {
       this.OutsouringNumber = []
       this.工艺计划流水号 = []
@@ -602,124 +239,17 @@ export default {
         this.工艺计划流水号.push(val[i].工艺计划流水号)
       }
     },
+    // 收货
     getSpareParts() {
       if (this.OutsouringNumber.length !== 0) {
         this.loading = true
-        Arrival(this.OutsouringNumber, this.工艺计划流水号).then(response => {
+        Arrival(this.Number, this.OutsouringNumber, this.工艺计划流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('到货成功')
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
+            this.fetchData()
             getParts(this.Number).then(response => {
-              this.returns = response.data
-              for (let j = 0; j < response.data.length; j++) {
-                this.List3.push({
-                  零件图号: response.data[j].零件图号,
-                  零件名称: response.data[j].零件名称,
-                  批次数量: response.data[j].批次数量,
-                  到货状态: response.data[j].到货状态,
-                  工艺计划流水号: response.data[j].工艺计划流水号,
-                  外协加工任务单明细流水号: response.data[j].外协加工任务单明细流水号,
-                  单件是否外协: response.data[j].单件是否外协,
-                  外协工序: ''
-                })
-              }
-              this.getProcedure(this.List3)
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                  '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.loading = false
-                })
-              }
+              this.List3 = response.data
+              this.loading = false
             })
           } else {
             this.$message.error('到货失败')
@@ -729,21 +259,10 @@ export default {
         this.$message.warning('请选择零件')
       }
     },
-    downLoadRWD(tableid) {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        getExplorer()
-        method5(tableid)
-        Cleanup()
-      }
-    },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.差价 < 0) {
-        return 'chajia'
-      } else {
-        return ''
+    tableData1ClassName({ row, rowIndex }) {
+      row.index = rowIndex
+      if (row.到货状态 === '1') {
+        return 'WXDHdh'
       }
     },
     // 分页
@@ -766,6 +285,9 @@ export default {
   }
 </style>
 <style>
+  .WXDHdh{
+    background: #9bd7fc !important;
+  }
   td{
     width: 100px;
     height: 30px;
@@ -799,4 +321,3 @@ export default {
     height: 30px;
   }
 </style>
-
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 2eb8064b..578781b9 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -20,13 +20,8 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
-        <el-button size="small" icon="el-icon-search" type="success" style="" @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
-        <el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
-          <el-table-column
-            label="序号"
-            type="index"
-            align="center"
-            width="50"/>
+        <el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
+        <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
           <el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -42,11 +37,6 @@
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="种类" prop="零件类型名臣" align="center" width="80px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ scope.row.零件类型名称 }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="数量" align="center" width="60px">
             <template slot-scope="scope">
               {{ scope.row.批次数量 }}
@@ -68,7 +58,7 @@
     </el-col>
     <el-col :span="14">
       <el-card>
-        <el-button size="small" type="primary" style="margin: 10px" @click="saveRowPrice()">保存</el-button>
+        <el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
         <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="加工状态" width="100" align="center">
@@ -84,12 +74,6 @@
               <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
             </template>
           </el-table-column>
-          <!--<el-table-column label="外协状态" width="100" align="center">-->
-          <!--<template slot-scope="scope">-->
-          <!--<span v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</span>-->
-          <!--<span v-else size="small">否</span>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="工艺名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
@@ -125,6 +109,7 @@ export default {
       count: 0, // 计数器  (表二是否有外协工序)
       InOut: 1, // 工序间是否外协变量 1自家 2外协
       index: 0, // 当前点击行（改变颜色不刷新用）
+      index2: 0, // 当前点击行（改变颜色不刷新用）
       num1: '',
       checkBox: [],
       loading1: false,
@@ -217,6 +202,7 @@ export default {
       this.loading2 = true
       this.checkBox = []
       this.tableData2 = []
+      this.index2 = row.index
       searchTable2(row.工艺计划流水号).then(response => {
         this.num1 = row.工艺计划流水号
         if (response.data.length === 0) {
@@ -249,6 +235,12 @@ export default {
         return 'XJWXywc'
       }
     },
+    tableData1ClassName2({ row, rowIndex }) {
+      row.index = rowIndex
+      if (row.状态 === 1 || row.状态 === '1') {
+        return 'XJWXwx'
+      }
+    },
     // 修改外协状态
     edit(index, row) {
       this.count = 0
@@ -259,70 +251,20 @@ export default {
         }
       }
       if (this.count === this.tableData2.length) {
+        this.tableData1[this.index2].状态 = 0
         edit2(row.工序流水号, row.工艺计划流水号, 0)
       }
       if (this.checkBox[index] === true) {
         this.InOut = 2
+        this.tableData2[this.index].工序间是否外协 = 2
+        this.tableData1[this.index2].状态 = 1
         edit(row.工序流水号, this.InOut).then(response => {
-          edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
-            this.$message.success('工序外协状态更改成功')
-            this.tableData2[this.index].工序间是否外协 = 2
-            // this.loading2 = true
-            // this.checkBox = []
-            // this.tableData2 = []
-            // searchTable2(this.num1).then(response => {
-            //   if (response.data.length === 0) {
-            //     this.loading0 = false
-            //   } else {
-            //     for (let i = 0; i < response.data.length; i++) {
-            //       if (response.data[i].工序间是否外协 === 1) {
-            //         this.checkBox.push(false)
-            //       } else {
-            //         this.checkBox.push(true)
-            //       }
-            //     }
-            //     for (let i = 0; i < response.data.length; i++) {
-            //       response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
-            //       response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
-            //       response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
-            //     }
-            //     this.tableData2 = response.data
-            //   }
-            // }).then(() => {
-            //   this.loading2 = false
-            // })
-          })
+          edit2(row.工序流水号, row.工艺计划流水号, 1)
         })
       } else {
         this.InOut = 1
-        edit(row.工序流水号, this.InOut).then(response => {
-          this.$message.success('工序外协状态更改成功')
-          this.tableData2[this.index].工序间是否外协 = 1
-          // this.loading2 = true
-          // this.checkBox = []
-          // this.tableData2 = []
-          // searchTable2(this.num1).then(response => {
-          //   if (response.data.length === 0) {
-          //     this.loading0 = false
-          //   } else {
-          //     for (let i = 0; i < response.data.length; i++) {
-          //       if (response.data[i].工序间是否外协 === 1) {
-          //         this.checkBox.push(false)
-          //       } else {
-          //         this.checkBox.push(true)
-          //       }
-          //     }
-          //     for (let i = 0; i < response.data.length; i++) {
-          //       response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
-          //       response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
-          //       response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
-          //     }
-          //     this.tableData2 = response.data
-          //   }
-          // }).then(() => {
-          //   this.loading2 = false
-          // })
-        })
+        this.tableData2[this.index].工序间是否外协 = 1
+        edit(row.工序流水号, this.InOut)
       }
     },
     // 保存行价格
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 159e251a..06eefe6a 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -149,13 +149,13 @@
       </el-tooltip>
       <hr>
       <!--html代码-->
-      <div v-show="false">{{ content }}</div>
+      <!--<div v-show="false">{{ content }}</div>-->
       <!--富文本编辑器-->
-      <div v-show="!preview" id="tinymce" style="height:850px;">
-        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>
-      </div>
+      <!--<div v-show="!preview" id="tinymce" style="height:850px;">-->
+      <!--<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>-->
+      <!--</div>-->
       <!--网页预览-->
-      <div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
+      <div v-show="!preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
     </el-card>
   </div>
 </template>
@@ -421,7 +421,7 @@ export default {
     },
     submitTotal() { // 确定合同总额
       // this.$refs.tinymce.destroyTinymce()
-      this.$refs.tinymce.initTinymce()
+      // this.$refs.tinymce.initTinymce()
       document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
       document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
       document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -778,7 +778,7 @@ export default {
           document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
           document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
           this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-          this.$refs.tinymce.initTinymce()
+          // this.$refs.tinymce.initTinymce()
           setTimeout(() => {
             this.$refs.tinymce.setContent(this.contentNew)
           }, 1000)
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 838f5213..0cdeaa5e 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -245,7 +245,7 @@
             <el-button
               :disabled="Number(id)!==0"
               size="mini"
-              plsin
+              plain
               type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
@@ -290,7 +290,7 @@
           <el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
         </el-form-item>
         <el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
-          <el-input v-model="form.零件数量" placeholder="零件数量" size="small" style="width:200px" clearable/>
+          <el-input-number v-model="form.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
         </el-form-item>
         <el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
           <el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 0aaae272..b1370518 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -88,7 +88,7 @@
           <el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
-          <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 50px" @click="saveMateriel">保存</el-button>
+          <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 140px" @click="saveMateriel">保存</el-button>
         </el-tooltip>
       </div>
       <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="200px" size="mini" highlight-current-row @row-click="searchTable3">
@@ -105,13 +105,13 @@
             {{ scope.row.采购单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购计划单名称" prop="采购单名称" align="center" width="120">
+        <el-table-column label="外购计划单名称" prop="采购单名称" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购单名称 }}
           </template>
         </el-table-column>
         <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
-        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="230" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -228,11 +228,11 @@
       </el-table>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px" @close="closedialog()">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="采购计划单名称" prop="采购计划单名称">
+            <el-form-item label="外购计划单名称" prop="采购计划单名称">
               <el-input v-model="form2.采购单名称" size="small"/>
             </el-form-item>
           </el-col>
@@ -269,13 +269,13 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          v-show="title2==='创建采购计划单'"
+          v-show="title2==='创建外购计划单'"
           type="primary"
           size="small"
           icon="el-icon-check"
           @click="submitAddPurchaseOrder">确定</el-button>
         <el-button
-          v-show="title2==='编辑采购计划单'"
+          v-show="title2==='编辑外购计划单'"
           type="primary"
           size="small"
           icon="el-icon-check"
@@ -466,7 +466,7 @@ export default {
   },
   created() {
     this.searchRawMaterial()
-    this.searchTable1()
+    // this.searchTable1()
     // this.searchTable2()
   },
   methods: {
@@ -604,12 +604,20 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      this.title2 = '创建采购计划单'
+      this.title2 = '创建外购计划单'
       this.form2.supplierNameValue = ''
       this.form2.供应商名称 = ''
       this.form2.计划完成日期 = ''
       this.dialogVisible2 = true
     },
+    closedialog() {
+      this.form2.采购计划流水号 = ''
+      this.form2.采购单名称 = ''
+      this.form2.supplierNameValue = ''
+      this.form2.计划完成日期 = ''
+      this.form2.供应商名称 = ''
+      this.form2.计划完成日期 = ''
+    },
     submitAddPurchaseOrder() { // 新建采购单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
@@ -683,18 +691,18 @@ export default {
     },
     exportExcel2(row) {
       this.searchTable3(row).then(val => {
-        console.log(val)
+        console.log(row, 11111)
         console.log(this.tableData4)
         if (this.tableData4.length !== 0) {
            import('@/vendor/Export2Excel').then(excel => {
              const tHeader = ['备料状态', '物料编码', '零件名称', '材料', '数量', '成品尺寸', '单位', '备注']
-             const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '采购数量', '成品尺寸', '备注1']
+             const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '总数量', '成品尺寸', '单位', '备注1']
              const list = this.tableData4
              const data = this.formatJson(filterVal, list)
              excel.export_json_to_excel({
                header: tHeader,
                data,
-               filename: '详情',
+               filename: row.采购单名称 + '-' + row.计划完成日期,
                autoWidth: true,
                bookType: 'xlsx'
              })
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index a8dbc081..46cdd120 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -10,18 +10,20 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--<el-input v-model="Name" placeholder="供应商" size="small" clearable/>-->
-        <!--<span>关联情况:</span>-->
-        <!--<el-select v-model="PickingValue" placeholder="关联情况" size="small" clearable>-->
-        <!--<el-option-->
-        <!--v-for="item in Picking"-->
-        <!--:key="item.value"-->
-        <!--:label="item.label"-->
-        <!--:value="item.value"/>-->
-        <!--</el-select>-->
-        <!--<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">-->
-        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>-->
-        <!--</el-tooltip>-->
+        <span>请款时间段:</span>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 300px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
       </div>
     </el-card>
@@ -34,7 +36,7 @@
             <el-tag v-else type="primary" size="mini">未结算</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="供应商名称" align="center" width="200">
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -44,12 +46,12 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货单号" align="center" width="150">
+        <el-table-column label="到货单号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.到货单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200" fixed="right">
+        <el-table-column label="操作" align="center" width="170" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
@@ -245,7 +247,7 @@
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
       <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
-        <el-row>
+        <el-row style="background-color: white">
           <el-col :span="5" style="margin-left: 2%">
             <span>供应商</span>
             <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
@@ -274,7 +276,7 @@
         </el-row>
         <el-row>
           <div style="width: 20%;float: left;margin-top: 20px">
-            <div style="background: gainsboro">
+            <div style="background: white">
               <el-row style="height: 50px">
                 <el-form-item label="材料" prop="CailiaoValue">
                   <el-input v-model="form10.CailiaoValue" size="small"/>
@@ -505,6 +507,37 @@ import { ExcelWaiGou } from '@/utils/request'
 export default {
   data() {
     return {
+      check1: 0,
+      check2: 0,
+      dateRange: '',
+      expands: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       excle_row: [],
       supplierNameValue: '',
       supplierName: [], // 供应商
@@ -517,11 +550,11 @@ export default {
       planTypes: [
         {
           value: 0,
-          label: '采购计划'
+          label: '备料采购计划'
         },
         {
           value: 1,
-          label: '离线采购计划'
+          label: '备料（离线）采购计划'
         }
       ],
       arrest: [],
@@ -628,7 +661,7 @@ export default {
   created() {
     this.fetchdata()
     this.searchTable2()
-    this.searchTable4()
+    // this.searchTable4()
   },
   methods: {
     saveData(row) {
@@ -711,7 +744,7 @@ export default {
       const sums = []
       columns.forEach((column, index) => {
         if (index === 1) {
-          sums[index] = '总数量：'
+          sums[index] = '总重量：'
           return
         } else if (index === 2) {
           const values = data.map(item => Number(item['数量']))
@@ -728,6 +761,9 @@ export default {
           } else {
             sums[index] = 'N/A'
           }
+        } else if (index === 3) {
+          sums[index] = 'KG'
+          return
         } else if (index === 4) {
           sums[index] = '总金额：'
           return
@@ -804,12 +840,13 @@ export default {
       this.tableData5 = []
       this.tableData6 = []
       this.supplierNameValue ? this.check = 1 : this.check = 0
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       if (this.PickingValue === 0 || this.PickingValue === 1) {
         this.check2 = 1
       } else {
         this.check2 = 0
       }
-      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
+      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
         this.tableData4 = response.data.rows
         this.total4 = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 2bddfa61..c81b7196 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -25,19 +25,19 @@
       <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
     </el-card>
     <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @selection-change="handleSelectionChange">
+      <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" prop="组号" width="120" align="center">
+        <el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" width="220">
+        <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -52,7 +52,7 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" align="center" min-width="160">
+        <el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
@@ -71,8 +71,8 @@
       </div>
     </el-card>
     <el-card style="width: 1137px">
-      <span>离线采购计划编号:</span>
-      <el-input v-model="purchasingOrder" placeholder="离线采购计划编号" size="small" style="width: 160px" clearable/>
+      <span>离线备料单号:</span>
+      <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
       <span style="margin-left: 10px">供应商:</span>
       <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
         <el-option
@@ -346,7 +346,7 @@ export default {
   },
   created() {
     this.searchRawMaterial()
-    this.searchTable()
+    // this.searchTable()
     this.getMachine()
   },
   methods: {
@@ -377,7 +377,7 @@ export default {
           if (Cookie.get('group') !== undefined) {
             this.Machine = parseInt(Cookie.get('machineValue'))
             this.getGroup()
-            this.getTableData()
+            // this.getTableData()
             this.Group = parseInt(Cookie.get('group'))
             // this.getTableData()
             Cookie.remove('machineValue')
@@ -418,7 +418,28 @@ export default {
         this.Group = response.data[0].组件流水号
       })
       this.getTableData()
-    }, // 按条件查询
+    },
+    // 按零件图号 组号 材料排序
+    sortChange(column) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '组号') {
+        this.ordername = 1
+      } else if (column.prop === '零件图号') {
+        this.ordername = 2
+      } else if (column.prop === '材料') {
+        this.ordername = 3
+      } else {
+        this.ordername = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.getTableData()
+    },
+    // 按条件查询
     getTableData() {
       this.tableData10 = []
       if (this.Machine === '') {
@@ -436,7 +457,7 @@ export default {
       } else {
         this.checkbox_number = 1
       }
-      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10).then(response => {
+      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => {
         if (response.data.rows.length !== 0) {
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData10.push({
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 49d42f0f..8592ba4f 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -121,7 +121,7 @@
                   :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
-                  icon="el-icon-delete"
+                  icon="el-icon-right"
                   style="margin-left: 20px"
                   @click="deleteTable1(scope.row)"/>
               </div>
@@ -142,7 +142,7 @@
       </div>
     </el-card>
     <el-card style="float: left;width: 41.3%;margin-left: 5px">
-      <el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%">
+      <el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
         <el-table-column width="50" align="center" type="index" label="序号"/>
         <el-table-column label="到货单编号" align="center">
           <template slot-scope="scope">
@@ -177,7 +177,7 @@
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
         <div style="width: 45%;float: left;margin-top: 5px">
-          <div style="background: gainsboro">
+          <div style="background: white">
             <el-form-item label="供应商" prop="supplierNameValue">
               <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
                 <el-option
@@ -190,10 +190,10 @@
             <el-form-item label="发票号" prop="money">
               <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
             </el-form-item>
-            <el-form-item label="开票时间" prop="invoiceTime">
+            <el-form-item label="到票时间" prop="invoiceTime">
               <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
             </el-form-item>
-            <el-form-item label="开票金额" prop="money">
+            <el-form-item label="到票金额" prop="money">
               <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
@@ -224,8 +224,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button v-show="title1==='新增备料发票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
-        <el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
+        <el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
+        <el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -417,7 +417,7 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '新增备料发票'
+      this.title1 = '新增备料到票'
       this.tableData4 = []
       this.dialogVisible1 = true
       console.log(this.supplierNames)
@@ -457,7 +457,7 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '编辑备料发票'
+      this.title1 = '编辑备料到票'
       this.dialogVisible1 = true
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 05fdda97..0790b283 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="margin-left: 0px;width: 68%;float: left">
+    <el-card>
       <el-col>
         <span>请款时间段:</span>
         <el-date-picker
@@ -29,6 +29,31 @@
           <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
         </el-tooltip>
       </el-col>
+    </el-card>
+    <el-card style="margin-left: 0px;width: 68%;float: left">
+      <!--@expand-change="searchTable02"-->
+      <!--<el-table-column type="expand" label="详情">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
+      <!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
+      <!--<el-table-column min-width="150" align="center" label="发票号">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.发票号 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column min-width="150" align="center" label="供应商">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.供应商名称 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.开票金额 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</el-table>-->
+      <!--</template>-->
+      <!--</el-table-column>-->
       <el-table
         v-loading=""
         :data="tableData1"
@@ -42,29 +67,6 @@
         show-summary
         highlight-current-row
         @row-click="searchTable02">
-        <!--@expand-change="searchTable02"-->
-        <!--<el-table-column type="expand" label="详情">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
-        <!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
-        <!--<el-table-column min-width="150" align="center" label="发票号">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.发票号 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column min-width="150" align="center" label="供应商">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.供应商名称 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.开票金额 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--</el-table>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -78,51 +80,47 @@
         <el-table-column label="请款人" align="center" min-width="80" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
-            <el-table-column label="请款时间" align="center" min-width="150" prop="date">
-              <template slot-scope="scope">
-                {{ scope.row.请款时间 | formatTime }}
-              </template>
-            </el-table-column>
-            <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
-              <template slot-scope="scope">
-                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="审批情况内容" width="100" align="center">
-              <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
-                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="未通过审批原因" width="110" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="付款情况" width="100" align="center">
-              <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="未付款原因" width="100" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="80">
-              <template slot-scope="scope">
-                <el-tooltip effect="dark" content="取消请款" placement="top">
-                  <div style="display: inline-block">
-                    <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
-                  </div>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-      </template></el-table-column></el-table>
+          </template>
+        </el-table-column>
+        <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
+          <template slot-scope="scope">
+            {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批情况内容" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
+            <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
+            <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="未通过审批原因" width="110" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="付款情况" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
+            <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
+            <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="未付款原因" width="100" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="80">
+          <template slot-scope="scope">
+            <el-tooltip effect="dark" content="取消请款" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
@@ -135,7 +133,7 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-card style="margin-left: 0px;width: 31%;float: left">
+    <el-card style="margin-left: 0px;width: 32%;float: left">
       <el-table-column type="expand" label="详情">
         <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
           <el-table-column width="50" align="center" type="index" label="序号"/>
@@ -194,7 +192,6 @@
     </el-dialog>
   </div>
 </template>
-
 <script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
 import { mapGetters } from 'vuex'
 
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 3f428e27..b86b571d 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -30,6 +30,7 @@ import Hamburger from '@/components/Hamburger'
 import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
 import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
 import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
 import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
 import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
@@ -47,6 +48,7 @@ export default {
       noticeContract4: null,
       noticeContract5: null,
       noticeContract6: null,
+      noticeContractJJ: null,
       noticeFund: null,
       noticeInvoice: null,
       noticeContractKG: null
@@ -75,6 +77,9 @@ export default {
     } else if (this.token.toString() === '15') {
       this.comfirmMaterial_KG()
       this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
+    } else if (this.token.toString() === '5') {
+      this.comfirmUrgentItem()
+      this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60)
     }
   },
   beforeDestroy() {
@@ -237,6 +242,22 @@ export default {
         }
       })
     },
+    comfirmUrgentItem() {
+      console.log(1111)
+      searchUrgentItem().then(res => {
+        if (res.data.length > 0) {
+          this.noticeContractJJ = null
+          this.noticeContractJJ = this.$notify.success({
+            title: '提示',
+            message: '您有加急件未打印，请及时处理',
+            onClick: () => {
+              setTimeout(this.noticeContractJJ.close(), 1000)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },