diff --git a/src/api/ManufacturingCenter/ProcessPlanningNew.js b/src/api/ManufacturingCenter/ProcessPlanningNew.js
new file mode 100644
index 00000000..c4da0966
--- /dev/null
+++ b/src/api/ManufacturingCenter/ProcessPlanningNew.js
@@ -0,0 +1,539 @@
+import request from '@/utils/request'
+
+// 查询零件未编制（包含借用件）
+export function getPartnames3(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查',
+      param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
+    }
+  })
+}
+// 查询零件已编制（包含借用件）
+export function getPartnames4(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按人员机床组号或图号查',
+      param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
+    }
+  })
+}
+// 典艺查询<高精原有数据>
+export function searchProcess11(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺查询_MESWORK',
+      param: '零件图号=' + num
+    }
+  })
+}
+// 典艺查询<高精原有数据>
+export function numChange(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
+      param: '典艺流水号=' + num
+    }
+  })
+}
+// 保存主表工艺
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
+      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
+// 初始化 工艺员A
+export function initCraftmen() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=20'
+    }
+  })
+}
+// 查询 未编制 零件号
+export function getPartnames1(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员查',
+      param: '工艺人员编号=' + num1 + '&零件图号=' + num2
+    }
+  })
+}
+// 初始化 已编制 零件号
+export function getPartnames2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件',
+      param: '工艺人员编号=' + num1 + '&零件图号=' + num2
+    }
+  })
+}
+// 零件详细信息
+export function detailInfo(serialNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查已投产零件信息',
+      param: '工艺计划流水号=' + serialNum + '=int'
+    }
+  })
+}
+// 初始化材质
+export function getMaterial(pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_材质表_查询数据',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 根据材质名称查材质
+export function searchMaterial(pageCurrent, pageSize, name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_材质表_查询数据_根据材料名称',
+      param: '材料名称=' + name,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 典型工艺选择零件分类A
+export function typicalProcess() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_典型工艺名称_分类_查询数据'
+    }
+  })
+}
+// 典型工艺选择零件名称、工艺号、备注
+export function FcK(serialNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_查典型工艺名称',
+      param: '典型工艺名称分类流水号=' + serialNum + '=int'
+    }
+  })
+}
+// 典型工艺查询
+export function searchProcess(check1, a, check2, b, check3, c) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询',
+      param: '典型工艺名称分类流水号_check=' + check1 + '=bit&典型工艺名称分类流水号=' + a + '=int&典型工艺流水号_check=' + check2 + '=bit&典型工艺流水号=' + b + '=int&典型工艺流水号1_check=' + check3 + '=bit&典型工艺流水号1=' + c + '=int'
+    }
+  })
+}
+// 初始化工艺名称
+export function processNameClick() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
+    }
+  })
+}
+// 工艺名称查询
+export function processNameSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺名称_查询数据',
+      param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int'
+    }
+  })
+}
+// 工艺要求查询
+export function processRequestSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_基础表_工艺要求_查询数据',
+      param: '工艺编号=' + val + '=int'
+    }
+  })
+}
+// 初始化公差A
+export function initTolerance() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_查询数据'
+    }
+  })
+}
+// 公差查询
+export function searchTolerance(val1, val2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据',
+      param: '输入数值=' + val1 + '&参数=' + val2
+    }
+  })
+}
+// 工艺定额人员查询
+export function initPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=9'
+    }
+  })
+}
+// 完艺工艺查询
+export function searchWYgongyi(check1, tuhao, check2, bianhao, check3, start, end, check4, name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查询数据_根据零件图号查询已投产的工艺计划流水号',
+      param: '零件图号_check=' + check1 + '&零件图号=' + tuhao + '&工艺员编号_check=' + check2 + '&工艺员编号=' + bianhao + '&工艺时间_check=' + check3 + '&工艺开始时间=' + start + '=datetime&工艺结束时间=' + end + '=datetime&零件名称_check=' + check4 + '&零件名称=' + name
+    }
+  })
+}
+// 完艺工艺要求查询
+export function gongyiYQ(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+// 完艺工艺拷贝
+export function gongyiCopy(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
+      param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
+    }
+  })
+}
+// 主界面选择零件号查主表
+export function mainTable(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工序_查询工序信息',
+      param: '工艺计划流水号=' + num + '=int'
+    }
+  })
+}
+// 主界面主表难度等级修改
+export function hardEdit(num, hard) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
+      param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
+    }
+  })
+}
+// 主界面主表工艺要求修改
+export function requestEdit(num, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_工艺要求_根据工序流水号',
+      param: '工序流水号=' + num + '=int&工艺要求=' + request0
+    }
+  })
+}
+// 主界面主表插入功能
+export function insertOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_工艺计划流水号和工序流水号',
+      param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
+    }
+  })
+}
+// 主界面主表删除功能
+export function deleteOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_删除数据_工序流水号',
+      param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
+    }
+  })
+}
+// 主界面主表上移功能
+export function upOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_上移工序',
+      param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
+    }
+  })
+}
+// 主界面主表下移功能
+export function downOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_下移工序',
+      param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
+    }
+  })
+}
+// 保存变更材质
+export function saveMaterial(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工艺计划_修改零件材料',
+      param: '工艺计划流水号=' + num0 + '&材料流水号=' + num1
+    }
+  })
+}
+// 核准保存
+export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
+      param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
+    }
+  })
+}
+
+// 粘贴
+export function pasteTable(oldNum, newNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工艺计划_拷贝零件工艺',
+      param: '工艺计划流水号旧=' + oldNum + '&工艺计划流水号新=' + newNum
+    }
+  })
+}
+// 删除
+export function deleteTable(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_删除零件工艺',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+// 在制零件工艺修改
+export function returnEdit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_在制零件工艺调整_修改工艺',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+// 查询工艺记录
+export function searchRecord(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_在制零件工艺调整_查询工艺',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
+// 重量拷贝
+export function WeightCopy(num, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
+      param: '工艺计划流水号=' + num + '&重量信息=' + num2
+    }
+  })
+}
+// 保存变更材质
+export function saveWeight(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工艺计划_修改零件重量',
+      param: '工艺计划流水号=' + num0 + '&重量=' + num1
+    }
+  })
+}
+// 单件工时改变
+export function singleChange(val1, val2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
+      param: '工序流水号=' + val1 + '&单件定额工时=' + val2
+    }
+  })
+}
+// 准结工时改变
+export function readyChange(val1, val2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
+      param: '工序流水号=' + val1 + '&准结定额工时=' + val2
+    }
+  })
+}
+// 未编制定额保存
+export function TableAddLi1(a, b) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_定额任务分配_保存数据',
+      param: '工艺计划流水号=' + a + '=string&人员编号=' + b + '=string'
+    }
+  })
+}
+// 已编制定额保存
+export function TableAddLi(a, b, c, num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_增加数据_修改数据',
+      param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int'
+    }
+  })
+}
+// 修改备注
+export function modifyRemark(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工艺计划_工艺修改记录_增加数据',
+      param: `修改人员编号=${params[0]}&修改备注=${params[1]}&工艺计划流水号=${params[2]}`
+    }
+  })
+}
+export function editGongyi(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_2027zdyNew',
+      param: `工艺计划流水号=${num}&工艺编号=${num1}`
+    }
+  })
+}
+export function dropGongyi(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_删除数据_2027zdyNew',
+      param: `工艺计划流水号=${num}&工序流水号=${num1}`
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js
new file mode 100644
index 00000000..5cadceb2
--- /dev/null
+++ b/src/api/ManufacturingCenter/ShopScheduling.js
@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+
+// 初始化工艺
+export function getPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'SELECT 姓名,人员编号 FROM 人事档案管理_人员名单 inner join dbo.人事档案管理_基础表_部门 on 人事档案管理_人员名单.考核部门编号=人事档案管理_基础表_部门.考核部门编号 where 人事档案管理_人员名单.考核部门编号=12 and 人员编号 <> 82 order by 姓名 '
+    }
+  })
+}
+export function getParts(pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_车间排产_零件查询',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getGongxu(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序`
+    }
+  })
+}
+export function searchTableData2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序`
+    }
+  })
+}
+export function XuanRu(num, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}`
+    }
+  })
+}
+export function XuanChu(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}`
+    }
+  })
+}
+export function panDuan(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: ` select 状态,工艺计划流水号 from
+              (
+              select   工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+'  '+规格) as 图号及规格
+              ,计划开始时间,计划结束时间,排产人员,排产时间,
+              (case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else 
+              case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态
+              from dbo.车间生产管理工艺_插件排产查询_视图
+              where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6
+              group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间
+              ) as a
+              where 工艺计划流水号=${num}
+              order by 图号及规格
+              `
+    }
+  })
+}
diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg
new file mode 100644
index 00000000..399e3967
--- /dev/null
+++ b/src/icons/svg/ShopScheduling.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
\ No newline at end of file
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index cc10a203..b6a6d57b 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -48,11 +48,12 @@
  .hover-row td{
    background: RGB(236 245 255)!important;
  }
- .el-table td, .is-leaf{
-   background-color: rgb(255, 255, 255);
-   color: black;
-   font-weight:400
- }
+ //表格行颜色9745
+ //.el-table td, .is-leaf{
+ //  background-color: rgb(255, 255, 255);
+ //  color: black;
+ //  font-weight:400
+ //}
  .el-table--striped .el-table__body tr.el-table__row--striped td{
    background-color: #d8dde6;/*修改斑马线表格背景*/
  }
diff --git a/src/styles/index.scss b/src/styles/index.scss
index ae382d70..8187b825 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -278,3 +278,15 @@ h3 {
 .el-tabs--border-card>.el-tabs__content {
   padding: 15px 15px 0px 15px!important;
 }
+//.el-table__header-wrapper {
+//  height: 25px!important;
+//}
+/* 设置表主体的高度 */
+.el-table__body td,.el-table__body th{
+  padding:1px!important;
+  height: 25px!important;
+}
+/* 设置表头的高度 */
+.el-table__header td,.el-table__header th{
+  padding:0px!important;
+}
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index 1cdd00e6..080f7ef2 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -237,6 +237,7 @@ export default {
     },
     // 查询离线合同明细
     async searchContractDetail() {
+      this.table1 = []
       if (this.contractValue && this.searchType === '2') {
         this.qrCode = this.contractValue
       } else if (!this.supplierValue) {
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 46448adb..c80b5024 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -175,7 +175,7 @@ export default {
   },
   created() {
     this.getMachine()
-    this.searchTable()
+    // this.searchTable()
     this.searchTable2()
   },
   methods: {
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
new file mode 100644
index 00000000..6ebafa71
--- /dev/null
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -0,0 +1,1661 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
+        <el-radio v-model="radio" :label="1" border>未编制</el-radio>
+        <el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
+      </el-radio-group>
+      <span style="margin-left: 10px">工艺员:</span>
+      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
+        <el-option
+          v-for="item in Craftmen"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span style="margin-left: 10px">机床-分组或零件号:</span>
+      <el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
+        <el-button slot="append" icon="el-icon-right" @click="partNumValue='';searchPartsByMachineGroup();"/>
+      </el-input>
+      <el-select v-model="partNumValue" placeholder="选择零件编制工艺定额" size="small" @clear="clearDetail" @change="searchDetail()">
+        <el-option
+          v-for="item in partNum"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          <b style="float: left">{{ item.label }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">-{{ item.group }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
+        </el-option>
+      </el-select>
+      <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
+      <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
+      <el-button v-show="isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=false">关闭</el-button>
+      <el-button v-show="!isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=true">展开</el-button>
+    </el-card>
+    <el-card v-show="isShowN">
+      <div style="margin-left: 10px">
+        <span style="margin-left: 0">种&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类:</span>
+        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px;margin-top: 5px"/>
+        <span>零件名称:</span>
+        <el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:100px"/>
+        <span>规格:</span>
+        <el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:100px"/>
+        <span>投产总数量:</span>
+        <el-input v-model="batchNum" readonly size="small" style="width:100px"/>
+        <span>物料:</span>
+        <el-input v-model="materialName" placeholder="物料" size="small" style="width:215px" readonly>
+          <el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
+          <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
+        </el-input>
+        <!--<span>规格:</span>-->
+        <!--<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>-->
+      </div>
+      <div style="margin-left: 10px">
+        <el-row>
+          <el-col style="width:180px">
+            <span style="margin-left: 0">物料类型:</span>
+            <el-select v-model="materielValue" size="small" style="margin-top: 7px;width:100px;margin-bottom: 3px" placeholder="物料类型" @change="clear()">
+              <el-option
+                v-for="item in materiel"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+
+          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" style="width: 60%">
+            <span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
+            <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
+            <span>长度:</span>
+            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
+            <el-button style="margin-top: 3px;margin-left: 10px;" type="success" size="small" @click="Calculation1()">计算重量</el-button>
+            <span>重量:</span>
+            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
+              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
+            </el-input>
+            <el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>
+          </el-col>
+
+          <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
+            <span>长:</span>
+            <el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>宽:</span>
+            <el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>厚:</span>
+            <el-input-number v-model="height1" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation2()">计算重量
+            </el-button>
+            <span>重量:</span>
+            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
+              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
+            </el-input>
+          </el-col>
+
+          <el-col v-show="materielValue==='3'" :span="20">
+            <span>对边宽:</span>
+            <el-input-number v-model="OppositeSideWidth" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>长度:</span>
+            <el-input-number v-model="length2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation3()">计算重量
+            </el-button>
+            <span>重量:</span>
+            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
+              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
+            </el-input>
+          </el-col>
+
+          <el-col v-show="materielValue==='4'" :span="20">
+            <span>边宽:</span>
+            <el-input-number v-model="biankuan" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>边厚:</span>
+            <el-input-number v-model="bianhou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>长度:</span>
+            <el-input-number v-model="changdu" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation4()">计算重量
+            </el-button>
+            <span>重量:</span>
+            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
+              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
+            </el-input>
+          </el-col>
+
+          <el-col v-show="materielValue==='5'" :span="30">
+            <span>壁厚:</span>
+            <el-input-number v-model="bihou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>外径:</span>
+            <el-input-number v-model="waijing" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <span>长度:</span>
+            <el-input-number v-model="changdu2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation5()">计算重量
+            </el-button>
+            <span>重量:</span>
+            <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
+              <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
+            </el-input>
+          </el-col>
+
+        </el-row>
+      </div>
+      <el-row style="margin-bottom: 10px">
+        <span style="margin-left: 10px">输入数值:</span>
+        <el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
+        <span style="margin-left: 10px">选择参数:</span>
+        <el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
+          <el-option
+            v-for="item in selPara"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>公差:</span>
+        <el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
+        <el-button style="margin-left: 10px" type="success" size="small" @click="calTol()">计算公差</el-button>
+        <el-button-group v-if="isShow1" style="margin-left: 10px" >
+          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
+          </el-button>
+          <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
+          </el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">
+            完艺
+          </el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
+          </el-button>
+          <el-button v-if="isShow1" type="baocun" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" @click="copyAndSave">
+            复制并保存
+          </el-button>
+          <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存
+          </el-button>
+        </el-button-group>
+        <el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>
+      </el-row>
+      <div style="margin-top: 5px;margin-bottom: 10px;display: inline-block"><span>符号：</span>
+        <el-tag type="info">∮</el-tag>
+        <el-tag type="info">°</el-tag>
+        <el-tag type="info">#</el-tag>
+        <el-tag type="info">□</el-tag>
+        <el-tag type="info">±</el-tag>
+        <el-tag type="info">×</el-tag>
+        <el-tag type="info">Ⅰ</el-tag>
+        <el-tag type="info">Ⅱ</el-tag>
+        <el-tag type="info">Ⅲ</el-tag>
+        <el-tag type="info">⊥</el-tag>
+        <el-tag type="info">％</el-tag>
+        <el-tag type="info">■</el-tag>
+        <el-tag type="info">∠</el-tag>
+        <el-tag type="info">mm</el-tag>
+        <el-tag type="info">◎</el-tag>
+        <el-tag type="info">○</el-tag>
+        <el-tag type="info">δ</el-tag>
+        <el-tag type="info">μm</el-tag>
+        <el-tag type="info">／</el-tag>
+        <el-tag type="info">◇</el-tag>
+        <el-tag type="info">()</el-tag>
+      </div>
+    </el-card>
+    <el-card>
+      <el-row>
+        <el-col style="width: 180px;height: 683px;overflow: auto">
+          <el-tree
+            :data="departmentData"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :indent="30"
+            class="gongyizhiding"
+            default-expand-all
+            @node-click="onClick"/>
+        </el-col>
+        <el-col style="width: 970px;height: 700px">
+          <el-table v-loading="loading0" :data="tableData" class="processTable" border style="width: 967px" height="683px" size="mini">
+            <el-table-column prop="num" label="序号" width="45" align="center" type="index"/>
+            <el-table-column prop="name" label="工艺名称" width="180" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.工艺名称" readonly clearable @change="handleChange(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column prop="单件定额工时" label="单件" width="100" align="center">
+              <template slot-scope="scope">
+                <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.单件定额工时" style="width:100%" placeholder="" @change="singleChange(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column prop="准结定额工时" label="准结" width="100" align="center">
+              <template slot-scope="scope">
+                <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.准结定额工时" style="width:100%" placeholder="" @change="readyChange(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column prop="request" label="工艺要求" align="center" width="290">
+              <template slot-scope="scope">
+                <el-input
+                  v-direction="{x: 2, y: scope.$index}"
+                  v-model="scope.row.工艺要求"
+                  :fetch-suggestions="querySearch"
+                  placeholder=""
+                  style="width: 100%"
+                  @focus="focusRequest(scope.row)"
+                  @blur="blurRequest(scope.row)"
+                  @select="blurRequest(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="250" align="center">
+              <template slot-scope="scope">
+                <div>
+                  <el-button
+                    icon="el-icon-arrow-up"
+                    type="primary"
+                    size="mini"
+                    @click="upOne(scope.row)"/>
+                  <el-button
+                    icon="el-icon-arrow-down"
+                    type="primary"
+                    size="mini"
+                    @click="downOne(scope.row)"/>
+                  <el-button
+                    icon="el-icon-circle-plus-outline"
+                    type="primary"
+                    size="mini"
+                    @click="insertOne(scope.row)"/>
+                  <el-button
+                    icon="el-icon-delete"
+                    type="danger"
+                    size="mini"
+                    @click="deleteOne(scope.row)"/>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px">
+      <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
+      </el-button>
+      <el-table :data="tableMaterial" size="mini" highlight-current-row border @row-click="selectMaterial">
+        <el-table-column align="center" label="材质名称">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
+      <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
+        <el-form-item label="工艺名称分类">
+          <el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()">
+            <el-option
+              v-for="item in processNameClass"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺名称">
+          <el-select v-model="processNameValue" filterable placeholder="名称" size="small" @change="nChange()">
+            <el-option
+              v-for="item in processName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺要求">
+          <el-select v-model="processRequestValue" placeholder="要求" size="small">
+            <el-option
+              v-for="item in processRequest"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="mini" type="primary" @click="confirmSelect()">确定选择</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
+      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-input v-model="partNameValue1" size="small" placeholder="输入零件图号" style="width: 150px" clearable/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 20px" @click="searchProcess()">查询
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-select id="num" v-model="processNumValue" placeholder="零件图号" style="width:150px" size="small" @change="numChange()">
+                <el-option
+                  v-for="item in partName1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <el-button size="small" style="margin-left: 20px" @click="processCopy()">工艺拷贝</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-table
+          :data="tableData2"
+          style="width: 97%;max-height: 300px;margin-top:15px"
+          height="300px"
+          border
+          size="mini">
+          <el-table-column align="center" label="工艺序号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工序顺序 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺名称" width="180">
+            <template slot-scope="scope">
+              {{ scope.row.工艺名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺要求">
+            <template slot-scope="scope">
+              {{ scope.row.工艺要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="难度等级" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工艺难度等级 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
+      <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="零件号">
+              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
+            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="零件图号">
+              <el-select
+                v-model="tuhaoValue"
+                placeholder="零件图号"
+                size="small"
+                filterable
+                style="width:150px"
+                @change="numChange1()">
+                <el-option
+                  v-for="item in tuhao"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                  <div style="float: left">{{ item.label }}</div>
+                  <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name1 }}</div>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="零件名称">
+              <el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格">
+              <el-input v-model="guige" size="small" readonly style="width: 150px;"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
+          <el-table-column align="center" label="工艺序号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工序顺序 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺名称" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.工艺名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺要求">
+            <template slot-scope="scope">
+              {{ scope.row.工艺要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="单件定额工时" width="110">
+            <template slot-scope="scope">
+              {{ scope.row.单件定额工时 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="准结定额工时" width="110">
+            <template slot-scope="scope">
+              {{ scope.row.准结定额工时 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
+      <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
+        <el-table-column align="center" label="考勤编号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.考勤编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="姓名">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="性别" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.性别 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工作岗位" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.岗位名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="tijiao()">提交</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import '@/icon/iconfont.css'
+import {
+  dropGongyi,
+  editGongyi,
+  saveWeight,
+  numChange,
+  searchProcess11,
+  WeightCopy,
+  initCraftmen,
+  getPartnames1,
+  getPartnames2,
+  mainTable,
+  getMaterial,
+  searchMaterial,
+  typicalProcess,
+  initTolerance,
+  searchWYgongyi,
+  gongyiCopy,
+  initPerson,
+  gongyiYQ,
+  hardEdit,
+  requestEdit,
+  processNameClick,
+  processNameSelect,
+  processRequestSelect,
+  searchTolerance,
+  insertOne,
+  deleteOne,
+  upOne,
+  downOne,
+  saveMaterial,
+  saveApprove,
+  selectRequest,
+  pasteTable,
+  deleteTable,
+  returnEdit,
+  singleChange,
+  readyChange,
+  TableAddLi1,
+  TableAddLi,
+  getPartnames3,
+  getPartnames4,
+  modifyRemark
+} from '@/api/ManufacturingCenter/ProcessPlanningNew'
+import elInput from 'element-ui/packages/input'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'ProcessQuotaEstablishment',
+  components: {
+    elInput
+  },
+  data() {
+    return {
+      isShowN: false,
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      departmentData: [],
+      machine_Group_part: '',
+      partNumber: '',
+      options: [],
+      weight: '',
+      dialogMateria2: false,
+      prepareMateriel: '',
+      lastFocusText: '',
+      Result1: '',
+      Result2: '',
+      Result3: '',
+      Result4: '',
+      Result5: '',
+      Length: '',
+      Width: '',
+      height1: '',
+      diameter: '',
+      height2: '',
+      OppositeSideWidth: '',
+      length2: '',
+      Specifications: '',
+      biankuan: '',
+      bianhou: '',
+      changdu: '',
+      bihou: '',
+      waijing: '',
+      changdu2: '',
+      materielValue: '1',
+      materiel: [
+        {
+          value: '1',
+          label: '园钢'
+        }, {
+          value: '2',
+          label: '钢板'
+        }, {
+          value: '3',
+          label: '六角钢'
+        }, {
+          value: '4',
+          label: '角钢'
+        }, {
+          value: '5',
+          label: '钢管'
+        }, {
+          value: '6',
+          label: '园紫铜棒'
+        }, {
+          value: '7',
+          label: '园黄铜棒'
+        }, {
+          value: '8',
+          label: '园铝棒'
+        }, {
+          value: '9',
+          label: '紫铜板'
+        }, {
+          value: '10',
+          label: '黄铜板'
+        }, {
+          value: '11',
+          label: '6061铝板'
+        }
+      ],
+      total: 0,
+      pageCurrent: 1,
+      pageSize: 10,
+      input: '', // 材质对话框查询1
+      tableMaterial: [],
+      dialogMaterial: false,
+      loading0: false,
+      radio: 1, // 第一组
+      partNumValue: '', // 零件号值
+      partNum: [], // 零件号
+      typeValue: '', // 种类
+      CraftmenValue: '', // 工艺员值
+      Craftmen: [], // 工艺员
+      CraftmanValue: '', // 完艺表单工艺员值
+      CraftmanValue2: '', // 完艺表单工艺员值中间变量
+      Craftman: [], // 完艺表单工艺员
+      partName: '', // 零件名称
+      batchNum: '', // 投产总数量
+      material: '', // 材质流水号
+      materialName: '', // 材质名称
+      materialClass: [], // 材质类
+      typicalClassValue: '', // 典型工艺零件分类值
+      typicalClass: [], // 典型工艺零件分类
+      partNameValue1: '', // 典型工艺零件名称值
+      partName1: [], // 典型工艺零件名称
+      partNameValue1check: false, // 典型工艺零件名称check
+      processNumValue: '', // 典型工艺号值
+      processNum: [], // 典型工艺号
+      processNumValuecheck: false, // 典型工艺号check
+      remark: '', // 备注
+      remark1: '', // 完艺零件名称
+      dialogFormVisible: false, // 典艺对话框可见性
+      dialogFormVisible1: false, // 完艺对话框可见性
+      dialogFormVisible2: false, // 主界面查询工艺名称要求对话框可见性
+      dialogFormVisible3: false, // 完艺对话框中选择工艺员可见性
+      form: null, // 典艺表单
+      form1: null, // 完艺表单
+      form2: null, // 主界面查询表单
+      serialNum1: [], // 典型工艺名称分类流水号
+      serialNumValue1: '1', // 典型工艺名称分类流水号值,初值1否则置空时无参数
+      serialNumValue1check: false, // 典型工艺名称分类流水号check
+      serialNum2: [], // 典型工艺流水号
+      serialNumValue2: '1', // 典型工艺流水号值，初值1否则置空时无参数
+      numVal: '', // 输入数值
+      selPara: [], // 选择参数数组
+      selParaValue: '', // 选择参数值
+      tolerance: '', // 公差
+      tableData: [], // 主表
+      tableData2: [], // 典艺内的表格
+      tableData3: [], // 工艺定额人员
+      tableData4: [], // 完艺表格
+      processSelect: [], // 工艺分类流水号
+      processNameClass: [], // 工艺名称分类
+      processNameClassValue: '',
+      processName: [], // 工艺名称
+      processNameValue: '',
+      processRequest: [], // 工艺要求
+      processRequestValue: '',
+      processN1: '', // 工艺编号
+      str: '', // 拼接字符串用的
+      value: '', // 第一个select的
+      checked: false, // 是否核准
+      checked1: false, // 修改
+      spec: '', // 规格
+      isShow: true, // '编辑模式'可见性
+      isShow1: true, // “复制并保存”“粘贴”按钮的可见性
+      isShow2: false, // 修改的可见性
+      date01: '', // 完艺开始时间
+      date02: '', // 完艺结束时间
+      PN: '', // 零件号
+      num: '', // 工艺计划流水号
+      perNum: '',
+      perNum2: '',
+      tuhao: [],
+      tuhaoValue: '',
+      guige: '',
+      check1: 0,
+      check2: 0,
+      check3: 0,
+      check4: 0,
+      hard: [{ value: 'A' }, { value: 'B' }, { value: 'C' }],
+      disabled: false,
+      result: 0,
+      oldNum: '',
+      newNum: '',
+      // tableRecord: [],
+      materialName2: '',
+      material2: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id',
+      'token'
+    ])
+  },
+  created() {
+    this.getTreeData()
+    this.initDirection()
+  },
+  mounted() {
+    this.fetchData()
+    this.initPerson()
+    this.getList()
+  },
+  methods: {
+    onClick(num) {
+      if (this.partNumValue) {
+        if (num.father === false) {
+          editGongyi(this.partNumValue, num.value).then(response => {
+            this.searchDetail()
+          })
+        }
+      }
+    },
+    getTreeData() {
+      processNameClick().then(response => { // 初始化工艺分类
+        this.options = []
+        for (let i = 0; i < response.data.length; i++) {
+          this.options.push({
+            label: response.data[i].工艺分类名称,
+            value: response.data[i].工艺分类流水号,
+            father: true,
+            children: []
+          })
+        }
+      }).then(() => {
+        this.options.map(firstLevel => {
+          processNameSelect(firstLevel.value).then(response => { // 根据分类查询工艺名称
+            firstLevel.children = []
+            for (let j = 0; j < response.data.length; j++) {
+              firstLevel.children.push({
+                label: response.data[j].工艺名称,
+                value: response.data[j].工艺编号,
+                father: false
+              })
+            }
+          })
+        })
+      }).then(() => {
+        this.departmentData = this.options
+      })
+    },
+    initDirection() {
+      const direction = this.$getDirection()
+      direction.on('keyup', function(e, val) {
+        if (e.keyCode === 39) {
+          direction.next()
+        }
+        if (e.keyCode === 37) {
+          direction.previous()
+        }
+        if (e.keyCode === 38) {
+          direction.previousLine()
+        }
+        if (e.keyCode === 40) {
+          direction.nextLine()
+        }
+      })
+    },
+    // 保存已编制
+    saveCompiled() {
+      if (this.partNumValue) {
+        this.$prompt('请输入工艺修改备注', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(({ value }) => {
+          modifyRemark(this.id, value, this.partNumValue)
+          this.$message.success('记录成功')
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消操作'
+          })
+        })
+      } else {
+        this.$message.warning('请选择零件')
+      }
+    },
+    blurRequest(row) {
+      selectRequest(row.工序流水号, row.工艺计划流水号, row.工艺编号, row.工序顺序, row.工艺要求).then(response => {
+        if (response.data[0].result === '1') {
+          console.log('工艺要求编辑成功')
+        } else {
+          console.log('工艺要求编辑失败')
+        }
+      })
+    },
+    focusRequest(row) {
+      processRequestSelect(row.工艺编号).then(response => { // 查询工艺名称
+        this.processRequest = []
+        for (let j = 0; j < response.data.length; j++) {
+          this.processRequest.push({
+            value: response.data[j].工艺要求
+          })
+        }
+      })
+    },
+    querySearch(queryString, cb) {
+      const results = this.processRequest
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
+    handleChange(row) {
+      if (row.工艺名称) {
+        row.工艺要求 = ''
+        selectRequest(row.工序流水号, row.工艺计划流水号, row.工艺编号, row.工序顺序, row.工艺要求).then(response => {
+          if (response.data[0].result === '1') {
+            console.log('工艺名称编辑成功')
+          } else {
+            console.log('工艺名称编辑失败')
+          }
+        })
+      } else {
+        dropGongyi(row.工艺计划流水号, row.工序流水号)
+      }
+    },
+    singleChange(row) {
+      singleChange(row.工序流水号, row.单件定额工时)
+    },
+    readyChange(row) {
+      readyChange(row.工序流水号, row.准结定额工时)
+    },
+    saveWeight() {
+      if (this.partNumValue === '' || this.material === '') {
+        this.$message.error('请选择一个零件或物料')
+      } else {
+        saveWeight(this.partNumValue, this.weight).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('保存失败')
+          }
+        })
+      }
+    },
+    clear() {
+      this.weight = ''
+      this.Length = ''
+      this.Width = ''
+      this.height1 = ''
+      this.diameter = ''
+      this.height2 = ''
+      this.OppositeSideWidth = ''
+      this.biankuan = ''
+      this.bianhou = ''
+      this.changdu = ''
+      this.bihou = ''
+      this.waijing = ''
+      this.changdu2 = ''
+    },
+    // 直径高计算
+    Calculation1() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        if (this.materielValue === '1') {
+          this.Result2 = '物料:' + this.materiel[1].label + ' 直径:' + this.diameter + 'mm  长度:' + this.height2
+          // + 'mm  重量:' + 0.00617 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
+          this.weight = 0.00617 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2)
+          WeightCopy(this.partNumValue, this.Result2).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '6') {
+          this.Result2 = '物料:' + this.materiel[6].label + ' 直径:' + this.diameter + 'mm  长度:' + this.height2
+          // + 'mm  重量:' + 0.00698 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
+          this.weight = 0.00698 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2)
+          WeightCopy(this.partNumValue, this.Result2).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '7') {
+          this.Result2 = '物料:' + this.materiel[7].label + ' 直径:' + this.diameter + 'mm  长度:' + this.height2
+          // + 'mm  重量:' + 0.00668 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
+          this.weight = 0.00668 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2)
+          WeightCopy(this.partNumValue, this.Result2).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '8') {
+          this.Result2 = '物料:' + this.materiel[8].label + ' 直径:' + this.diameter + 'mm  长度:' + this.height2
+          // + 'mm  重量:' + 0.0022 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
+          this.weight = 0.0022 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2)
+          WeightCopy(this.partNumValue, this.Result2).then(response => {
+            this.searchDetai2()
+          })
+        }
+      }
+    },
+    // 长宽高计算
+    Calculation2() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        if (this.materielValue === '2') {
+          this.Result1 = '物料:' + this.materiel[2].label + ' 长:' + this.Length + 'mm  宽:' + this.Width + 'mm  厚:' + this.height1
+          // + 'mm  重量:' + 0.001 * 0.00785 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
+          this.weight = 0.001 * 0.00785 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+          WeightCopy(this.partNumValue, this.Result1).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '9') {
+          this.Result1 = '物料:' + this.materiel[9].label + ' 长:' + this.Length + 'mm  宽:' + this.Width + 'mm  厚:' + this.height1
+          // + 'mm  重量:' + 0.001 * 0.0089 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
+          this.weight = 0.001 * 0.0089 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+          WeightCopy(this.partNumValue, this.Result1).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '10') {
+          this.Result1 = '物料:' + this.materiel[10].label + ' 长:' + this.Length + 'mm  宽:' + this.Width + 'mm  厚:' + this.height1
+          // + 'mm  重量:' + 0.001 * 0.0085 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
+          this.weight = 0.001 * 0.0085 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+          WeightCopy(this.partNumValue, this.Result1).then(response => {
+            this.searchDetai2()
+          })
+        }
+        if (this.materielValue === '11') {
+          this.Result1 = '物料:' + this.materiel[11].label + ' 长:' + this.Length + 'mm  宽:' + this.Width + 'mm  厚:' + this.height1
+          // + 'mm  重量:' + 0.001 * 0.0028 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
+          this.weight = 0.001 * 0.0028 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
+          WeightCopy(this.partNumValue, this.Result1).then(response => {
+            this.searchDetai2()
+          })
+        }
+      }
+    },
+    // 对边宽*对边宽*长度
+    Calculation3() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        if (this.materielValue === '3') {
+          this.Result3 = '物料:' + this.materiel[3].label + ' 对边宽:' + this.OppositeSideWidth + 'mm  长度:' + this.length2
+          // + 'mm  重量:' + 0.001 * 0.0068 * parseInt(this.OppositeSideWidth) * parseInt(this.OppositeSideWidth) * parseInt(this.length2) + 'kg'
+          this.weight = 0.001 * 0.0068 * parseInt(this.OppositeSideWidth) * parseInt(this.OppositeSideWidth) * parseInt(this.length2)
+          WeightCopy(this.partNumValue, this.Result3).then(response => {
+            this.searchDetai2()
+          })
+        }
+      }
+    },
+    // （边宽+边宽-边厚）×边厚×长度÷1000
+    Calculation4() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        if (this.materielValue === '4') {
+          this.Result4 = '物料:' + this.materiel[4].label + ' 边宽:' + this.biankuan + 'mm  边厚:' + this.bianhou + 'mm  长度:' + this.changdu
+          // + 'mm  重量:' + 0.001 * 0.00785 * (parseInt(this.biankuan) + parseInt(this.biankuan) - parseInt(this.bianhou)) * parseInt(this.bianhou) * parseInt(this.changdu) + 'kg'
+          this.weight = 0.001 * 0.00785 * (parseInt(this.biankuan) + parseInt(this.biankuan) - parseInt(this.bianhou)) * parseInt(this.bianhou) * parseInt(this.changdu)
+          WeightCopy(this.partNumValue, this.Result4).then(response => {
+            this.searchDetai2()
+          })
+        }
+      }
+    },
+    Calculation5() {
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请先选择一个零件')
+      } else {
+        if (this.materielValue === '5') {
+          this.Result5 = '物料:' + this.materiel[5].label + ' 壁厚:' + this.bihou + 'mm  外径:' + this.waijing + 'mm  长度:' + this.changdu2
+          // + 'mm  重量:' + 0.001 * 0.02466 * parseInt(this.bihou) * (parseInt(this.waijing) - parseInt(this.bihou)) * parseInt(this.changdu2) + 'kg'
+          this.weight = 0.001 * 0.02466 * parseInt(this.bihou) * (parseInt(this.waijing) - parseInt(this.bihou)) * parseInt(this.changdu2)
+          WeightCopy(this.partNumValue, this.Result5).then(response => {
+            this.searchDetai2()
+          })
+        }
+      }
+    },
+    insertThestring(NewCode) {
+      this.lastFocusText = event.srcElement
+      this.lastFocusText.focus()
+      var sel = document.selection.createRange()
+      sel.text = NewCode
+      return
+    },
+    clearDetail() {
+      this.checked = false
+      this.weight = ''
+      this.partNumValue = ''
+      this.Specifications = ''
+      this.typeValue = ''
+      this.partName = ''
+      this.material = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+    },
+    returnEdit() { // 在制零件工艺修改
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请选择零件')
+      } else {
+        this.$confirm('此操作会将该零件打回至未编制状态, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          returnEdit(this.partNumValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('打回成功')
+              this.partNumValue = ''
+              this.tableData = []
+            } else {
+              this.$message.error('打回失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      }
+    },
+    handleCurrentChange(val) { // 材质分页
+      this.pageCurrent = val
+      if (this.input === '' || this.input === null) {
+        this.getList()
+      } else {
+        this.searchMaterial()
+      }
+    },
+    handleSizeChange(val) { // 材质分页
+      this.pageCurrent = 1
+      this.pageSize = val
+      if (this.input === '' || this.input === null) {
+        this.getList()
+      } else {
+        this.searchMaterial()
+      }
+    },
+    selectMaterial(row) { // 选择材质
+      this.materialName2 = ''
+      this.material2 = ''
+      this.materialName2 = row.材料
+      this.material2 = row.材料流水号
+    },
+    selectMaterial2() {
+      this.materialName = ''
+      this.material = ''
+      this.materialName = this.materialName2
+      this.material = this.material2
+      this.dialogMaterial = false
+    },
+    fetchData() {
+      this.materialClass = []
+      getMaterial(1, 10).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.materialClass.push({
+            label: response.data[i].材料,
+            value: response.data[i].材料流水号
+          })
+        }
+      })
+      initCraftmen().then(response => { // 初始化工艺员
+        for (let i = 0; i < response.data.length; i++) {
+          this.Craftmen.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      typicalProcess().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.typicalClass.push({
+            value: response.data[i].典型工艺名称分类
+          })
+          this.serialNum1.push({
+            value: response.data[i].典型工艺名称分类流水号
+          })
+        }
+      })
+      initTolerance().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.selPara.push({
+            value: response.data[i].参数
+          })
+        }
+      })
+    },
+    initPerson() { // 初始化工艺员
+      initPerson().then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    getList() { // 往材质对话框中放
+      this.tableMaterial = []
+      getMaterial(this.pageCurrent, this.pageSize).then(response => {
+        this.total = response.data.total
+        this.tableMaterial = response.data.rows
+      })
+    },
+    searchMaterial() { // 材质查询
+      searchMaterial(this.pageCurrent, this.pageSize, this.input).then(response => {
+        this.total = response.data.total
+        this.tableMaterial = response.data.rows
+      })
+    },
+    // 根据机床号-组号查询零件（包含借用件）
+    searchPartsByMachineGroup() {
+      this.tableData = []
+      this.partNum = []
+      if (this.radio === 1) { // 未编制
+        this.disabled = false
+        this.isShow1 = true
+        this.isShow2 = false
+        this.checked1 = true
+        getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号,
+              machine: response.data[i].机床图号,
+              group: response.data[i].组号
+            })
+          }
+        })
+      } else { // 已编制
+        this.isShow = true
+        this.isShow1 = false
+        this.isShow2 = true
+        this.disabled = true
+        this.checked1 = false
+        getPartnames4(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号,
+              machine: response.data[i].机床图号,
+              group: response.data[i].组号
+            })
+          }
+        })
+      }
+    },
+    searchParts() { // 根据条件查零件号
+      this.tableData = []
+      this.partNum = []
+      if (this.radio === 1) { // 未编制
+        this.disabled = false
+        this.isShow1 = true
+        this.isShow2 = false
+        this.checked1 = true
+        getPartnames1(this.CraftmenValue, this.partNumber).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号
+            })
+          }
+        })
+      } else { // 已编制
+        this.isShow = true
+        this.isShow1 = false
+        this.isShow2 = true
+        this.disabled = true
+        this.checked1 = false
+        getPartnames2(this.CraftmenValue, this.partNumValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号
+            })
+          }
+        })
+      }
+    },
+    switchEdit() { // 切换编辑模式
+      if (this.radio === 1) {
+        this.isShow = !this.isShow
+      } else {
+        this.isShow = true
+      }
+    },
+    // 查主表和上面显示的信息
+    searchDetail() {
+      if (this.partNumValue !== '' && this.partNumValue !== null) {
+        this.loading0 = true
+        mainTable(this.partNumValue).then(response => {
+          this.tableData = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+            if (response.data[i].工艺名称 === null || response.data[i].工艺名称 === '') {
+              response.data[i].工艺难度等级 = ''
+              response.data[i].单件定额工时 = ''
+              response.data[i].准结定额工时 = ''
+            }
+          }
+          this.tableData = response.data
+          this.newNum = this.partNumValue
+        }).then(() => {
+          this.loading0 = false
+        })
+      }
+    },
+    searchDetai2() {
+      if (this.partNumValue !== '' && this.partNumValue !== null) {
+        this.loading0 = true
+        mainTable(this.partNumValue).then(response => {
+          this.tableData = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+            if (response.data[i].工艺名称 === null || response.data[i].工艺名称 === '') {
+              response.data[i].工艺难度等级 = ''
+              response.data[i].单件定额工时 = ''
+              response.data[i].准结定额工时 = ''
+            }
+          }
+          this.tableData = response.data
+          this.tableData.map(h => {
+            this.$set(h, '工艺分类及名称', [])
+            this.options.map(v => {
+              v.children.map(l => {
+                if (l.value === h.工艺编号) {
+                  h.工艺分类及名称 = [Number(v.value), Number(h.工艺编号)]
+                }
+              })
+            })
+          })
+          this.newNum = this.partNumValue
+        }).then(() => {
+          this.loading0 = false
+        })
+      }
+    },
+    DYbtn() { // 典艺按钮
+      this.dialogFormVisible = true
+      this.processNumValue = ''
+      this.partNameValue1 = ''
+      this.typicalClassValue = ''
+      this.remark = ''
+      this.serialNumValue1 = '1' // 有默认值
+      this.serialNumValue2 = '1' // 有默认值
+      this.tableData2 = null
+    },
+    WYbtn() { // 完艺按钮
+      this.tableData4 = []
+      this.tuhaoValue = ''
+      this.remark1 = ''
+      this.dialogFormVisible1 = true
+    },
+    selectPerson(row) { // 选择工艺员
+      this.CraftmanValue2 = row.姓名
+      this.perNum2 = row.人员编号
+    },
+    tijiao() { // 提交完艺表单中工艺定额人员的选择
+      this.dialogFormVisible3 = false
+      this.CraftmanValue = this.CraftmanValue2
+      this.perNum = this.perNum2
+      this.remark1 = ''
+      this.guige = ''
+      this.tuhaoValue = ''
+    },
+    inputChange() { // 零件号改变
+      this.remark1 = ''
+      this.guige = ''
+      this.tuhaoValue = ''
+    },
+    // 典艺工艺查询
+    searchProcess() {
+      this.processNumValue = ''
+      this.partName1 = []
+      this.tableData2 = []
+      searchProcess11(this.partNameValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partName1.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].典艺流水号
+          })
+        }
+      })
+    },
+    // 典艺选择查表格
+    numChange() {
+      numChange(this.processNumValue).then(response => {
+        this.tableData2 = response.data
+      })
+    },
+    // 典艺工艺拷贝
+    processCopy() {
+      if (this.partNumValue === '') {
+        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
+        this.dialogFormVisible = false
+      } else if (this.processNumValue === '') {
+        this.$message.error('请选择零件图号')
+      } else {
+        for (let i = 0; i < this.tableData2.length; i++) {
+          this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
+          this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
+          this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
+          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求)
+          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级)
+        }
+        this.dialogFormVisible = false
+      }
+    },
+    searchProcess1() { // 完艺工艺查询
+      this.tuhao = []
+      if (this.PN === '') { // 零件号
+        this.check1 = 0
+      } else {
+        this.check1 = 1
+      }
+      if (this.perNum === '') { // 工艺员编号
+        this.check2 = 0
+      } else {
+        this.check2 = 1
+      }
+      if (this.remark1 === '') { // 零件名称
+        this.check4 = 0
+      } else {
+        this.check4 = 1
+      }
+      if (this.date01 === '' || this.date02 === '' || this.date01 === null || this.date02 === null) { // 日期
+        this.check3 = 0
+      } else {
+        this.check3 = 1
+      }
+      searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.tuhao.push({
+            label: response.data[i].零件图号,
+            name: response.data[i].零件名称,
+            name1: response.data[i].规格,
+            value: response.data[i].工艺计划流水号
+          })
+        }
+      })
+    },
+    // 完艺工艺拷贝
+    processCopy1() {
+      this.dialogFormVisible1 = false
+      if (this.partNumValue === '') {
+        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
+      } else {
+        gongyiCopy(this.num, this.partNumValue).then(res => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
+          this.searchDetail()
+        })
+      }
+    },
+    // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+    numChange1() {
+      this.remark1 = ''
+      this.guige = ''
+      this.tableData4 = null
+      for (let i = 0; i < this.tuhao.length; i++) {
+        if (this.tuhaoValue === this.tuhao[i].value) {
+          this.remark1 = this.tuhao[i].name
+          this.guige = this.tuhao[i].name1
+          this.num = this.tuhao[i].value
+        }
+      }
+      gongyiYQ(this.num).then(response => {
+        this.tableData4 = response.data
+      })
+    },
+    hardEdit(row) { // 修改难度等级
+      hardEdit(row.工序流水号, row.工艺难度等级).then(response => {
+        if (response.data[0].result === '1') {
+          console.log('难度等级编辑成功')
+        } else {
+          console.log('难度等级编辑失败')
+        }
+      })
+    },
+    // 修改工艺要求
+    requestEdit(row) {
+      requestEdit(row.工序流水号, row.工艺要求)
+    },
+    tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询
+      if (this.checked1 === false) {
+        this.dialogFormVisible2 = false
+      } else {
+        this.dialogFormVisible2 = true
+        if (index !== this.index) {
+          this.str = '' // 清字符串
+        }
+        this.index = index
+        this.processNameClassValue = ''
+        this.processNameValue = ''
+        this.processRequestValue = ''
+        this.processNameClass = []
+        this.processName = []
+        this.processRequest = []
+        processNameClick().then(response => { // 初始化工艺名称的
+          for (let i = 0; i < response.data.length; i++) {
+            this.processNameClass.push({ // 工艺名称分类
+              value: response.data[i].工艺分类名称
+            })
+            this.processSelect.push({ // 工艺分类流水号
+              value: response.data[i].工艺分类流水号
+            })
+          }
+        })
+      }
+    },
+    cChange() { // 工艺名称分类改变
+      this.processNameValue = ''
+      this.processName = []
+      this.processRequestValue = ''
+      this.processRequest = []
+      for (let i = 0; i < this.processNameClass.length; i++) {
+        if (this.processNameClassValue === this.processNameClass[i].value) {
+          processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称
+            for (let j = 0; j < response.data.length; j++) {
+              this.processName.push({
+                value: response.data[j].工艺名称,
+                num: response.data[j].工艺编号
+              })
+            }
+          })
+        }
+      }
+    },
+    nChange() { // 工艺名称改变
+      this.processRequestValue = ''
+      this.processRequest = []
+      for (let i = 0; i < this.processName.length; i++) {
+        if (this.processNameValue === this.processName[i].value) {
+          this.processN1 = this.processName[i].num // 工艺编号
+          processRequestSelect(this.processName[i].num).then(response => { // 查询工艺名称
+            for (let j = 0; j < response.data.length; j++) {
+              this.processRequest.push({
+                value: response.data[j].工艺要求
+              })
+            }
+          })
+        }
+      }
+    },
+    // 确定选择主表的工艺名称及要求
+    confirmSelect() {
+      this.tableData[this.index].工艺编号 = this.processN1
+      this.tableData[this.index].工艺名称 = this.processNameValue
+      this.str = this.str + this.processRequestValue
+      this.tableData[this.index].工艺要求 = this.str
+      this.dialogFormVisible2 = false
+      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求)
+    },
+    calTol() { // 计算公差
+      this.tolerance = ''
+      for (let i = 0; i < this.selPara.length; i++) {
+        if (this.selParaValue === this.selPara[i].value) {
+          break
+        }
+      }
+      searchTolerance(this.numVal, this.selParaValue).then(response => {
+        if (response.data.length !== 0) { // 防止超出范围报错
+          this.tolerance = response.data[0].公差
+        } else {
+          this.$message.error('输入的数值不对！')
+        }
+      })
+    },
+    copyAndSave() { // 复制并保存
+      if (this.tableData.length !== 0) {
+        this.oldNum = this.tableData[0].工艺计划流水号
+        this.saveApprove()
+      } else {
+        this.$message.error('当前没有可以被复制的工艺')
+      }
+    },
+    saveApprove() { // 核准保存
+      if (this.checked === true) {
+        let 零件图号
+        let flag = 0
+        for (let i = 0; i < this.tableData.length; i++) {
+          saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级).then(() => {
+            for (let j = 0; j < this.partNum.length; j++) {
+              if (this.partNum[j].value === this.partNumValue) {
+                零件图号 = this.partNum[j].label
+              }
+            }
+            TableAddLi(this.tableData[i].单件定额工时, this.tableData[i].准结定额工时, 零件图号, this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号).then(() => {
+              flag++
+              if (flag === this.tableData.length) {
+                TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => {
+                  this.checked = false
+                  this.partNumValue = ''
+                  this.typeValue = ''
+                  this.Specifications = ''
+                  this.partName = ''
+                  this.batchNum = ''
+                  this.material = ''
+                  this.materialName = ''
+                  this.spec = ''
+                  this.newNum = ''
+                  this.searchPartsByMachineGroup()
+                  this.$message.success('保存成功')
+                })
+              }
+            })
+          })
+        }
+      } else {
+        this.$message.error('请核准后保存')
+      }
+    },
+    insertOne(row) { // 插入行
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        insertOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    deleteOne(row) { // 删除行
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        deleteOne(this.partNumValue, row.工序流水号).then(() => {
+          this.searchDetail()
+        })
+      }
+    },
+    upOne(row) { // 上移
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        upOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    downOne(row) { // 下移
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        downOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    saveMaterial() { // 保存材质
+      if (this.partNumValue === '' || this.material === '') {
+        this.$message.error('请选择一个零件')
+      } else {
+        saveMaterial(this.partNumValue, this.material).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('保存失败')
+          }
+        })
+      }
+    },
+    pasteTable() { // 粘贴
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请选择零件作为被粘贴对象')
+      } else {
+        pasteTable(this.oldNum, this.newNum).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('粘贴成功')
+            this.searchDetail()
+          } else {
+            this.$message.error('粘贴失败')
+          }
+        })
+      }
+    },
+    deleteTable() { // 删除
+      if (this.newNum === '') {
+        this.$message.error('请选择一个零件')
+      } else {
+        this.$confirm('此操作将永久删除该零件的工艺, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.tableData.length; i++) {
+            hardEdit(this.tableData[i].工序流水号, '').then(response => {
+            })
+          }
+          deleteTable(this.newNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.searchDetail()
+            } else {
+              this.$message.error('删除失败')
+            }
+          })
+        }).catch((error) => {
+          console.log(error)
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .doing-row4 {
+    background: #f0f9eb;
+  }
+  .el-card {
+    margin-bottom: 0px;
+  }
+  .el-date-editor {
+    width: 150px
+  }
+  span {
+    margin-left: 10px;
+  }
+  .el-table .change {
+    background: oldlace;
+  }
+</style>
+<style lang="scss">
+  .processTable{
+    .el-input__inner{
+      font-weight: bold;
+      font-size: 18px;
+      height: 35px;
+    }
+    .el-textarea__inner{
+      font-weight: bold;
+      font-size: 18px;
+    }
+    .el-cascader__label{
+      font-weight: bold;
+      font-size: 18px;
+    }
+  }
+  .gongyizhiding {
+    .el-tree-node>.el-tree-node__children {
+      overflow: hidden;
+      background-color: #d8e5f6;
+    }
+  }
+</style>
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index a99bdaa5..9452dd73 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -341,7 +341,6 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
       <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
         <el-row>
@@ -396,7 +395,6 @@
         </el-table>
       </el-form>
     </el-dialog>
-
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
         <el-row>
@@ -471,7 +469,6 @@
         </el-table>
       </el-form>
     </el-dialog>
-
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
       <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
         <el-table-column align="center" label="考勤编号" width="150">
diff --git a/src/views/ManufacturingCenter/Querybd/index.vue b/src/views/ManufacturingCenter/Querybd/index.vue
index e592de52..01df9f7c 100644
--- a/src/views/ManufacturingCenter/Querybd/index.vue
+++ b/src/views/ManufacturingCenter/Querybd/index.vue
@@ -186,7 +186,8 @@
   </div>
 </template>
 
-<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
+<script>
+import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
 import request from '@/utils/request'
 export default {
   data() {
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
new file mode 100644
index 00000000..78b7a2aa
--- /dev/null
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -0,0 +1,306 @@
+<template>
+  <div>
+    <el-row>
+      <el-col style="width: 650px">
+        <el-card style="height: 800px">
+          <el-row style="margin-top: 5px">
+            <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
+              <el-option
+                v-for="item in Person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-row>
+          <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"/>
+            <el-table-column label="图号及规格" align="center" width="190px">
+              <template slot-scope="scope">
+                {{ scope.row.图号及规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="制品名称" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划开始" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.计划开始时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划完成" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.计划结束时间 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[50, 100, 200, 500, 1000]"
+              :page-size="pageSize"
+              :total="total"
+              :pager-count="5"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 650px">
+        <el-card style="height: 800px">
+          <el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
+            <el-table-column label="零件图号" align="center" width="190px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="制品名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作者" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
+            <el-table-column label="序号" align="center" width="50px">
+              <template slot-scope="scope">
+                {{ scope.row.工序顺序 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作者" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="排产时间" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.排产时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="完成日期" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.完成日期 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2, panDuan } from '@/api/ManufacturingCenter/ShopScheduling'
+export default {
+  data() {
+    return {
+      index: 0,
+      工艺计划流水号: '',
+      PersonValue: '',
+      Person: [],
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      total: 0, // 总条数
+      pageSize: 500,
+      pageCurrent: 1
+    }
+  },
+  created() {
+    this.getPerson()
+    this.getParts()
+  },
+  methods: {
+    getPerson() {
+      this.PersonValue = ''
+      this.Person = []
+      getPerson().then(response => {
+        response.data.map(v => {
+          this.Person.push({
+            label: v.姓名,
+            value: v.人员编号
+          })
+        })
+        this.PersonValue = this.Person[0].value
+        this.searchTableData2()
+      })
+    },
+    getParts() {
+      this.tableData1 = []
+      this.loading1 = true
+      getParts(this.pageCurrent, this.pageSize).then(response => {
+        response.data.rows.map(v => {
+          this.tableData1.push({
+            工艺计划流水号: v.工艺计划流水号,
+            图号及规格: v.图号及规格,
+            零件名称: v.零件名称,
+            投产数量: v.投产数量,
+            计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
+            计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
+            状态: v.状态
+          })
+        })
+        this.total = response.data.total
+        this.loading1 = false
+      })
+    },
+    getGongxu(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      this.index = row.index
+      this.工艺计划流水号 = row.工艺计划流水号
+      getGongxu(row.工艺计划流水号).then(response => {
+        response.data.map(v => {
+          this.tableData3.push({
+            工序流水号: v.工序流水号,
+            工序状态: v.工序状态,
+            工序顺序: v.工序顺序,
+            工艺名称: v.工艺名称,
+            姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+            排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+            完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+            工序间是否外协: v.工序间是否外协
+          })
+        })
+        this.loading3 = false
+      })
+    },
+    tableData1ClassName({ row, rowIndex }) {
+      row.index = rowIndex
+      if (row.状态 === '1') {
+        return 'CJPClingjianjinxing'
+      }
+    },
+    tableData3ClassName({ row, rowIndex }) {
+      if (row.工序状态 === 4) {
+        return 'CJPCgongxuwancheng'
+      }
+      if (row.工序间是否外协 === 2) {
+        return 'CJPCxujianwaixie'
+      }
+    },
+    searchTableData2() {
+      this.loading2 = true
+      this.tableData2 = []
+      searchTableData2(this.PersonValue).then(response => {
+        this.tableData2 = response.data
+        this.loading2 = false
+      })
+    },
+    XuanRu(row) {
+      if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) {
+        XuanRu(this.PersonValue, row.工序流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.tableData1[this.index].状态 = '1'
+            this.loading3 = true
+            this.tableData3 = []
+            getGongxu(this.工艺计划流水号).then(response => {
+              response.data.map(v => {
+                this.tableData3.push({
+                  工序流水号: v.工序流水号,
+                  工序状态: v.工序状态,
+                  工序顺序: v.工序顺序,
+                  工艺名称: v.工艺名称,
+                  姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+                  排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+                  完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+                  工序间是否外协: v.工序间是否外协
+                })
+              })
+              this.loading3 = false
+            })
+            this.searchTableData2()
+          }
+        })
+      }
+    },
+    XuanChu(row) {
+      XuanChu(row.工序流水号).then(response => {
+        if (response.data[0].result === '1') {
+          panDuan(row.工艺计划流水号).then(res => {
+            if (res.data[0].状态 === 0) {
+              this.tableData1.map(v => {
+                if (parseInt(v.工艺计划流水号) === parseInt(res.data[0].工艺计划流水号)) {
+                  v.状态 = ''
+                }
+              })
+            }
+          })
+          this.loading3 = true
+          this.tableData3 = []
+          getGongxu(this.工艺计划流水号).then(response => {
+            response.data.map(v => {
+              this.tableData3.push({
+                工序流水号: v.工序流水号,
+                工序状态: v.工序状态,
+                工序顺序: v.工序顺序,
+                工艺名称: v.工艺名称,
+                姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+                排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+                完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+                工序间是否外协: v.工序间是否外协
+              })
+            })
+            this.loading3 = false
+          })
+          this.searchTableData2()
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.tableData3 = []
+      this.pageSize = val
+      this.getParts()
+    },
+    handleCurrentChange(val) {
+      this.tableData3 = []
+      this.pageCurrent = val
+      this.getParts()
+    }
+  }
+}
+</script>
+
+<style>
+  .CJPCgongxuwancheng{
+    background: #d8e5f6 !important;
+  }
+  .CJPClingjianjinxing{
+    background: #9bd7fc !important;
+  }
+  .CJPCxujianwaixie{
+    background: #e6eaee !important;
+  }
+</style>
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 531218a8..9e13f41f 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -2,40 +2,31 @@
   <div class="app-container">
     <!--顶栏结构-->
     <el-card>
-      <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
-      <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
-      <span>招标企业:</span>
-      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
-      <span style="margin-left: 10px">保金类型:</span>
-      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
+      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
+      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
         <el-option
           v-for="item in TypeOfGoldDeposit"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">投标人:</span>
-      <el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
-      <el-row>
-        <span>开始日期: </span>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 200px;margin: 3px 0"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期: </span>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
-      </el-row>
+      <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
+      <el-date-picker
+        v-model="startTime"
+        style="width: 150px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择开始日期"/>
+      <el-date-picker
+        v-model="endTime"
+        style="width: 150px;"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择结束日期"/>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
     </el-card>
 
     <!--投标保证金表格-->
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 1158cc16..371991a0 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -2,32 +2,25 @@
   <div>
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right:5px;width:150px" size="small">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
-      </el-row>
-      <el-row>
-        <span>开始日期：</span>
+        <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="margin-right:5px;width:150px"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index bde67018..7e7e4ba4 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -24,7 +24,7 @@
         :expand-row-keys="expands"
         :data="tableData1"
         style="width: 100%;"
-        height="500px"
+        height="600px"
         highlight-current-row
         border
         stripe
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index b0b639d1..06681715 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -2,32 +2,25 @@
   <div class="app-container">
     <el-card style="background: rgb(233,240,250)">
       <div>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      </div>
-      <div style="margin-top: 10px">
-        <span style="margin-top: 20px">开始日期：</span>
+        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;margin-bottom: 3px;"
+          style="width: 150px;margin-bottom: 3px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -44,7 +37,7 @@
         :expand-row-keys="expands"
         highlight-current-row
         style="width: 100%;margin: 3px 0px"
-        height="500"
+        height="700"
         border
         stripe
         size="mini"
@@ -146,7 +139,7 @@
         </el-table-column>
         <el-table-column align="center" label="发货节点" width="85">
           <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="安装调试节点" width="100">
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index c0518427..2436c3c7 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -3,30 +3,24 @@
     <!--查询条件-->
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
+        <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
-      </el-row>
-      <el-row>
-        <span>开始日期：</span>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="margin-right: 5px;width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -40,8 +34,8 @@
         v-loading="listLoading1"
         :data="tableData1"
         highlight-current-row
-        style="width: 100%;margin-top: 3px"
-        height="460"
+        style="width: 1360px;margin-top: 3px"
+        height="550"
         border
         stripe
         size="mini"
@@ -88,7 +82,7 @@
             <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注">
+        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 80892e18..f03eab2c 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -32,8 +32,8 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-        style="width: 100%;margin-top: 3px;"
-        height="500"
+        style="margin-top: 3px;width: 1355px"
+        height="600"
         border
         stripe
         size="mini"
@@ -79,12 +79,12 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注">
+        <el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="210px">
+        <el-table-column label="操作" align="center" width="210px">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用增加履约保证金"
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index c0876754..e17aaa69 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -33,7 +33,7 @@
       <el-table
         v-loading="listLoadingProject"
         :data="projectTableData"
-        style="width: 100%;margin-top: 3px;"
+        style="width: 1360px;margin-top: 3px;"
         height="650"
         border
         stripe
@@ -65,7 +65,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="250" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
@@ -80,7 +80,7 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注" >
+        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>