diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js
index 50eacc6f..bfaa181d 100644
--- a/src/api/ManufacturingCenter/ParseQuery.js
+++ b/src/api/ManufacturingCenter/ParseQuery.js
@@ -61,7 +61,7 @@ export function searchAll() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '1_总查询',
+      name: '综合查询_总查询',
       param: '机床流水号=' + arguments[0]
     }
   })
diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
index 12ed521e..fdfadc2e 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningQuery.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
@@ -80,7 +80,7 @@ export function searchAll(num1, num2) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '16_项目总查询',
+      name: '项目计划查询_项目总查询',
       param: '项目流水号_check=' + num1 + '&项目流水号=' + num2
     }
   })
diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index b613987c..25fdf5ec 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -26,7 +26,7 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) {
   return request({
     url: '',
     method: 'post',
@@ -35,7 +35,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '合同资金管理_资金信息_查询1',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string',
+      param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Outsourcing/OutFactoryMaintenance.js b/src/api/Outsourcing/OutFactoryMaintenance.js
index c19635bb..dcad6e8b 100644
--- a/src/api/Outsourcing/OutFactoryMaintenance.js
+++ b/src/api/Outsourcing/OutFactoryMaintenance.js
@@ -11,7 +11,7 @@ export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber, num
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
+      name: '车间生产管理工艺_外协厂家_查询',
       param: '序号_check=' + num1 + '=int&序号=' + ManufacturerNumber + '&外协厂家名称_check=' + num2 + '=int&外协厂家名称=' + ManufacturerName + '&外协厂家简称_check=' + num10 + '=int&外协厂家简称=' + ManufacturerAbbreviation + '&地址_check=' + num3 + '=int&地址=' + address + '&联系人_check=' + num4 + '=int&联系人=' + roleName + '&电话_check=' + num5 + '=int&电话=' + phNumber + '&传真_check=' + num6 + '=int&传真=' + Fax + '&备注_check=' + num7 + '=int&备注=' + Remarks + '&类别_check=' + num8 + '=int&类别=' + category + '&关注_check=' + num11 + '=int&关注=' + attention + '&设备情况_check=' + num9 + '=int&设备情况=' + EquipmentCondition,
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/api/Outsourcing/OutsourcingTaskChanges.js b/src/api/Outsourcing/OutsourcingTaskChanges.js
index 14935f38..cf1cfdba 100644
--- a/src/api/Outsourcing/OutsourcingTaskChanges.js
+++ b/src/api/Outsourcing/OutsourcingTaskChanges.js
@@ -61,7 +61,7 @@ export function searchManufactor(name) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
+      name: '车间生产管理工艺_外协厂家_查询',
       param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
     }
   })
diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index 988f2114..3f1c2a98 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -15,34 +15,6 @@ export function initOutHelp() {
     }
   })
 }
-// 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 初始化获取外协厂家数据
-export function getData1() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 初始化获取已预算价格，未选入到外协加工任务单的零件
 export function getTable1(check, partNumber) {
   return request({
@@ -52,11 +24,41 @@ export function getTable1(check, partNumber) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新',
+      name: '车间生产管理工艺_外协任务执行_未选入零件_查询',
       param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string'
     }
   })
 }
+// 初始化获取已生成的外协加工任务单
+export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
+      param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询任务单明细
+export function getParts(Number) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据',
+      param: '外协加工任务单流水号=' + Number
+    }
+  })
+}
+
 // 打回
 export function getBack(processPlan) {
   return request({
@@ -71,59 +73,45 @@ export function getBack(processPlan) {
     }
   })
 }
-// 获取零件工序信息（零件号表中）
-export function getprocedure(processPlan, single) {
+// 选入零件
+export function insertParts(processNum, Number) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
-      param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_选入_循环执行',
+      param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum
     }
   })
 }
-// 外协厂家查询
-export function searchManufactor(check, name) {
+// 计算价格
+export function getPrice(Number, money) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
-      param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_保存_循环执行',
+      param: '外协加工任务单明细流水号组=' + Number + '&加工价格_成交组=' + money
     }
   })
 }
-// 确定价格
-export function spareParts(processNum, single) {
+// 成交
+export function editData1(Number, manufacturers, freight, Explain) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int'
-    }
-  })
-}
-// 暂未启用
-export function spareParts1(processNum, single) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理_外协加工任务单_修改数据',
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
     }
   })
 }
@@ -155,20 +143,6 @@ export function editData(Number, manufacturers, freight, Explain) {
     }
   })
 }
-// 成交
-export function editData1(Number, manufacturers, freight, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
-    }
-  })
-}
 // 删除外协加工任务单
 export function deleteData(Number) {
   return request({
@@ -197,34 +171,7 @@ export function deleteData1(Number) {
     }
   })
 }
-// 选入零件
-export function insertParts(processNum, Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_增加数据',
-      param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
-    }
-  })
-}
-// 查询任务单明细
-export function getParts(Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单明细_查询数据',
-      param: '外协加工任务单流水号=' + Number + '=int'
-    }
-  })
-}
+
 // 数据库生产表单号
 export function getNumber(time) {
   return request({
@@ -239,17 +186,3 @@ export function getNumber(time) {
     }
   })
 }
-// 计算价格
-export function getPrice(Number, money, money1, money2, money3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_修改数据',
-      param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int'
-    }
-  })
-}
diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js
index e3a7bbe7..a77cbf97 100644
--- a/src/api/Outsourcing/OutsourcingTaskQuery.js
+++ b/src/api/Outsourcing/OutsourcingTaskQuery.js
@@ -81,7 +81,7 @@ export function searchManufactor(name) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
+      name: '车间生产管理工艺_外协厂家_查询',
       param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
     }
   })
diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js
index 3fed5a75..d54ec3f2 100644
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -3,7 +3,7 @@ import state from '@/store'
 import router from '@/router'
 
 // 查询审核/审批/付款
-export function initApproval(pageCurrent, pageSize, state) {
+export function initApproval(pageCurrent, pageSize, haha) {
   return request({
     url: '',
     method: 'post',
@@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购合同_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${haha}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 执行审核/审批/付款
-export function execApproval(num1, num2, reason, person, state) {
+export function execApproval(num1, num2, reason, person, haha) {
   return request({
     url: '',
     method: 'post',
@@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '采购管理_采购合同_审批付款_修改数据',
-      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
     }
   })
 }
 // 查询离线合同审核/审批/付款
-export function initApprovalOffline(pageCurrent, pageSize, state) {
+export function initApprovalOffline(pageCurrent, pageSize, haha) {
   return request({
     url: '',
     method: 'post',
@@ -41,7 +41,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_离线合同_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${haha}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -75,7 +75,7 @@ export function searchRequsetFundDetail2(num) {
   })
 }
 // 执行审核/审批/付款（离线合同）
-export function execApprovalOffline(num1, num2, reason, person, state) {
+export function execApprovalOffline(num1, num2, reason, person, haha) {
   return request({
     url: '',
     method: 'post',
@@ -84,7 +84,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '采购管理_离线合同_审批付款_修改数据',
-      param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
     }
   })
 }
diff --git a/src/api/TechnologyCenter/PartDrawingMaintenance.js b/src/api/TechnologyCenter/PartDrawingMaintenance.js
index a714e43d..0468f2fb 100644
--- a/src/api/TechnologyCenter/PartDrawingMaintenance.js
+++ b/src/api/TechnologyCenter/PartDrawingMaintenance.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 import state from '@/store'
 import router from '@/router'
 
-export function projectSelect() {
+export function getTableData(partNumber_check, partNumber, pageSize, pageCurrent) {
   return request({
     url: '',
     method: 'post',
@@ -10,48 +10,8 @@ export function projectSelect() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
-    }
-  })
-}
-
-export function machineSelect(projectValue) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: 'PDM_机床名称_查询数据2',
-      param: `项目流水号=${projectValue}`
-    }
-  })
-}
-
-export function groupSelect(machineValue) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: 'PDM_零件明细表_组件流水号_查询数据_根据机床',
-      param: `机床流水号=${machineValue}`
-    }
-  })
-}
-export function basicPartsData(project_check, project, machine_check, machine, group_check, group, whetherToImport_check, whetherToImport, pageSize, pageCurrent) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: 'PDM_零件明细表_基本件_查询数据_综合gj',
-      param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&是否导入_check=${whetherToImport_check}&是否导入=${whetherToImport}`,
+      name: '技术中心_零件图维护_查询',
+      param: `零件图号_check=${partNumber_check}&零件图号=${partNumber}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js
index 2ec6115f..86f775a7 100644
--- a/src/api/WorkshopProcurement/FundApproval.js
+++ b/src/api/WorkshopProcurement/FundApproval.js
@@ -3,7 +3,7 @@ import state from '@/store'
 import router from '@/router'
 
 // 查询审批/付款
-export function initApproval(pageCurrent, pageSize, state) {
+export function initApproval(pageCurrent, pageSize, state2) {
   return request({
     url: '',
     method: 'post',
@@ -12,13 +12,13 @@ export function initApproval(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间采购管理_采购合同_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${state2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 执行审批/付款
-export function execApproval(num1, num2, reason, person, state) {
+export function execApproval(num1, num2, reason, person, state2) {
   return request({
     url: '',
     method: 'post',
@@ -27,12 +27,12 @@ export function execApproval(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间采购管理_采购合同_审批付款_修改数据',
-      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
     }
   })
 }
 // 查询车间合同审批/付款
-export function initApproval1(pageCurrent, pageSize, state) {
+export function initApproval1(pageCurrent, pageSize, state2) {
   return request({
     url: '',
     method: 'post',
@@ -41,7 +41,7 @@ export function initApproval1(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间采购管理_采购合同_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${state2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -60,7 +60,7 @@ export function searchRequsetFundDetail3(num) {
   })
 }
 // 执行车间合同审批/付款
-export function execApproval1(num1, num2, reason, person, state) {
+export function execApproval1(num1, num2, reason, person, state2) {
   return request({
     url: '',
     method: 'post',
@@ -69,12 +69,12 @@ export function execApproval1(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间采购管理_采购合同_审批付款_修改数据',
-      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
     }
   })
 }
 // 查询离线合同审批/付款
-export function initApprovalOffline(pageCurrent, pageSize, state) {
+export function initApprovalOffline(pageCurrent, pageSize, state2) {
   return request({
     url: '',
     method: 'post',
@@ -83,7 +83,7 @@ export function initApprovalOffline(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间采购管理_离线合同_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${state2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -103,7 +103,7 @@ export function searchRequsetFundDetail(num) {
   })
 }
 // 执行审批/付款（离线合同）
-export function execApprovalOffline(num1, num2, reason, person, state) {
+export function execApprovalOffline(num1, num2, reason, person, state2) {
   return request({
     url: '',
     method: 'post',
@@ -112,7 +112,7 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间采购管理_离线合同_审批付款_修改数据',
-      param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
     }
   })
 }
@@ -131,7 +131,7 @@ export function searchRequsetFundDetail1(num) {
   })
 }
 // 查询备料审批/付款
-export function initApprovalMaterials(pageCurrent, pageSize, state) {
+export function initApprovalMaterials(pageCurrent, pageSize, state2) {
   return request({
     url: '',
     method: 'post',
@@ -140,13 +140,13 @@ export function initApprovalMaterials(pageCurrent, pageSize, state) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '备料管理_审批付款_查询数据',
-      param: `审批_付款状态=${state}`,
+      param: `审批_付款状态=${state2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 执行审批/付款（备料）
-export function execMaterials(num1, num2, reason, person, state) {
+export function execMaterials(num1, num2, reason, person, state2) {
   return request({
     url: '',
     method: 'post',
@@ -155,7 +155,7 @@ export function execMaterials(num1, num2, reason, person, state) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '备料管理_审批付款_修改数据',
-      param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
+      param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}`
     }
   })
 }
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 2ea4c7cf..c2950ed2 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -237,7 +237,7 @@ export default {
         method: 'post',
         data: {
           type: '1',
-          name: '库存管理_货位主文件_查询数据_2019-11-28'
+          name: '库存管理_根据仓库查货位_查询数据'
         }
       }
       request(param).then(res => {
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index ef4311f0..91080446 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -12,17 +12,17 @@
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
+              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">外购备料</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">分配自家备料</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
-              <el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
-              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>
+              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">自家备料</el-button>
             </el-tooltip>
+            <!--<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">-->
+            <!--<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>-->
+            <!--</el-tooltip>-->
+            <!--<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">-->
+            <!--<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>-->
+            <!--</el-tooltip>-->
           </el-row>
         </el-card>
       </div>
@@ -44,14 +44,16 @@
         @selection-change="handleSelectionChange">
         <!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
         <el-table-column
+          :selectable="checkboxT"
           type="selection"
           width="50"
           align="center"/>
-        <el-table-column label="进程" prop="备料分配" align="center" width="70">
+        <el-table-column label="进程" prop="备料分配" align="center" width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
             <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
             <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
+            <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='1'" type="warning" size="mini">自家&外购</span>
           </template>
         </el-table-column>
         <el-table-column label="零件名称" prop="零件名称" align="center" width="140px" sortable="custom" show-overflow-tooltip>
@@ -75,12 +77,12 @@
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
-        <el-table-column label="重量" align="center" width="60" >
+        <el-table-column label="重量(KG)" align="center" width="80" >
           <template slot-scope="scope">
             {{ scope.row.重量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺要求" align="center" width="180" show-overflow-tooltip>
+        <el-table-column label="工艺要求" align="center" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
           </template>
@@ -170,6 +172,15 @@ export default {
     this.searchTable()
   },
   methods: {
+    // 复选框
+    checkboxT(row, rowIndex) {
+      if (row.备料打印 === '0' && row.是否外购备料 === '0') {
+        //      if(row.lie =='1'){
+        return true// 禁用
+      } else {
+        return false// 不禁用
+      }
+    },
     sortChange(column, prop, order) {
       console.log(column + '-' + column.prop + '-' + column.order, 11111)
       if (column.prop === '零件名称') {
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 0bbb19fa..ecb3de1b 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -2,7 +2,6 @@
   <div class="app-container">
     <el-card style="padding-top: 5px;">
       <el-row>
-        <!--        <span>机床编号:</span>-->
         <el-select v-model="machineNumberValue" filterable placeholder="机床图号" size="small" style="margin:0px;width: 180px" clearable @change="machineChange">
           <el-option
             v-for="item in machineNumber"
@@ -13,7 +12,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <!--        <span>组号:</span>-->
         <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin-left: 10px;width: 90px" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
@@ -32,219 +30,187 @@
         </el-badge>
       </el-row>
     </el-card>
-    <!--    <el-card>-->
-    <!--      <el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">-->
-    <!--        <el-table-column label="项目名称" prop="项目名称" align="center">-->
-    <!--          <template slot-scope="scope">-->
-    <!--            {{ scope.row.项目名称 }}-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--        <el-table-column label="机床编号" prop="机床图号" align="center">-->
-    <!--          <template slot-scope="scope">-->
-    <!--            {{ scope.row.机床图号 }}-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--        <el-table-column label="机床名称" prop="机床名称" align="center">-->
-    <!--          <template slot-scope="scope">-->
-    <!--            {{ scope.row.机床名称 }}-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--        <el-table-column label="组号" prop="组号" align="center">-->
-    <!--          <template slot-scope="scope">-->
-    <!--            {{ scope.row.组号 }}-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--        <el-table-column label="组件名称" prop="组件名称" align="center">-->
-    <!--          <template slot-scope="scope">-->
-    <!--            {{ scope.row.组件名称 }}-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--      </el-table>-->
-    <!--    </el-card>-->
-    <el-card style="">
-      <el-tabs type="border-card" @tab-click="selectPart">
-        <el-tab-pane label="基本件">
-          <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1140px" height="300px" @selection-change="handleSelectionChange">
-            <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.零件图号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="前零件图号" align="center" width="120px" show-overflow-tooltip>
-              <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="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-column label="零件总数量" align="center" width="90px">
-              <template slot-scope="scope">
-                {{ scope.row.总数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="投产总数量" align="center" width="115px">
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 90px"/>
-              </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="100px">
-              <template slot-scope="scope">
-                <el-button type="danger" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="外购件">
-          <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
-            <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="物料代码" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料代码 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料名称" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料规格" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料型号" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="零件数量" align="center" width="90">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="机床数量" align="center" width="90">
-              <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="115px">
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.备注 }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="标准件">
-          <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
-            <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="物料代码" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料代码 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料名称" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料规格" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料型号" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="零件数量" align="center" width="90">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="机床数量" align="center" width="90">
-              <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="115px">
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.备注 }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
-      <el-card style="padding: 3px">
-        <span>交货期：</span>
-        <el-date-picker
-          v-model="time"
-          size="small"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"/>
-        <span style="font-weight: bold">制造:</span>
-        <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
-        </el-tooltip>
-        <span style="margin-left: 40px;font-weight: bold">金工:</span>
-        <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-          <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
-        </el-tooltip>
-        <span style="margin-left: 40px;font-weight: bold">采购:</span>
-        <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
-          <el-button type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
-        </el-tooltip>
-      </el-card>
+    <el-tabs type="border-card" @tab-click="selectPart">
+      <el-tab-pane label="基本件">
+        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange">
+          <el-table-column align="center" width="50" type="selection"/>
+          <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="前零件图号" align="center" width="120px" show-overflow-tooltip>
+            <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="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-column label="零件总数量" align="center" width="110px">
+            <template slot-scope="scope">
+              {{ scope.row.总数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="投产总数量" align="center" width="115px">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 90px"/>
+            </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="100px">
+            <template slot-scope="scope">
+              <el-button type="danger" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="外购件">
+        <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table-column align="center" width="50" type="selection"/>
+          <el-table-column label="物料代码" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料代码 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料名称" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件数量" align="center" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.零件数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="机床数量" align="center" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.机床数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件总数量" align="center" width="110px">
+            <template slot-scope="scope">
+              {{ scope.row.总数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="采购总数量" align="center" width="115px">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="标准件">
+        <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table-column align="center" width="50" type="selection"/>
+          <el-table-column label="物料代码" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料代码 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料名称" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件数量" align="center" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.零件数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="机床数量" align="center" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.机床数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件总数量" align="center" width="110px">
+            <template slot-scope="scope">
+              {{ scope.row.总数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="采购总数量" align="center" width="115px">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <el-card style="padding: 3px">
+      <span>交货期：</span>
+      <el-date-picker
+        v-model="time"
+        size="small"
+        type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <span style="font-weight: bold">制造:</span>
+      <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
+      </el-tooltip>
+      <span style="margin-left: 40px;font-weight: bold">金工:</span>
+      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
+        <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
+      </el-tooltip>
+      <span style="margin-left: 40px;font-weight: bold">采购:</span>
+      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
+        <el-button type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+      </el-tooltip>
     </el-card>
     <el-card style="padding: 3px;">
       <el-row>
-        <!--        <span>请购单号：</span>-->
         <el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
         <el-button icon="el-icon-search" type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
         <el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
@@ -253,20 +219,15 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 400px;">
-        <el-card>
+      <el-card>
+        <el-col style="width: 400px;">
           <el-table :data="tableData4" stripe border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
             <el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
               <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" show-overflow-tooltip width="60px">
+            <el-table-column label="请购人" align="center" show-overflow-tooltip width="80px">
               <template slot-scope="scope">
                 {{ scope.row.请购人 }}
               </template>
@@ -281,17 +242,9 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <!--        <el-table-column label="操作" align="center" width="250px" fixed="right">-->
-            <!--          <template slot-scope="scope">-->
-            <!--            <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>-->
-            <!--            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete(scope.row)">删除</el-button>-->
-            <!--          </template>-->
-            <!--        </el-table-column>-->
           </el-table>
-        </el-card>
-      </el-col>
-      <el-col style="width: 985px;margin-left: 0px">
-        <el-card>
+        </el-col>
+        <el-col style="width: 950px;margin-left: 0px">
           <el-table :data="tableData6" border size="mini" height="300px">
             <el-table-column label="序号" type="index" align="center" width="50px"/>
             <el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
@@ -304,7 +257,7 @@
                 {{ scope.row.图号或型号 }}
               </template>
             </el-table-column>
-            <el-table-column label="材料或规格" show-overflow-tooltip align="center" width="90px">
+            <el-table-column label="材料或规格" show-overflow-tooltip align="center" width="110px">
               <template slot-scope="scope">
                 {{ scope.row.规格或材料 }}
               </template>
@@ -314,7 +267,7 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件类型" show-overflow-tooltip align="center" width="70px">
+            <el-table-column label="零件类型" show-overflow-tooltip align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.零件类型 }}
               </template>
@@ -324,11 +277,6 @@
                 {{ scope.row.物料计划到货时间 }}
               </template>
             </el-table-column>
-            <!--            <el-table-column label="项目名称" align="center" width="150px">-->
-            <!--              <template slot-scope="scope">-->
-            <!--                {{ scope.row.项目名称 }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
             <el-table-column label="机床图号" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -359,8 +307,8 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-card>
-      </el-col>
+        </el-col>
+      </el-card>
     </el-row>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
@@ -370,7 +318,6 @@
             size="small"
             style="width:200px"/>
         </el-form-item>
-
         <el-form-item label="请购人">
           <el-input
             v-model="name"
@@ -526,7 +473,7 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件数量" width="70">
+        <el-table-column align="center" label="零件数量" width="80">
           <template slot-scope="scope">
             {{ scope.row.零件数量 }}
           </template>
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 37cab537..c517b5a1 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -3,6 +3,19 @@
     <!--顶栏结构-->
     <el-card>
       <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
+      <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+      <el-date-picker
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 240px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <!--      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">-->
       <!--        <el-option-->
       <!--          v-for="item in TypeOfGoldDeposit"-->
@@ -26,7 +39,7 @@
       <!--        type="date"-->
       <!--        placeholder="请选择结束日期"/>-->
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
-      <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
+      <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">保证金</el-button>
     </el-card>
 
     <!--投标保证金表格-->
@@ -40,7 +53,7 @@
         border
         stripe
         size="mini">
-        <el-table-column align="center" label="投标结果" prop="投标结果" width="200">
+        <el-table-column align="center" label="投标结果" prop="投标结果" width="190">
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
               <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -48,17 +61,17 @@
             </el-radio-group>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="公布日期" width="90">
+        <el-table-column align="center" label="公布日期" width="86">
           <template slot-scope="scope">
             {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="招标企业" prop="招标企业" width="180">
+        <el-table-column align="center" label="招标企业" prop="招标企业" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.招标企业 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系人" width="100">
+        <el-table-column align="center" label="联系人" width="80">R
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
@@ -68,58 +81,63 @@
             {{ scope.row.联系电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="保证金金额" width="100">
+        <el-table-column align="center" label="保证金金额(万元)" width="100">
           <template slot-scope="scope">
             <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="中标服务费" width="100">
+        <el-table-column align="center" label="中标服务费(万元)" width="100">
           <template slot-scope="scope">
             {{ Number(scope.row.中标服务费).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="转履约保证金金额" width="140">
+        <el-table-column align="center" label="转履约保证金(万元)" width="120">
           <template slot-scope="scope">
             {{ Number(scope.row.转履约保证金金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="应收回金额" width="100">
+        <el-table-column align="center" label="应收回(万元)" width="80">
           <template slot-scope="scope">
             {{ Number(scope.row.应收回金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="实收回金额" width="100">
+        <el-table-column align="center" label="实收回(万元)" width="80">
           <template slot-scope="scope">
             <span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</span>
             <span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投标人" prop="投标人" width="100">
+        <el-table-column align="center" label="未收金额(万元)" width="90">
+          <template slot-scope="scope">
+            {{ Number(scope.row.未收金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="投标人" prop="投标人" width="80">
           <template slot-scope="scope">
             {{ scope.row.投标人 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="保金类型" width="150">
+        <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="150">
+        <el-table-column align="center" label="投标日期" width="86">
           <template slot-scope="scope">
             {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划收回日期" width="150">
+        <el-table-column align="center" label="计划收回日期" width="86">
           <template slot-scope="scope">
             {{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="实际收回日期" width="150">
+        <el-table-column align="center" label="实际收回日期" width="86">
           <template slot-scope="scope">
             {{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="状态" width="120">
+        <el-table-column align="center" label="状态" width="80">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="mini" style="width: 66px">未公布</el-tag>
             <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="mini" style="width: 66px">已收回</el-tag>
@@ -128,20 +146,21 @@
             <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注">
+        <el-table-column align="center" label="备注" width="100px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="320">
+        <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="scope">
-            <el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top">
+            <el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top" style="margin-left: 0px">
               <div style="display: inline-block">
                 <el-button
                   :disabled="scope.row.是否禁用"
                   size="mini"
                   type="text"
                   icon="el-icon-money"
+                  style="margin-left: 0px"
                   @click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
               </div>
             </el-tooltip>
@@ -151,7 +170,7 @@
                   :disabled="scope.row.是否禁用履约"
                   size="mini"
                   type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                   icon="el-icon-stopwatch"
                   @click.stop="ComplianceGold(scope.row)">转入履约金</el-button>
               </div>
@@ -162,9 +181,9 @@
                   :disabled="scope.row.是否禁用编辑"
                   size="mini"
                   type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                   icon="el-icon-edit-outline"
-                  @click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
+                  @click.stop="editBidBond(scope.row);flag1 = 3"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
@@ -173,9 +192,9 @@
                   :disabled="scope.row.是否禁用删除"
                   size="mini"
                   type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                   icon="el-icon-delete"
-                  @click.stop="delBidBond(scope.row)">删除</el-button>
+                  @click.stop="delBidBond(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -193,7 +212,7 @@
       </div>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="销售经理" center width="400px">
       <div style="height: 420px">
         <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
           <el-tree
@@ -206,41 +225,43 @@
             @node-click="handleNodeClick"
           />
         </div>
-        <el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange" >
-          <el-table-column label="考勤编号" align="center" >
-            <template slot-scope="scope">
-              {{ scope.row.考勤编号 }}
-            </template>
-          </el-table-column>
+        <el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 100px;float: left;margin-left: 30px" @row-click="handleChange" >
+          <!--<el-table-column label="考勤编号" align="center" >-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.考勤编号 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
           <el-table-column label="姓名" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="性别" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.性别 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="工作岗位" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.岗位名称 }}
-            </template>
-          </el-table-column>
+          <!--<el-table-column label="性别" align="center">-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.性别 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="工作岗位" align="center">-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.岗位名称 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
         </el-table>
       </div>
-      <el-button style="margin-left: 260px" @click="offName">取消</el-button>
-      <el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
+      <el-button size="small" style="margin-left: 90px" icon="el-icon-circle-close" @click="offName">取消</el-button>
+      <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
+      <!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
+      <!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
     </el-dialog>
 
     <!--收回投标保证金-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="40%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="320px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="实际收回日期" prop="收回日期">
           <el-date-picker
             v-model="form1.收回日期"
             :picker-options="pickerOptions"
-            style="width: 200px;"
+            style="width: 160px;"
             value-format="yyyy-MM-dd"
             size="small"
             type="date"
@@ -248,14 +269,16 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form1')">取消</el-button>
-        <el-button type="primary" @click="submit('form1')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form1')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
+        <!--<el-button @click="callOff('form1')">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit('form1')">确 定</el-button>-->
       </div>
     </el-dialog>
 
     <!--投标保证金对话框-->
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="750px">
-      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="130px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
             <el-form-item label="招标企业" prop="招标企业">
@@ -275,8 +298,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
+            <el-form-item label="保证金金额(万元)" prop="保证金金额">
+              <el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 200px" size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -298,35 +321,35 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="投标日期" prop="投标日期">
-              <el-date-picker
-                v-model="form2.投标日期"
-                style="width: 200px;"
-                value-format="yyyy-MM-dd"
-                size="small"
-                type="date"
-                placeholder="投标日期"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公布后X天收回" prop="提前X天提醒我">
-              <el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>
-            </el-form-item>
-          </el-col>
-          <!--<el-col :span="12">-->
-          <!--<el-form-item label="计划收回日期" prop="计划收回日期">-->
-          <!--<el-date-picker-->
-          <!--v-model="form2.计划收回日期"-->
-          <!--style="width: 200px;"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--size="small"-->
-          <!--type="date"-->
-          <!--placeholder="收回日期"/>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-        </el-row>
+        <!--<el-row>-->
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="投标日期" prop="投标日期">-->
+        <!--<el-date-picker-->
+        <!--v-model="form2.投标日期"-->
+        <!--style="width: 200px;"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="small"-->
+        <!--type="date"-->
+        <!--placeholder="投标日期"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="公布后X天收回" prop="提前X天提醒我">-->
+        <!--<el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--&lt;!&ndash;<el-col :span="12">&ndash;&gt;-->
+        <!--&lt;!&ndash;<el-form-item label="计划收回日期" prop="计划收回日期">&ndash;&gt;-->
+        <!--&lt;!&ndash;<el-date-picker&ndash;&gt;-->
+        <!--&lt;!&ndash;v-model="form2.计划收回日期"&ndash;&gt;-->
+        <!--&lt;!&ndash;style="width: 200px;"&ndash;&gt;-->
+        <!--&lt;!&ndash;value-format="yyyy-MM-dd"&ndash;&gt;-->
+        <!--&lt;!&ndash;size="small"&ndash;&gt;-->
+        <!--&lt;!&ndash;type="date"&ndash;&gt;-->
+        <!--&lt;!&ndash;placeholder="收回日期"/>&ndash;&gt;-->
+        <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
+        <!--&lt;!&ndash;</el-col>&ndash;&gt;-->
+        <!--</el-row>-->
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="备注">
@@ -336,14 +359,14 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form2')">取消</el-button>
-        <el-button type="primary" @click="submit('form2')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="23%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="400px">
       <el-form ref="Timeform" :model="Timeform" :rules="TimeRules" label-width="150px">
-        <el-form-item label="投标结果公布日期" prop="投标结果公布日期">
+        <el-form-item label="公布日期" prop="投标结果公布日期">
           <el-date-picker
             v-model="Timeform.投标结果公布日期"
             style="width: 200px;"
@@ -352,22 +375,22 @@
             type="date"
             placeholder="请选择结果公布日期"/>
         </el-form-item>
-        <el-form-item label="中标服务费" prop="中标服务费">
-          <el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :step="1" :max="tenderResultMax" style="width: 200px" size="small"/>
+        <el-form-item label="中标服务费(万元)" prop="中标服务费">
+          <el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" :max="tenderResultMax" style="width: 200px" size="small"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOffTime('Timeform')">取消</el-button>
-        <el-button type="primary" @click="submitTime('Timeform')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('Timeform')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="80%">
-      <el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="120px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="400px">
+      <el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="130px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
             <el-form-item label="项目名称" prop="项目名称">
-              <el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 560px" size="small">
+              <el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 200px" size="small">
                 <el-option
                   v-for="item in entryName"
                   :key="item.value"
@@ -378,45 +401,41 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="保证金类型" prop="保证金类型">
-              <el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
-                <el-option
-                  v-for="item in TypeOfGoldDeposit1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="保证金金额(万元)" prop="保证金金额">
+            <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" style="width: 200px" size="small"/>
+          </el-form-item>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="收回条件" prop="收回条件">
-              <el-select v-model="PerformanceBondform.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
-                <el-option
-                  v-for="item in plannedTime"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="截止时间(天)" prop="截止时间">
-              <el-input-number v-model="PerformanceBondform.截止时间" placeholder="请输入截止时间" style="width: 200px" size="small"/>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="保证金类型" prop="保证金类型">
+            <el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
+              <el-option
+                v-for="item in TypeOfGoldDeposit1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="收回条件" prop="收回条件">
+            <el-select v-model="PerformanceBondform.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
+              <el-option
+                v-for="item in plannedTime"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="截止时间(天)" prop="截止时间">
+            <el-input-number v-model="PerformanceBondform.截止时间" placeholder="请输入截止时间" style="width: 200px" size="small"/>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
-        <el-button type="primary" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -430,8 +449,56 @@ export default {
     elInput
   },
   data() {
+    const validateValue = (rule, value, callback) => {
+      console.log(value, 2222)
+      if (value === 0.00) {
+        callback(new Error('金额不能为0'))
+      } else if (value) {
+        // const reg = /^\-\d\.?\d*$/
+        // const boolean = reg.test(value)
+        const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
+        console.log(boolean)
+        if (!boolean) {
+          callback(new Error('请输入正数'))
+          this.form.contractAmount = ''
+        } else {
+          console.log(2222)
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
     return {
-      pickerOptions: {},
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       timetime: '',
       treeData: [7],
       entryName: [],
@@ -462,7 +529,7 @@ export default {
       time: [], // 时间区间
       radio: '',
       tableData1: [],
-      tenderResultMax: null,
+      tenderResultMax: 0,
       PageSize: 30,
       PageCurrent: 1,
       total: null,
@@ -471,6 +538,7 @@ export default {
       ListPeople: [],
       peopleid: '',
       peoplename: '',
+      test: 9.00,
       dialogFormVisible1: false,
       dialogTimeVisible: false,
       form1: {
@@ -507,7 +575,7 @@ export default {
         保证金类型: [{ required: true, message: '请选择保证金类型', trigger: 'change' }],
         收回条件: [{ required: true, message: '请选择收回条件', trigger: 'change' }],
         截止时间: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
-        保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'change' }]
+        保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'change' }, { required: true, trigger: 'change', validator: validateValue }]
       },
       TimeRules: { // 表单验证规则
         投标结果公布日期: [{ required: true, message: '请选择投标结果公布日期', trigger: 'change' }],
@@ -517,10 +585,10 @@ export default {
         招标企业: [{ required: true, message: '请输入招标企业', trigger: 'blur' }],
         联系人: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
         联系电话: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
-        保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }],
+        保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }, { required: true, trigger: 'change', validator: validateValue }],
         保证金类型: [{ required: true, message: '请输入保证金类型', trigger: 'change' }],
         投标人: [{ required: true, message: '请输入投标人', trigger: 'change' }],
-        投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
+        // 投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
         计划收回日期: [{ required: true, message: '请选择计划收回日期', trigger: 'change' }],
         提前X天提醒我: [{ required: true, message: '提前X天提醒我', trigger: 'blur' }]
       }
@@ -565,18 +633,20 @@ export default {
       } else {
         this.TenderingEnterprise_check = 1
       }
-      if (this.startTime === '' || this.startTime == null) {
-        this.startTime_check = 0
-      } else {
-        this.startTime_check = 1
-      }
-      if (this.endTime === '' || this.endTime == null) {
-        this.endTime_check = 0
-      } else {
-        this.endTime_check = 1
-      }
+
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      // if (this.startTime === '' || this.startTime == null) {
+      //   this.startTime_check = 0
+      // } else {
+      //   this.startTime_check = 1
+      // }
+      // if (this.endTime === '' || this.endTime == null) {
+      //   this.endTime_check = 0
+      // } else {
+      //   this.endTime_check = 1
+      // }
       this.tableData1Loading = true
-      selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
+      selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.check1, this.dateRange[0], this.check1, this.dateRange[1], this.PageCurrent, this.PageSize).then(response => {
         this.tableData1Loading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
@@ -731,7 +801,8 @@ export default {
     },
     changeTenderResult(row) {
       this.code = row.招标保证金流水号
-      this.tenderResultMax = row.应收回金额
+      // this.tenderResultMax = Number(row.应收回金额)).toFixed(2)
+      this.tenderResultMax = parseFloat(row.应收回金额)
       if (row.投标结果 === '1') {
         this.radio = '1'
         this.dialogTimeVisible = true
@@ -780,6 +851,24 @@ export default {
 </script>
 
 <style scoped>
-
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 10px 20px 10px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
 
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 68450be3..befa99e8 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -24,58 +24,58 @@
       <el-button type="primary" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" plain @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-card>
-      <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
-      <el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
-      <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
-        <!--<el-table-column label="责权省份" align="center" min-width="80">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.省份 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="姓名" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="联系电话" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.联系电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="生日" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.出生日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="150px" fixed="right">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  size="mini"
-                  type="text"
-                  class="el-icon-edit-outline"
-                  @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  size="mini"
-                  type="text"
-                  style="margin-left: 20px"
-                  class="el-icon-delete"
-                  @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
+      <!--<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>-->
+      <el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">客户</el-button>
+      <!--<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>-->
+      <!--&lt;!&ndash;<el-table-column label="责权省份" align="center" min-width="80">&ndash;&gt;-->
+      <!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
+      <!--&lt;!&ndash;{{ scope.row.省份 }}&ndash;&gt;-->
+      <!--&lt;!&ndash;</template>&ndash;&gt;-->
+      <!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
+      <!--<el-table-column label="姓名" align="center">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.姓名 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="性别" align="center">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.性别 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="联系电话" align="center">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.联系电话 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="生日" align="center">-->
+      <!--<template slot-scope="scope">-->
+      <!--{{ scope.row.出生日期 }}-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="操作" align="center" width="150px" fixed="right">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">-->
+      <!--<div style="display: inline-block">-->
+      <!--<el-button-->
+      <!--size="mini"-->
+      <!--type="text"-->
+      <!--class="el-icon-edit-outline"-->
+      <!--@click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>-->
+      <!--</div>-->
+      <!--</el-tooltip>-->
+      <!--<el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">-->
+      <!--<div style="display: inline-block">-->
+      <!--<el-button-->
+      <!--size="mini"-->
+      <!--type="text"-->
+      <!--style="margin-left: 20px"-->
+      <!--class="el-icon-delete"-->
+      <!--@click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>-->
+      <!--</div>-->
+      <!--</el-tooltip>-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</el-table>-->
     </el-card>
     <el-row>
       <el-col :span="4">
@@ -122,7 +122,7 @@
                 {{ scope.row.电话 }}
               </template>
             </el-table-column>
-            <el-table-column label="开票电话" align="center" min-width="100">
+            <el-table-column label="传真电话" align="center" min-width="100">
               <template slot-scope="scope">
                 {{ scope.row.传真 }}
               </template>
@@ -137,21 +137,21 @@
                 {{ scope.row.电子邮箱 }}
               </template>
             </el-table-column>
-            <el-table-column label="税号" align="center" min-width="120">
-              <template slot-scope="scope">
-                {{ scope.row.税号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.开户行 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="银行账号" align="center" min-width="140">
-              <template slot-scope="scope">
-                {{ scope.row.银行账号 }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column label="税号" align="center" min-width="120">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.税号 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.开户行 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="银行账号" align="center" min-width="140">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.银行账号 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column label="信誉等级" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.价值评估 }}
@@ -290,8 +290,8 @@
             </el-form>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="开票电话:" prop="传真">
-              <el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入开票电话"/>
+            <el-form-item label="传真:" prop="传真">
+              <el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入传真电话"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -304,16 +304,16 @@
               <el-input v-model="form2.电子邮箱" clearable size="small" style="width:200px" placeholder="请输入电子邮箱"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="税号:" prop="税号">
-              <el-input v-model="form2.税号" clearable size="small" style="width:200px" placeholder="请输入税号"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行账号:" prop="银行账号">
-              <el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--<el-form-item label="税号:" prop="税号">-->
+          <!--<el-input v-model="form2.税号" clearable size="small" style="width:200px" placeholder="请输入税号"/>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12">-->
+          <!--<el-form-item label="银行账号:" prop="银行账号">-->
+          <!--<el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="12">
             <el-form-item label="信用等级:" prop="信用等级">
               <el-select v-model="form2.信用等级" placeholder="请选择信誉等级" size="small">
@@ -325,11 +325,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行:" prop="开户行">
-              <el-input v-model="form2.开户行" clearable size="small" style="width:200px" placeholder="请输入开户行"/>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--<el-form-item label="开户行:" prop="开户行">-->
+          <!--<el-input v-model="form2.开户行" clearable size="small" style="width:200px" placeholder="请输入开户行"/>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="12">
             <el-form-item label="备注:" prop="备注">
               <el-input v-model="form2.备注" clearable size="small" style="width:200px" placeholder="请输入备注"/>
@@ -338,8 +338,10 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff2()">取消</el-button>
-        <el-button type="primary" @click="submit2('form2')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff2('form')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
+        <!--<el-button @click="callOff2()">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit2('form2')">确 定</el-button>-->
       </div>
     </el-dialog>
   </div>
@@ -671,6 +673,25 @@ export default {
   .el-input__inner{
     border: 1px solid black!important;
   }
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 30px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
 <style lang="scss">
   .NewlyAdded
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 9bb21cd0..ccd44f38 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -13,58 +13,57 @@
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       </el-row>
     </el-card>
-
     <el-card>
-      <el-col :span="15">
-        <el-table v-loading="listLoading" :data="tableData1" highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
-          <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
+      <el-col :span="17.6">
+        <el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
+          <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.项目名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
+          <el-table-column align="center" label="客户名称" prop="客户名称" width="150" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.客户名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="付款方式" width="80">
+          <el-table-column align="center" label="付款方式" width="77">
             <template slot-scope="scope">
               {{ scope.row.付款方式 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同总额(万元)" width="110">
+          <el-table-column align="center" label="合同总额(万元)" width="124">
             <template slot-scope="scope">
-              {{ scope.row.合同总金额 }}
+              {{ Number(scope.row.合同总金额).toFixed(2) }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="已付金额" width="80">
-            <template slot-scope="scope">
-              {{ Number(scope.row.已支付).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="合同签订日期" width="110">
+          <!--<el-table-column align="center" label="已付(万元)" width="95">-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ Number(scope.row.已支付).toFixed(2) }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <el-table-column align="center" label="签订日期" width="84">
             <template slot-scope="scope">
               {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="发货节点" width="110">
+          <el-table-column align="center" label="发货节点" width="84">
             <template slot-scope="scope">
               {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="销售经理" prop="营销经理" width="100">
+          <el-table-column align="center" label="销售经理" prop="营销经理" width="78">
             <template slot-scope="scope">
               {{ scope.row.营销经理 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
+          <el-table-column align="center" label="合同编号" prop="合同编号" width="117">
             <template slot-scope="scope">
               <template>
                 <span slot="reference" type="mini">{{ scope.row.合同编号 }}</span>
               </template>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同信息备注" width="120">
+          <el-table-column align="center" label="信息备注" width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.合同信息备注 }}
             </template>
@@ -81,19 +80,19 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-col>
-      <el-col :span="9">
-        <el-table :data="tableData2" class="subTableHeader" border style="text-align: center" size="mini">
-          <el-table-column label="设备型号" align="center" width="230" show-overflow-tooltip>
+      <el-col :span="6.3">
+        <el-table :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" class="subTableHeader" border style="text-align: center" size="mini">
+          <el-table-column label="设备型号" align="center" width="90" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="设备名称" align="center" min-width="150" show-overflow-tooltip>
+          <el-table-column label="设备名称" align="center" min-width="90" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="设备状态" align="center" width="100">
+          <el-table-column label="设备状态" align="center" width="80">
             <template slot-scope="scope">
               {{ scope.row.机床状态 }}
             </template>
@@ -914,10 +913,24 @@ export default {
   }
 </style>
 <style lang="scss">
+  /*.subTableHeader {*/
+    /*th {*/
+      /*background: #8ff4ea !important;*/
+      /*color: black;*/
+    /*}*/
+
+    /*tr.el-table__row td {*/
+      /*background-color: #d8e5f6 !important;*/
+    /*}*/
+
+    /*tr.el-table__row.el-table__row--striped td {*/
+      /*background: #e9f0f9 !important;*/
+    /*}*/
+  /*}*/
   .subTableHeader {
     th {
-      background: #8ff4ea !important;
-      color: black;
+      background: #7eaced !important;
+      color: #FFFFFF;
     }
 
     tr.el-table__row td {
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index c2fe528f..0286fa96 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -1,92 +1,118 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px;width: 140px " size="small" clearable>
-        <el-option
-          v-for="item in entryName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 220px " size="small" clearable>
+      <!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px 10px;width: 180px " size="small" clearable>-->
+      <!--<el-option-->
+      <!--v-for="item in entryName"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value"/>-->
+      <!--</el-select>-->
+      <el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
+      <el-select v-show="false" v-model="customerName" filterable placeholder="请输入客户名称" style="margin: 3px;width: 220px " size="small" clearable>
         <el-option
           v-for="item in customerNames"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+      <el-date-picker
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 240px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
       <!--<el-badge :value="value" :max="99" class="item">-->
       <!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
       <!--</el-badge>-->
     </el-card>
     <el-card>
-      <el-col :span="14">
+      <el-col :span="17">
         <el-table
           v-loading="listLoading"
           :row-key="getRowKeys"
           :expand-row-keys="expands"
+          :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
           :data="tableData1"
-          style="width: 100%;"
+          style="width: 970px;"
           height="600px"
           highlight-current-row
           border
           stripe
           size="mini"
-          @expand-change="selectMachine"
+          @sort-change="sortChange"
           @row-click="getTableData2">
-          <el-table-column type="expand" label="详情">
-            <template slot-scope="scope">
-              <el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
-                <el-table-column label="发货单号" align="center" >
-                  <template slot-scope="scope">
-                    {{ scope.row.发货单号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="发货日期" align="center">
-                  <template slot-scope="scope">
-                    {{ scope.row.发货日期 }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="运输状态" align="center">
-                  <template slot-scope="scope">
-                    {{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
-                  </template>
-                </el-table-column>
-              </el-table>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
+          <!--@expand-change="selectMachine"-->
+          <!--<el-table-column type="expand" label="详情" width="50">-->
+          <!--<template slot-scope="scope">-->
+          <!--<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">-->
+          <!--<el-table-column label="发货单号" align="center" >-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.发货单号 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="发货日期" align="center">-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.发货日期 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="运输状态" align="center">-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--</el-table>-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <el-table-column align="center" label="合同编号" prop="合同编号" sortable="custom" width="118">
             <template slot-scope="scope">
               {{ scope.row.合同编号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
+          <el-table-column align="center" label="项目名称" prop="项目名称" width="118" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.项目名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="客户名称" prop="客户名称" min-width="160" show-overflow-tooltip>
+          <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.客户名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="付款方式" width="80">
+          <el-table-column align="center" label="付款方式" width="78">
             <template slot-scope="scope">
               {{ scope.row.付款方式 }}
             </template>
           </el-table-column>
-          <el-table-column align="right" label="合同总额（万元）" width="130">
+          <el-table-column align="right" label="合同金额(万元)" prop="合同总金额" width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ Number(scope.row.合同总金额).toFixed(2) }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="销售经理" prop="姓名" width="100">
+          <el-table-column align="right" label="已收(万元)" prop="已支付" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ Number(scope.row.已收金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="未收(万元)" prop="未支付金额" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ Number(scope.row.未收金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="营销经理" prop="姓名" width="80">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="70" fixed="right">
+          <el-table-column label="操作" align="center" width="66">
             <template slot-scope="scope">
               <el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click.stop="addMoney(scope.row)">收款</el-button>
             </template>
@@ -137,11 +163,13 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-col>
-      <el-col :span="10">
+      <el-col :span="7">
         <el-table
           :data="tableData2"
-          style="width: 500px;max-height: 440px;text-align: center"
+          :summary-method="getSummaries1"
+          style="width: 395px;max-height: 440px;text-align: center"
           highlight-current-row
+          show-summary
           border
           size="mini">
           <el-table-column
@@ -149,25 +177,25 @@
             label="序号"
             type="index"
             width="70"/>
-          <el-table-column align="right" label="收款金额" width="125">
+          <el-table-column align="right" label="收款金额(万元)" width="120" prop="收款金额">
             <template slot-scope="scope">
               <template v-if="scope.row.edit">
-                <el-input-number v-model="scope.row.收款金额" :min="0" :step="1" style="width:100px" clearable size="mini"/>
+                <el-input v-model="scope.row.收款金额" :min="0" style="width:100px" clearable size="mini"/>
               </template>
               <span v-else>{{ Number(scope.row.收款金额).toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="收款时间" align="center" width="150px">
+          <el-table-column label="收款时间" align="center" width="85" prop="收款时间">
             <template slot-scope="scope">
               {{ scope.row.收款时间 ? scope.row.收款时间.split(' ')[0] : '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" width="150">
+          <el-table-column align="center" label="操作" width="100">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="updateMoney(scope.row)">确定</el-button>
+              <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="updateMoney(scope.row, scope.$index)">确定</el-button>
               <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
-              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleteMoney(scope.row)">删除</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleteMoney(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -186,9 +214,37 @@ export default {
   },
   data() {
     return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       customerNames: [],
       customerName: '',
-      pickerOptions: {},
       timetime: '',
       name: '',
       moneyValue: '',
@@ -247,6 +303,82 @@ export default {
     this.getCustomerName()
   },
   methods: {
+    // 2020 02 20 刘路加新增怕徐
+    sortChange(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '合同编号') {
+        this.ordername = 1
+      } else if (column.prop === '合同总金额') {
+        this.ordername = 2
+      } else if (column.prop === '已支付') {
+        this.ordername = 3
+      } else if (column.prop === '未支付金额') {
+        this.ordername = 4
+      } else {
+        this.ordername = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.getTableData()
+    },
+    // 2020 02 18 刘路加新增合计
+    getSummaries1: function(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        } else if (index === 1) {
+          const values = data.map(item => Number(parseFloat(item['收款金额'])))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = '0'
+          }
+        }
+      })
+      return sums
+    },
+    // getSummaries1(param) { // 合计
+    //   console.log(param)
+    //   const { columns, data } = param
+    //   const sums = []
+    //   columns.forEach((column, index) => {
+    //     if (index === 0) {
+    //       sums[index] = '合计'
+    //     } else if (index === 1) {
+    //       const values = data.map(item => {
+    //         console.log(item, 2222)
+    //         Number(parseFloat(item['收款金额']))
+    //       })
+    //       if (!values.every(value => isNaN(value))) {
+    //         sums[index] = values.reduce((prev, curr) => {
+    //           const value = Number(curr)
+    //           if (!isNaN(value)) {
+    //             return prev + curr
+    //           } else {
+    //             return prev
+    //           }
+    //         }, 0)
+    //         sums[index] = sums[index].toFixed(2) + ' 元'
+    //       } else {
+    //         sums[index] = 'N/A'
+    //       }
+    //     }
+    //   })
+    // },
     searchName() { // 模糊查询姓名
       SelectMarketingManager(this.name).then(response => {
         this.dataPeople = response.data
@@ -279,14 +411,18 @@ export default {
         this.value = response.data.length
       })
     },
-    updateMoney(row) {
+    updateMoney(row, index) {
       row.edit = false
       updateMoney(row.资金明细ID, row.收款金额).then(response => {
         if (response.data[0].result !== '0') {
           this.$message.success('编辑成功')
         } else {
           this.$message.error('编辑失败')
+          this.tableData2[index].收款金额 = 0
         }
+      }).then(() => {
+        console.log(111111111)
+        this.getTableData()
       })
     },
     addMoney(row) {
@@ -331,6 +467,7 @@ export default {
               })
             }
           })
+          this.getTableData()
         } else {
           this.$message.error('删除失败')
         }
@@ -378,7 +515,8 @@ export default {
     },
     getTableData() {
       this.listLoading = true
-      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName).then(response => {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName, this.check1, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(response => {
         this.listLoading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
@@ -396,6 +534,7 @@ export default {
       this.tableData2 = []
       this.moneyID = row.资金id
       searchTable2(this.moneyID).then(response => {
+        console.log(response.data)
         for (let i = 0; i < response.data.length; i++) {
           this.tableData2.push({
             收款金额: response.data[i].金额,
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index e07d83b3..9afa2edf 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -2,16 +2,32 @@
   <div class="app-container">
     <el-card>
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
+        <!--<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px 0 0px;">-->
+        <!--<el-option-->
+        <!--v-for="item in entryName"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <el-input v-model="customerName1" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
+        <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()" >查询</el-button>
-        <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
+        <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >合同</el-button>
+        <el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出营销合同" placement="top">
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
+        </el-tooltip>
       </div>
     </el-card>
     <el-card>
@@ -20,19 +36,20 @@
         :data="tableData1"
         :row-key="getRowKeys"
         :expand-row-keys="expands"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
         highlight-current-row
-        style="width: 100%;margin: 3px 0px"
+        style="margin: 3px 0px;width: 1208px"
         height="700"
         border
         stripe
         size="mini"
         @row-click="fetchExecutionProgressdata"
         @expand-change="selectMachine">
-        <el-table-column type="expand" label="详情" width="60">
+        <el-table-column type="expand" label="详情" width="50">
           <template slot-scope="scope">
             <el-table :data="tableData2" class="subTableHeader" size="mini" border style="width: 482px; text-align: center">
-              <el-table-column label="机床名称" align="center" width="140">
-                <template slot-scope="机床图号">
+              <el-table-column label="机床型号" align="center" width="140">
+                <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
@@ -72,22 +89,22 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="118">
           <template slot-scope="scope">
             {{ scope.row.合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="140" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="139" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="合同总额(万元)" prop="合同总额" width="140" show-overflow-tooltip>
+        <el-table-column align="right" label="合同金额(万元)" prop="合同总额" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ Number(scope.row.合同总金额).toFixed(2) }}
           </template>
@@ -97,17 +114,17 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="签订日期" width="100">
+        <el-table-column align="center" label="签订日期" width="90">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" width="85">
+        <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="85">
+        <el-table-column align="center" label="发货节点" width="80">
           <template slot-scope="scope">
             {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
@@ -117,7 +134,7 @@
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column label="操作" align="center" width="130">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -130,7 +147,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-edit-outline"
-                  style="margin-left: 20px"
+                  style="margin-left: 10px"
                   @click.stop="handleEdit(scope.row)"/>
               </div>
             </el-tooltip>
@@ -140,7 +157,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
-                  style="margin-left: 20px"
+                  style="margin-left: 10px"
                   @click.stop="handleDelete(scope.row)"/>
               </div>
             </el-tooltip>
@@ -191,27 +208,27 @@
       </div>
     </el-card>
     <!--新增合同信息对话框-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px; " width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="项目名称" prop="EntryName">
-              <el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:200px"/>
+          <el-col :span="12" style="height: 2px">
+            <el-form-item label="项目名称" prop="EntryName" style="">
+              <el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:180px"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="投标保证金" prop="">
-              <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
+              <el-input v-model="form.bidding" readonly clearable size="small" style="width:180px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同总额" prop="contractAmount">
-              <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
+              <el-input v-model="form.contractAmount" clearable size="small" style="width:180px" placeholder="请输入合同金额" @change="fun()"/>
             </el-form-item>
           </el-col>
           <el-col v-show="false" :span="12" >
             <el-form-item label="已完成进度" prop="executionProgressID">
-              <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
+              <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 180px">
                 <el-option
                   v-for="item in executionProgress"
                   :key="item.value"
@@ -222,7 +239,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="营销经理" prop="MarketingManagerValue">
-              <el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
+              <el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:180px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -232,7 +249,8 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
-                placeholder="请选择图纸会签节点"/>
+                style="width: 180px"
+                placeholder="合同签订日期"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -242,6 +260,7 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
+                style="width: 180px"
                 placeholder="请选择图纸会签节点"/>
             </el-form-item>
           </el-col>
@@ -252,6 +271,7 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
+                style="width: 180px"
                 placeholder="请选择设备预验收节点"/>
             </el-form-item>
           </el-col>
@@ -262,6 +282,7 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
+                style="width: 180px;"
                 placeholder="请选择发货节点"/>
             </el-form-item>
           </el-col>
@@ -272,17 +293,18 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
+                style="width: 180px"
                 placeholder="请选择安装调试节点"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
+              <el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:180px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式" prop="付款方式">
-              <el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 200px">
+              <el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 180px">
                 <el-option
                   v-for="item in money"
                   :key="item.value"
@@ -295,7 +317,7 @@
             <el-form-item label="备注" prop="remark">
               <el-input
                 v-model="form.remark"
-                style="width: 200px"
+                style="width: 180px"
                 type="textarea"
                 autosize
                 placeholder="请输入项目介绍"/>
@@ -304,22 +326,21 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
       </div>
     </el-dialog>
-
     <!--新增机床对话框-->
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
-        <el-form-item label="设备型号" prop="设备型号">
-          <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="300px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
+        <el-form-item label="机床型号" prop="设备型号">
+          <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:130px"/>
         </el-form-item>
-        <el-form-item label="设备名称" prop="设备名称">
-          <el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
+        <el-form-item label="机床名称" prop="设备名称">
+          <el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:130px"/>
         </el-form-item>
         <el-form-item label="机床数量" prop="机床数量">
-          <el-input-number :min="1" v-model="form1.机床数量" controls-position="right" style="width:200px" size="small"/>
+          <el-input-number :min="1" v-model="form1.机床数量" controls-position="right" style="width:130px" size="small"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -329,16 +350,16 @@
     </el-dialog>
 
     <!--营销经理选择-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
-      <div style="margin-top: 15px;">
-        <el-table :data="tableData4" border style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="300px">
+      <div style="margin-top: 0px;width: 250px">
+        <el-table :data="tableData4" border style="width: 120px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
           <el-table-column label="部门" align="center" >
             <template slot-scope="scope">
               {{ scope.row.部门名称 }}
             </template>
           </el-table-column>
         </el-table>
-        <el-table :data="tableData3" border stripe style="width: 200px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
+        <el-table :data="tableData3" border stripe style="width: 120px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -346,17 +367,18 @@
           </el-table-column>
         </el-table>
       </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="offName">取消</el-button>
-        <el-button type="primary" @click="getName">确认</el-button>
+      <div slot="footer" class="dialog-footer" style="margin-top: 20px">
+        <el-button size="small" icon="el-icon-circle-close" @click="offName()">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName()">确认</el-button>
+        <!--<el-button @click="offName">取消</el-button>-->
+        <!--<el-button type="primary" @click="getName">确认</el-button>-->
       </div>
     </el-dialog>
 
     <!--投标保证金选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
-      <span>招标企业：</span>
-      <el-input v-model="enterprise" size="small" style="width:200px" clearable/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
+      <el-input v-model="enterprise" size="small" style="width:200px" placeholder="招标企业" clearable/>
+      <el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
       <div style="margin-top: 15px">
         <el-table
           :data="tableDataBidding"
@@ -364,40 +386,40 @@
           style="width: 100%"
           height="400"
           border
-          stripe
-          size="mini"
+          stripei
+          size="m9ini"
           @row-click="biddingNum">
-          <el-table-column align="center" label="招标企业" width="300">
+          <el-table-column align="center" label="招标企业" width="220">
             <template slot-scope="scope">
               {{ scope.row.招标企业 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="联系人" width="100">
+          <el-table-column align="center" label="联系人" width="64" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.联系人 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="联系电话" width="120">
+          <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.联系电话 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="保证金金额" width="100">
+          <el-table-column align="center" label="保证金金额(万元)" width="95">
             <template slot-scope="scope">
-              {{ scope.row.保证金金额 }}
+              {{ Number(scope.row.保证金金额).toFixed(2) }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="投标人" width="100">
+          <el-table-column align="center" label="投标人" width="64" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.投标人 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="保金类型" width="150">
+          <el-table-column align="center" label="保金类型" width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.保证金类型 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="投标日期" width="150">
+          <el-table-column align="center" label="投标日期" width="85">
             <template slot-scope="scope">
               {{ scope.row.投标日期 }}
             </template>
@@ -410,15 +432,15 @@
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="offBidding">取消</el-button>
-        <el-button type="primary" @click="getBidding">确认</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="offBidding()">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getBidding">确认</el-button>
       </div>
     </el-dialog>
 
     <!--客户选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="400px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
+      <el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
         <el-table-column label="客户名称" align="center" >
           <template slot-scope="scope">
@@ -427,8 +449,8 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="offCustomerChange">取消</el-button>
-        <el-button type="primary" @click="getCustomerCode">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="offCustomerChange('form')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getCustomerCode('form')">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -446,8 +468,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOffTime('form2')">取消</el-button>
-        <el-button type="primary" @click="submitTime('form2')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form2')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form2')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -462,7 +484,55 @@ export default {
     elInput
   },
   data() {
+    const validateValue = (rule, value, callback) => {
+      if (value === 0) {
+        callback(new Error('金额不能为0'))
+      } else if (value) {
+        // const reg = /^\-\d\.?\d*$/
+        // const boolean = reg.test(value)
+        const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
+        console.log(boolean)
+        if (!boolean) {
+          callback(new Error('请输入正数'))
+          this.form.contractAmount = ''
+        } else {
+          console.log(2222)
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
     return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       isTrue: true,
       customerName1: '',
       customerName1_check: '',
@@ -575,11 +645,14 @@ export default {
       temp: '', // 增加或修改的标志位
       rules: { // 表单验证规则
         EntryName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+        customerName: [{ required: true, message: '请选择客户名称', trigger: 'change' }],
         MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
         executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
         contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
         付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
-        contractAmount: [{ required: true, message: '请输入合同总额', trigger: 'blur' }]
+        contractAmount: [
+          { required: true, message: '请输入合同总额', trigger: 'change' },
+          { required: true, trigger: 'blur', validator: validateValue }]
       },
       rules1: { // 表单验证规则
         设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
@@ -596,6 +669,11 @@ export default {
     this.fetchCustomerData()
   },
   methods: {
+    // 2020 02 18  刘路加 增加
+    fun() {
+      this.form.contractAmount = Number(this.form.contractAmount).toFixed(2)
+    },
+
     searchName() { // 模糊查询姓名
       this.tableData3 = []
       SelectMarketingManager().then(response => {
@@ -667,6 +745,7 @@ export default {
       if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
@@ -674,7 +753,33 @@ export default {
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
+    },
+    exportExcel() {
+      if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
+      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
+      if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
+      this.ExecutionProgressShow = false
+      this.uploader = false
+      this.ExecutionProgress = null
+      this.listLoading = true
+      var param = []
+      param[0] = ['项目流水号_check', this.entryNameValue_check]
+      param[1] = ['合同ID', this.entryNameValue]
+      param[2] = ['客户名称_check', this.customerName1_check]
+      param[3] = ['客户名称', this.customerName1]
+      param[4] = ['开始日期_check', this.check1]
+      param[5] = ['开始日期', this.dateRange[0]]
+      param[6] = ['结束日期_check', this.check1]
+      param[7] = ['结束日期', this.dateRange[1]]
+      param[8] = ['营销经理流水号_check', 0]
+      param[9] = ['机床型号_check', 0]
+      var Data = this.CreateData('2001', '报表_营销合同查询', param)
+      this.exportExcel_NPOI(Data)
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号
@@ -733,6 +838,7 @@ export default {
       })
     },
     selectMachine(row) {
+      console.log(row.项目流水号)
       if (this.a === 1) {
         this.expands.push(row.项目流水号)
         this.b = row.项目流水号
@@ -803,6 +909,7 @@ export default {
         })
       })
       selectMachine(row.项目流水号).then(response => {
+        console.log(response)
         this.tableData2 = response.data
       })
     },
@@ -859,6 +966,7 @@ export default {
     // 提交添加或者修改
     submit(formName) {
       this.$refs[formName].validate((valid) => {
+        console.log(valid, 111111)
         if (valid) {
           if (this.temp === 1) {
             this.addTableData1()
@@ -1105,7 +1213,7 @@ export default {
     },
     biddingNum(row) {
       this.biddingNumber = parseInt(row.招标保证金流水号)
-      this.enterpriseInput = row.招标企业
+      this.enterpriseInput = Number(row.保证金金额).toFixed(2)
     },
     clearBidding() {
       this.biddingNumber = ''
@@ -1244,11 +1352,36 @@ a{
   display: inline-block;
   color: #999;
 }
-.el-table td, .el-table th.is-leaf,
-.el-radio__inner,
-.el-input__inner{
-  border: 1px solid black!important;
-}
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 30px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
+  /*>>>.el-dialog, .el-pager li {*/
+    /*background: red;*/
+    /*opacity: 0.9;*/
+    /*-webkit-box-sizing: border-box;*/
+  /*}*/
+/*.el-table td, .el-table th.is-leaf,*/
+/*.el-radio__inner,*/
+/*.el-input__inner{*/
+  /*border: 1px solid black!important;*/
+/*}*/
+
 </style>
 <style lang="scss">
 
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 10fd5b58..4fc4db67 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -3,106 +3,190 @@
     <!--查询条件-->
     <el-card>
       <el-row>
-        <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>
-        <el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请输入客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
+        <!--<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>-->
+        <el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 220px" placeholder="输入合同项目名称或客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
+        <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-button
           type="distribution"
           size="small"
           icon="el-icon-circle-plus-outline"
-          @click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
+          @click.stop="openAddInvoiceRecordingDialog(); flag = 1">开票</el-button>
       </el-row>
     </el-card>
     <!--项目表格-->
     <el-card>
-      <el-table
-        v-loading="listLoading1"
-        :data="tableData1"
-        highlight-current-row
-        style="width: 1360px;margin-top: 3px"
-        height="550"
-        border
-        stripe
-        size="mini"
-        @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
-          <template slot-scope="scope">
-            <!--            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>-->
-            {{ scope.row.合同编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="付款方式" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.付款方式 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同总金额（含税）" width="130">
-          <template slot-scope="scope">
-            <span v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
-            <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="已到账金额" width="120">
-          <template slot-scope="scope">
-            <span v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
-            <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.合同信息备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="销售经理" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票详情" fixed="right" align="center" width="130px">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-circle-plus-outline"
-              @click.stop="opendialogFormVisibleRecordDialog(scope.row)">开票详情</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="PageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          style="margin: 3px"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
+      <el-col :span="15">
+        <el-table
+          v-loading="listLoading1"
+          :data="tableData1"
+          highlight-current-row
+          style="width: 900px;margin-top: 3px"
+          height="610"
+          border
+          stripe
+          size="mini"
+          @row-click="fetchTableData2">
+          <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
+            <template slot-scope="scope">
+              <!--            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>-->
+              {{ scope.row.合同编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="项目名称" prop="项目名称" width="110" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.项目名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
+            <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-column align="center" label="合同金额(万元)" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
+              <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="开票总额(万元)" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.开票总金额===''||scope.row.开票总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
+              <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.开票总金额).toFixed(2) }} </span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="到账金额(万元)" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.已收金额===''||scope.row.已收金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
+              <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已收金额).toFixed(2) }} </span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="签订日期" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.合同签订日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="销售经理" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合同信息备注" width="150" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.合同信息备注 }}
+            </template>
+          </el-table-column>
+          <!--<el-table-column label="开票详情" fixed="right" align="center" width="90px">-->
+          <!--<template slot-scope="scope">-->
+          <!--<el-button-->
+          <!--size="mini"-->
+          <!--type="text"-->
+          <!--icon="el-icon-search"-->
+          <!--@click.stop="opendialogFormVisibleRecordDialog(scope.row)">详情</el-button>-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+        </el-table>
+        <div class="block">
+          <el-pagination
+            :current-page="PageCurrent"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="PageSize"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper"
+            style="margin: 3px"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-col>
+      <el-col :span="9">
+        <el-table
+          v-loading="listLoading2"
+          :data="tableData2"
+          :summary-method="getSummaries"
+          show-summary
+          style="width: 600px;margin-top: 3px;margin-left: 6px"
+          height="300"
+          highlight-current-row
+          border
+          stripe
+          size="mini">
+          <el-table-column
+            align="center"
+            label="序号"
+            type="index"
+            width="50"/>
+          <!--<el-table-column align="center" label="发票抬头" width="180" show-overflow-tooltip>-->
+          <!--<template slot-scope="scope">-->
+          <!--{{ scope.row.客户名称 }}-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <el-table-column align="center" label="开票金额(万元)" width="130" prop="开票金额">
+            <template slot-scope="scope">
+              {{ Number(scope.row.开票金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="开票时间" width="90">
+            <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 label="操作" align="center" width="70">
+            <template slot-scope="scope">
+              <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+                <div style="display: inline-block">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    style="margin-left: 0px"
+                    icon="el-icon-edit-outline"
+                    @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>
+                </div>
+              </el-tooltip>
+              <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
+                <div style="display: inline-block">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    style="margin-left: 8px"
+                    icon="el-icon-delete"
+                    @click.stop="delInvoiceRecordingDialog(scope.row)"/>
+                </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
     </el-card>
     <!--    开票详情-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="800px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="600px">
       <el-table
         v-loading="listLoading2"
         :data="tableData2"
@@ -119,17 +203,17 @@
           label="序号"
           type="index"
           width="50"/>
-        <el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票金额（含税）" width="120">
+        <!--<el-table-column align="center" label="发票抬头" width="180" show-overflow-tooltip>-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.客户名称 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column align="center" label="开票金额(万元)" width="130">
           <template slot-scope="scope">
             {{ Number(scope.row.开票金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="开票时间" width="100">
+        <el-table-column align="center" label="开票时间" width="90">
           <template slot-scope="scope">
             {{ scope.row.开票时间 }}
           </template>
@@ -139,13 +223,14 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="130">
+        <el-table-column label="操作" align="center" width="70">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
                   size="mini"
                   type="text"
+                  style="margin-left: 0px"
                   icon="el-icon-edit-outline"
                   @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>
               </div>
@@ -155,7 +240,7 @@
                 <el-button
                   size="mini"
                   type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                   icon="el-icon-delete"
                   @click.stop="delInvoiceRecordingDialog(scope.row)"/>
               </div>
@@ -189,41 +274,36 @@
       </div>
     </el-dialog>
     <!--增加开票记录-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="750px">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="客户名称" prop="客户名称">
-              <el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票金额" prop="开票金额">
-              <el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票时间" prop="开票时间">
-              <el-date-picker
-                v-model="form.开票时间"
-                :picker-options="pickerOptions"
-                style="width: 200px;"
-                value-format="yyyy-MM-dd"
-                size="small"
-                type="date"
-                placeholder="请选择开票时间"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="备注">
-              <el-input v-model="form.备注" clearable size="small" placeholder="请输入备注" style="width:200px"/>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="客户名称" prop="客户名称">
+            <el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
+          </el-form-item>
+
+          <el-form-item label="开票金额(万元)" prop="开票金额">
+            <el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
+          </el-form-item>
+          <el-form-item label="开票时间" prop="开票时间">
+            <el-date-picker
+              v-model="form.开票时间"
+              :picker-options="pickerOptions"
+              style="width: 200px;"
+              value-format="yyyy-MM-dd"
+              size="small"
+              type="date"
+              placeholder="请选择开票时间"/>
+          </el-form-item>
+          <el-form-item label="备注" prop="备注">
+            <el-input v-model="form.备注" clearable size="small" placeholder="请输入备注" style="width:200px"/>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible1 = false">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确 定</el-button>
+        <!--<el-button @click="dialogFormVisible1 = false">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit('form')">确 定</el-button>-->
+        <el-button size="small" icon="el-icon-circle-close" @click="dialogFormVisible1 = false">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
       </div>
     </el-dialog>
     <!--客户选择-->
@@ -277,9 +357,56 @@ export default {
     elInput
   },
   data() {
+    const validateValue = (rule, value, callback) => {
+      if (value === 0) {
+        callback(new Error('金额不能为0'))
+      } else if (value) {
+        // const reg = /^\-\d\.?\d*$/
+        // const boolean = reg.test(value)
+        const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
+        console.log(boolean)
+        if (!boolean) {
+          callback(new Error('请输入正数'))
+          this.form.contractAmount = ''
+        } else {
+          console.log(2222)
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
     return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       row1: [],
-      pickerOptions: {},
       timetime: '',
       name: '',
       projectid: '', // 项目流水号
@@ -335,7 +462,7 @@ export default {
       },
       rules: {
         客户名称: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }],
-        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
+        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }, { required: true, trigger: 'blur', validator: validateValue }],
         开票时间: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }]
       }
     }
@@ -379,10 +506,11 @@ export default {
       if (this.customerName === '' || this.customerName === null) { this.customerName_check = 0 } else { this.customerName_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
-      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
-      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      this.dateRange ? (this.startTime_check = 1, this.endTime_check = 0) : (this.startTime_check = 0, this.endTime_check = 0, this.dateRange = '')
+      // if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      // if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       this.listLoading1 = true
-      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName, this.customerName_check).then(response => {
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.dateRange[0], this.dateRange[1], this.customerName, this.customerName_check).then(response => {
         this.listLoading1 = false
         const data = response.data
         for (let i = 0; i < data.rows.length; i++) {
@@ -421,41 +549,67 @@ export default {
       })
     },
     // 开票记录合计
-    getSummaries(param) {
+    getSummaries: function(param) {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
-        if (index === 6) {
-          sums[index] = '项目开票合计：'
+        if (index === 0) {
+          sums[index] = '合计'
           return
-        } else if (index === 7) {
-          const values = data.map(item => Number(item['开票金额']))
+        } else if (index === 1) {
+          const values = data.map(item => Number(parseFloat(item['开票金额'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
-                return Number(prev) + Number(curr)
+                return prev + curr
               } else {
-                return Number(prev)
+                return prev
               }
             }, 0)
-            sums[index] += ' 万元(含税)'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
-            sums[index] = 'N/A'
+            sums[index] = '0'
           }
-        } else if (index === 8) {
-          sums[index] = this.taxRate * 100 + '% (税率)'
-          return
-        } else if (index === 9) {
-          sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
-          return
-        } else if (index === 10) {
-          sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
-          return
         }
       })
       return sums
     },
+    // getSummaries(param) {
+    //   const { columns, data } = param
+    //   const sums = []
+    //   columns.forEach((column, index) => {
+    //     if (index === 6) {
+    //       sums[index] = '项目开票合计：'
+    //       return
+    //     } else if (index === 7) {
+    //       const values = data.map(item => Number(item['开票金额']))
+    //       if (!values.every(value => isNaN(value))) {
+    //         sums[index] = values.reduce((prev, curr) => {
+    //           const value = Number(curr)
+    //           if (!isNaN(value)) {
+    //             return Number(prev) + Number(curr)
+    //           } else {
+    //             return Number(prev)
+    //           }
+    //         }, 0)
+    //         sums[index] += ' 万元(含税)'
+    //       } else {
+    //         sums[index] = 'N/A'
+    //       }
+    //     } else if (index === 8) {
+    //       sums[index] = this.taxRate * 100 + '% (税率)'
+    //       return
+    //     } else if (index === 9) {
+    //       sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
+    //       return
+    //     } else if (index === 10) {
+    //       sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
+    //       return
+    //     }
+    //   })
+    //   return sums
+    // },
     // 双击解锁选定行的税率编辑
     unlockEditor(row) {
       row.是是否禁用税率编辑 = false
@@ -573,6 +727,7 @@ export default {
           }
         }
       })
+      this.fetchTableData1()
     },
     // 增加开票记录
     addSubmit() {
@@ -591,6 +746,7 @@ export default {
           this.$message.error('数据占用')
         }
       })
+      this.fetchTableData1()
     },
     openEditInvoiceRecordingDialog(row) {
       this.editForm(row, 'form')
@@ -628,6 +784,7 @@ export default {
     },
     delInvoiceRecordingDialog(row) {
       function a() {
+        this.fetchTableData1()
         searchTableData2(this.projectid).then(response => {
           const data = response.data
           for (let i = 0; i < data.length; i++) {
@@ -642,11 +799,30 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style scoped>
   /*.tableInput{*/
   /*  .el-textarea__inner, .el-radio__inner, .el-input__inner{*/
   /*    border: 1px solid #F56C6C !important*/
   /*  }*/
   /*}*/
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 30px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
 
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index df38300d..f8ca6426 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -1,15 +1,27 @@
 <template>
   <div>
     <el-card>
-      <span>项目名称：</span>
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
-        <el-option
-          v-for="item in entryName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
+      <!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>-->
+      <!--<el-option-->
+      <!--v-for="item in entryName"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value"/>-->
+      <!--</el-select>-->
+      <el-input v-model="customerName" clearable size="small" style="width:220px;margin: 3px 0" placeholder="请输入客户名称或项目名称"/>
+      <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+      <el-date-picker
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 240px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <!--      <span style="margin-left: 10px">开始日期：</span>-->
       <!--      <el-date-picker-->
       <!--        v-model="startTime"-->
@@ -50,12 +62,12 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已完成进度" width="100">
+        <el-table-column align="center" label="进程" width="100">
           <template slot-scope="scope">
             {{ scope.row.执行进度名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="签订日期" width="86">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
@@ -265,8 +277,8 @@
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="105px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 150px" size="small"/>
+            <el-form-item label="保证金(万元)" prop="保证金金额">
+              <el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -295,14 +307,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="截止时间(天)" prop="截止时间">
-              <el-input-number v-model="form2.截止时间" placeholder="请输入截止时间" style="width: 150px" size="small"/>
+              <el-input-number v-model="form2.截止时间" :min="0" placeholder="请输入截止时间" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOffPerformanceBondDialog('form2')">取消</el-button>
-        <el-button type="primary" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -326,6 +338,35 @@ export default {
       }
     }
     return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       upload3: upload3,
       title1: '', //   履约保证金新增或编辑对话框
       entryNameValue: '', // 查询条件_项目名称
@@ -410,8 +451,10 @@ export default {
       } else {
         this.customerName_check = 1
       }
+      // llj新增
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       this.listLoading1 = true
-      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.customerName_check, this.customerName).then(response => {
         this.tableData2 = []
         this.listLoading1 = false
         const data = response.data
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index 74010c68..ff998d38 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -2,7 +2,6 @@
   <div class="app-container">
     <!--顶栏结构-->
     <el-card>
-      <span>项目名称：</span>
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">
         <el-option
           v-for="item in entryName"
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index a46bf1f0..5142aa31 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -1,23 +1,15 @@
 <template>
   <div class="app-container">
-
     <el-card>
       <span>厂家名称:</span>
       <el-input v-model="ManufacturerName" clearable size="small" style="width:200px" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
-      <!--<span>电话:</span>-->
-      <!--<el-input v-model="phNumber" size="small" clearable style="width:200px"/>-->
-      <!--<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>-->
       <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
         <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
       </el-tooltip>
     </el-card>
     <el-card>
       <el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
-        <el-table-column
-          label=" "
-          align="center"
-          type="index"
-          width="50"/>
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="外协厂家名称" align="center" width="280px">
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 5d6d52f5..b637e299 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -1,13 +1,12 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <el-col style="width: auto">
+    <el-card style="width: 1050px">
+      <el-row style="width: 1020px">
         <el-row>
-          <span>外协厂家:</span>
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
-          <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=50;getParts()">查询</el-button>
+          <el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="pageCurrent=1;pageSize=50;getParts()">查询</el-button>
         </el-row>
-        <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+        <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
             <template slot-scope="scope">
               {{ scope.row.外协厂家名称 }}
@@ -45,13 +44,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
         </div>
-      </el-col>
-      <el-col style="width: auto">
+      </el-row>
+      <el-col style="width: 600px">
         <el-row>
           <span style="margin-top: 10px">开票明细:</span>
           <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">新增</el-button>
         </el-row>
-        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中">
           <el-table-column label="发票号" prop="发票号" align="center" width="180px">
             <template slot-scope="scope">
               {{ scope.row.发票号 }}
@@ -86,12 +85,12 @@
             @current-change="handleCurrentChange2"/>
         </div>
       </el-col>
-      <el-col style="width: auto">
+      <el-col style="width: 420px">
         <el-row>
           <span style="margin-top: 10px">付款明细:</span>
           <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd2('form2')">新增</el-button>
         </el-row>
-        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中">
           <el-table-column label="付款金额(元)" prop="付款金额" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.付款金额 }}
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index d5329d35..5482254d 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -1,25 +1,11 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>零件号:</span>
-      <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
-      <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="getList()">查询</el-button>
+      <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:160px"/>
+      <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
       <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
-      <el-table
-        v-loading="loading1"
-        ref="multipleTable"
-        :data="List1"
-        border
-        size="mini"
-        stripe
-        highlight-current-row
-        height="350"
-        tooltip-effect="dark"
-        style="width: 100%;margin-top: 20px"
-        @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"/>
+      <el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 20px" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"/>
         <el-table-column label="项目名称" prop="项目名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -40,36 +26,6 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="材料费" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.材料费 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="分类" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.外协分类 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="投产" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.传递时间_短 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="计划结束" align="center" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.计划结束时间_短 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="预算" align="center" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ (scope.row.外协预算总价格).toFixed(2) }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="零件类型" align="center" width="">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.是否临时件 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="外协工序" align="center" show-overflow-tooltip min-width="150px">
           <template slot-scope="scope">
             {{ scope.row.外协工序 }}
@@ -83,7 +39,7 @@
         <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
         <el-checkbox v-model="isChecked" size="small" label="历史"/>
         <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:1px" @click="handleAdd()">新增</el-button>
-        <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
+        <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
             <template slot-scope="scope">
               {{ scope.row.表单号 }}
@@ -127,143 +83,43 @@
         <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
-              {{ 零件图号[scope.$index] }}
+              {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
           <el-table-column label="零件名称" align="center" min-width="120px">
             <template slot-scope="scope">
-              {{ 零件名称[scope.$index] }}
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协工序" align="center" min-width="120px">
+            <template slot-scope="scope">
+              {{ scope.row.外协工序 }}
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center" width="60px">
             <template slot-scope="scope">
-              {{ 批次数量[scope.$index] }}
+              {{ scope.row.批次数量 }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="预算(加工)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 外协预算总价格[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="外协价格" align="center" width="130px">
             <template slot-scope="scope">
-              <el-input v-model="加工价格_成交[scope.$index]" size="small"/>
+              <el-input v-model="scope.row.加工价格_成交" size="small"/>
             </template>
           </el-table-column>
-          <!--<el-table-column label="材料类别" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 外协分类[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="预算(材料)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 材料费[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="成交(材料)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="材料价格_价格[scope.$index]" size="small"/>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="其他价格" align="center" width="120px">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="其他价格[scope.$index]" size="small"/>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <el-table-column label="计划开始" align="center" width="100px">
+          <el-table-column label="机加工开始时间" align="center" width="150px">
             <template slot-scope="scope">
-              {{ (机加工开始时间[scope.$index]) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="计划结束" align="center" width="100px">
-            <template slot-scope="scope">
-              {{ (机加工结束时间[scope.$index]) }}
+              {{ scope.row.机加工开始时间 }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.$index)">移出</el-button>
+              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-card>
-    <el-card v-show="false">
-      <div id="RWD">
-        <table cellspacing="0px" align="center" width="100%" style="">
-          <tbody id="1">
-            <tr>
-              <td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
-              <td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="2">任务单号:</td>
-              <td colspan="5">{{ 任务单号 }}</td>
-              <td colspan="5">下达日期:</td>
-              <td colspan="5">{{ 任务下达日期 }}</td>
-              <td colspan="3">外协厂家:</td>
-              <td colspan="8">{{ 外协厂家 }}</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="1">外协员:</td>
-              <td colspan="3">{{ 外协员 }}</td>
-              <td colspan="4">电话:</td>
-              <td colspan="6">{{ 外协员电话 }}</td>
-              <td colspan="3">联系人:</td>
-              <td colspan="3">{{ 联系人 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="6">{{ 联系人电话 }}</td>
-            </tr>
-            <tr id="tableHead">
-              <td style="width: 2%">序号</td>
-              <td colspan="5">零件图号</td>
-              <td colspan="2" style="width: 4%">零件名称</td>
-              <td colspan="2" style="width: 2%">数量</td>
-              <td colspan="9" width="30%">内容</td>
-              <!--<td colspan="1">零件类型</td>-->
-              <!--<td>外协类别</td>-->
-              <td>外协价格</td>
-              <!--<td>材料价格</td>-->
-              <!--<td>其他价格</td>-->
-              <td colspan="2">计划开始</td>
-              <td colspan="2">计划结束</td>
-            </tr>
 
-          </tbody>
-          <tfoot>
-            <tr id="tableFoot">
-              <td>费用</td>
-              <td colspan="27" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；人民币大写：{{ 大写金额 }}</td>
-              <!--；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元-->
-              <!--<td colspan="1">0</td>-->
-              <!--<td colspan="1"/>-->
-              <!--<td/>-->
-              <!--<td>{{ 加工价格合计 }}</td>-->
-              <!--<td>{{ 材料价格合计 }}</td>-->
-              <!--<td>{{ 其他价格合计 }}</td>-->
-              <!--<td colspan="2">{{ 最早时间 }}</td>-->
-              <!--<td colspan="2">{{ 最晚时间 }}</td>-->
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-    </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
-      <div align="center">
-        <el-input v-model="input" size="small" clearable style="width:200px"/>
-        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="searchData()">查询</el-button>
-      </div>
-      <el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
-        <el-table-column label="外协厂家" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div align="center" style="margin-top: 10px">
-        <el-button type="warning" size="small" icon="el-icon-edit-outline" @click="submit1">提交</el-button>
-      </div>
-    </el-dialog>
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
         <el-form-item label="表单号" prop="表单号" style="margin-left: 70px">
@@ -288,9 +144,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <!--<el-input v-model="form.外协厂家" readonly placeholder="外协厂家" size="small" style="width:200px" clearable>-->
-          <!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>-->
-          <!--</el-input>-->
         </el-form-item>
         <el-form-item v-show="false" label="运费" prop="运费" style="margin-left: 70px">
           <el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
@@ -305,12 +158,9 @@
 </template>
 
 <script>
-import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
-import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
-import { convertCurrency } from '@/vendor/int2Chinese'
+import { initOutHelp, getTable, getTable1, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
 import { mapGetters } from 'vuex'
 import elInput from 'element-ui/packages/input'
-import $ from 'jquery'
 
 export default {
   components: {
@@ -318,6 +168,7 @@ export default {
   },
   data() {
     return {
+      工艺计划流水号: [],
       isChecked: false,
       bianliang: [],
       card: false,
@@ -362,7 +213,6 @@ export default {
       ManufactorNumber1: null,
       manufacturers: '',
       dialogFormVisible: false,
-      dialogFormVisible1: false,
       data2: [],
       List: [],
       money: null,
@@ -372,7 +222,7 @@ export default {
       result: 0,
       documentStatus: null,
       sign: null,
-      Number: null,
+      Number: '',
       form: {
         表单号: '',
         下达任务日期: '',
@@ -438,21 +288,7 @@ export default {
     this.getList()
   },
   methods: {
-    exportTable() {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        const htmlNode = $('#RWD').html()
-        const body = $('body')
-        body.children().hide()
-        const printNode = $(htmlNode)
-        body.append(printNode)
-        window.print()
-        body.children().not('script').show()
-        body.children().not('#app').hide()
-        printNode.remove()
-      }
-    },
+    // 初始化查询
     fetchData() {
       this.ManufacturerName = []
       initOutHelp().then(response => {
@@ -464,210 +300,60 @@ export default {
         }
       })
       this.loading2 = true
-      var day3 = new Date(this.time)
-      var day4 = new Date(this.time)
-      day3.setTime(day3.getTime() - 24 * 60 * 60 * 1000)
-      day4.setTime(day4.getTime() + 24 * 60 * 60 * 1000)
-      var month1 = day3.getMonth() + 1
-      var month2 = day4.getMonth() + 1
-      var day1 = day3.getDate()
-      var day2 = day4.getDate()
-      if (month1 >= 1 && month1 <= 9) {
-        month1 = '0' + month1
-      }
-      if (day1 >= 1 && day1 <= 9) {
-        day1 = '0' + day1
-      }
-      if (month2 >= 1 && month2 <= 9) {
-        month2 = '0' + month2
-      }
-      if (day2 >= 1 && day2 <= 9) {
-        day2 = '0' + day2
-      }
-      this.time1 = day3.getFullYear() + '/' + month1 + '/' + day1
-      this.time2 = day4.getFullYear() + '/' + month2 + '/' + day2
-      if (this.formNumber !== '') {
-        this.num = 1
-      } else {
-        this.num = 0
-      }
-      if (this.manufacturers !== '') {
-        this.num1 = 1
-      } else {
-        this.num1 = 0
-      }
-      if (this.time === '' || this.time === null) {
-        this.num2 = 0
-      } else {
-        this.num2 = 1
-      }
-      if (this.documentStatus === '' || this.documentStatus === null) {
-        this.num3 = 0
-      } else {
-        this.num3 = 1
-      }
-      if (this.time1 === 'NaN/NaN/NaN') {
-        this.time1 = ''
-      }
-      if (this.time2 === 'NaN/NaN/NaN') {
-        this.time2 = ''
-      }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3, this.isChecked).then(response => {
+      this.Number = ''
+      this.manufacturers ? this.num1 = 1 : this.num1 = 0
+      getTable(this.num1, this.manufacturers, this.isChecked, this.currentPage, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].任务下达日期 !== null) {
-            response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
-          }
-        }
         this.List = response.data.rows
       })
       this.loading2 = false
     },
-    // 查询
+    // 表3合计
+    getSummaries(param) {
+      const { data } = param
+      const sums = ['', '', '', 0, 0, '']
+      sums[0] = '合计'
+      for (let i = 0; i < data.length; i++) {
+        sums[3] += parseInt(data[i].批次数量)
+      }
+      for (let i = 0; i < data.length; i++) {
+        sums[4] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
+      }
+      sums[4] = Math.round(sums[4] * 100) / 100 + ' 元'
+      return sums
+    },
+    // 查询未选入零件
+    getList() {
+      this.partNumber ? this.check = 1 : this.check = 0
+      this.loading1 = true
+      this.List1 = []
+      getTable1(this.check, this.partNumber).then(response => {
+        this.List1 = response.data
+        this.loading1 = false
+      })
+    },
+    // 表1多选
+    handleSelectionChange(val) {
+      this.processNum = val
+      this.工艺计划流水号 = []
+      for (let i = 0; i < val.length; i++) {
+        this.工艺计划流水号.push(val[i].工艺计划流水号)
+      }
+    },
+    // 点击表2 查询表3
     searchProcess(row) {
-      this.任务单号 = row.表单号
-      this.任务下达日期 = row.任务下达日期
-      this.外协厂家 = row.外协厂家
-      this.外协员 = row.外协计划员
-      // 以上是新增的
-      this.contrast = 3000000000000
-      this.contrast1 = 0
       this.loading = true
       this.List3 = []
-      this.bianliang = []
-      this.零件图号 = []
-      this.零件名称 = []
-      this.批次数量 = []
-      this.外协预算总价格 = []
-      this.加工价格_成交 = []
-      this.外协分类 = []
-      this.材料费 = []
-      this.材料价格_价格 = []
-      this.其他价格 = []
-      this.机加工开始时间 = []
-      this.机加工结束时间 = []
-      this.外协加工任务单明细流水号 = []
-      this.process = []
-      this.freight = row.运费
-      this.ManufactorNumber = row.外协厂家流水号
       this.Number = row.外协加工任务单流水号
-      getParts(this.Number).then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-        }
-        this.returns = data
-        this.List3 = data
-        this.加工价格合计 = 0
-        this.材料价格合计 = 0
-        this.其他价格合计 = 0
-        if (response.data.length !== 0) {
-          this.外协员电话 = response.data[0].联系电话
-          this.联系人 = response.data[0].联系人
-          this.联系人电话 = response.data[0].电话
-          this.运费 = response.data[0].运费
-          this.card = true
-        } else {
-          this.card = false
-        }
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('1')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
-          }
-        }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-              '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td colspan="2"></td><td colspan="2"></td>'
-          $('#tableHead').after(tr[i])
-        }
-        for (let j = 0; j < this.returns.length; j++) {
-          console.log(document.getElementsByClassName('tableData')[j].children)
-          document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-          // document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-          // document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-          // document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-          // document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-          if (response.data[j].机加工开始时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-          }
-          if (response.data[j].机加工结束时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-          }
-          this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[5].innerHTML)
-          // this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-          // this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-        }
-        this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-        this.大写金额 = convertCurrency(this.总计)
-        // RWD end
-        if (response.data.length === 0) {
-          this.loading = false
-        }
-        for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-          this.零件图号.push(response.data[i].零件图号)
-          this.零件名称.push(response.data[i].零件名称)
-          this.批次数量.push(response.data[i].批次数量)
-          this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-          this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-          this.外协分类.push(response.data[i].外协分类)
-          this.材料费.push(response.data[i].材料费.toFixed(2))
-          this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-          this.其他价格.push(response.data[i].其他价格.toFixed(2))
-          if (response.data[i].机加工开始时间 !== null) {
-            this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-          } else {
-            this.机加工开始时间.push(' ')
-          }
-          if (response.data[i].机加工结束时间 !== null) {
-            this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-          } else {
-            this.机加工结束时间.push(' ')
-          }
-          this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-          this.process[i] = []
-        }
-        for (let i = 0; i < this.returns.length; i++) {
-          spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-            for (let k = 0; k < response.data.length; k++) {
-              this.process[i][k] = response.data[k].工艺名称简称
-              document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-            }
-          }).then(() => {
-            // this.bianliang.push(this.returns[i])
-          })
-        }
-      }).then(() => {
-        // this.List3 = this.bianliang
+      this.ManufactorNumber = row.外协厂家流水号
+      getParts(row.外协加工任务单流水号).then(response => {
+        this.List3 = response.data
         this.loading = false
       })
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.title === '新增外协任务单') {
-            this.submitAdd()
-          } else if (this.title === '编辑外协任务单') {
-            this.submitEdit()
-          }
-        }
-      })
-    },
+    // 新增外协任务单
     handleAdd() {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
@@ -690,6 +376,46 @@ export default {
       this.form.外协厂家 = ''
       this.dialogFormVisible = true
     },
+    // 编辑外协任务单
+    handleEdit(row) {
+      if (this.$refs['form'] !== undefined) {
+        this.$refs['form'].resetFields()
+      }
+      this.title = '编辑外协任务单'
+      this.dialogFormVisible = true
+      this.form.表单号 = row.表单号
+      this.form.运费 = row.运费
+      this.form.外协厂家 = row.外协厂家
+      this.form.下达任务日期 = row.任务下达日期
+      this.ManufactorNumber1 = row.外协厂家流水号
+      this.Number = row.外协加工任务单流水号
+      if (row.入库标志 === null) {
+        this.sign = 1
+      }
+      if (row.单据状态 === '未成交') {
+        this.documentStatus = 1
+      } else {
+        this.documentStatus = 2
+      }
+    },
+    // 提交
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.title === '新增外协任务单') {
+            this.submitAdd()
+          } else if (this.title === '编辑外协任务单') {
+            this.submitEdit()
+          }
+        }
+      })
+    },
+    // 关闭
+    callOff(formName) {
+      this.dialogFormVisible = false
+      this.$refs[formName].resetFields()
+    },
+    // 提交新增
     submitAdd() {
       this.form.运费 = parseInt(this.form.运费)
       if (isNaN(this.form.运费)) {
@@ -712,434 +438,6 @@ export default {
         })
       }
     },
-    getList() {
-      if (this.partNumber !== '') {
-        this.check = 1
-      } else {
-        this.check = 0
-      }
-      this.loading1 = true
-      getTable1(this.check, this.partNumber).then(response => {
-        this.List1 = []
-        for (let j = 0; j < response.data.length; j++) {
-          this.List1.push({
-            项目名称: response.data[j].项目名称,
-            零件图号: response.data[j].零件图号,
-            零件名称: response.data[j].零件名称,
-            批次数量: response.data[j].批次数量,
-            加工价格_成交: response.data[j].加工价格_成交,
-            材料价格_价格: response.data[j].材料价格_价格,
-            其他价格: response.data[j].其他价格,
-            材料费: response.data[j].材料费,
-            外协分类: response.data[j].外协分类,
-            外协预算总价格: response.data[j].外协预算总价格,
-            传递时间_短: response.data[j].传递时间_短,
-            计划结束时间_短: response.data[j].计划结束时间_短,
-            是否临时件: response.data[j].是否临时件,
-            工艺计划流水号: response.data[j].工艺计划流水号,
-            单件是否外协: response.data[j].单件是否外协,
-            外协工序: ''
-          })
-        }
-        this.loading1 = false
-        this.getProcedure(this.List1)
-      })
-    },
-    getProcedure(row) {
-      for (let i = 0; i < row.length; i++) {
-        getprocedure(row[i].工艺计划流水号, row[i].单件是否外协).then(response => {
-          this.procedure[i] = ''
-          for (let j = 0; j < response.data.length; j++) {
-            this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
-          }
-          this.List1[i].外协工序 = this.procedure[i]
-        })
-      }
-    },
-    onFocus1() {
-      this.dialogFormVisible1 = true
-      this.input = ''
-      getData1().then(response => {
-        this.List2 = response.data
-      })
-    },
-    handleCurrentChange3(row) {
-      if (this.param === 0) {
-        this.name1 = row.外协厂家名称
-      } else {
-        this.form.外协厂家 = row.外协厂家名称
-        this.ManufactorNumber1 = row.外协厂家流水号
-      }
-    },
-    submit1() {
-      this.dialogFormVisible1 = false
-      this.manufacturers = this.name1
-    },
-    getSummaries(param) {
-      const { data } = param
-      const sums = ['', '', 0, 0, '', '']
-      sums[0] = '合计'
-      // sums[2] = '加工费:'
-      // sums[4] = '材料费:'
-      // sums[6] = '其他费用:'
-      // sums[8] = '运费:'
-      // sums[9] = parseInt(this.freight)
-      // sums[10] = '合计:'
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[24] += Math.round(parseFloat(data[i].外协预算总价格) * 100) / 100
-      // }
-      // sums[24] = Math.round(sums[24] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[2] += parseInt(data[i].批次数量)
-      }
-      for (let i = 0; i < data.length; i++) {
-        sums[3] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
-      }
-      sums[3] = Math.round(sums[3] * 100) / 100 + ' 元'
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[27] += Math.round(parseFloat(data[i].材料费) * 100) / 100
-      // }
-      // sums[27] = Math.round(sums[27] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[28] += Math.round(parseFloat(data[i].材料价格_价格) * 100) / 100
-      // }
-      // sums[28] = Math.round(sums[28] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[29] += Math.round(parseFloat(data[i].其他价格) * 100) / 100
-      // }
-      // sums[29] = Math.round(sums[29] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   if (data[i].机加工开始时间 !== null) {
-      //     if (Date.parse(data[i].机加工开始时间) <= this.contrast) {
-      //       this.contrast = Date.parse(data[i].机加工开始时间)
-      //       sums[30] = data[i].机加工开始时间.substr(0, 10)
-      //       this.最早时间 = data[i].机加工开始时间.substr(0, 10)
-      //     }
-      //   }
-      // }
-      // for (let i = 0; i < data.length; i++) {
-      //   if (data[i].机加工结束时间 !== null) {
-      //     if (Date.parse(data[i].机加工结束时间) >= this.contrast1) {
-      //       this.contrast1 = Date.parse(data[i].机加工结束时间)
-      //       sums[31] = data[i].机加工结束时间.substr(0, 10)
-      //       this.最晚时间 = data[i].机加工结束时间.substr(0, 10)
-      //     }
-      //   }
-      // }
-      // sums[3] = sums[25]
-      // sums[5] = sums[28]
-      // sums[7] = sums[29]
-      // sums[11] = Math.round((sums[3] + sums[5] + sums[7] + sums[9]) * 100) / 100
-      // sums[26] = '---'
-      return sums
-    },
-    // 计算价格
-    calculatingPrice() {
-      this.code = 0
-      for (let i = 0; i < this.List3.length; i++) {
-        this.加工价格_成交[i] = (this.外协预算总价格[i] * (1 - this.money / 100)).toFixed(2)
-        getPrice(this.外协加工任务单明细流水号[i], this.外协预算总价格[i], this.加工价格_成交[i], this.材料价格_价格[i], this.其他价格[i]).then(response => {
-          this.code = this.code + parseInt(response.data[0].result)
-          if (this.code === this.List3.length) {
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              const data = response.data
-              for (let i = 0; i < data.length; i++) {
-                data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-              }
-              this.returns = data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              // RWD end
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3 = this.returns
-                  this.money = null
-                  this.loading = false
-                })
-              }
-            })
-          }
-        })
-      }
-    },
-    // 确定价格
-    confirmPrice() {
-      this.code1 = 0
-      for (let i = 0; i < this.List3.length; i++) {
-        getPrice(this.外协加工任务单明细流水号[i], this.外协预算总价格[i], this.加工价格_成交[i], this.材料价格_价格[i], this.其他价格[i]).then(response => {
-          this.code1 = this.code1 + parseInt(response.data[0].result)
-          if (this.code1 === this.List3.length) {
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              const data = response.data
-              for (let i = 0; i < data.length; i++) {
-                data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-              }
-              this.returns = data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              // RWD end
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3 = this.returns
-                  this.loading = false
-                })
-              }
-            })
-          }
-        })
-      }
-    },
-    // 成交
-    Deal() {
-      this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        editData1(this.Number, this.ManufactorNumber, this.freight, this.Explain).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('提交成功')
-            this.fetchData()
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            this.card = false
-          } else { this.$message.error('提交失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消提交'
-        })
-      })
-    },
-    handleEdit(row) {
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
-      this.title = '编辑外协任务单'
-      this.dialogFormVisible = true
-      this.form.表单号 = row.表单号
-      this.form.运费 = row.运费
-      this.form.外协厂家 = row.外协厂家
-      this.form.下达任务日期 = row.任务下达日期
-      this.ManufactorNumber1 = row.外协厂家流水号
-      this.Number = row.外协加工任务单流水号
-      if (row.入库标志 === null) {
-        this.sign = 1
-      }
-      if (row.单据状态 === '未成交') {
-        this.documentStatus = 1
-      } else {
-        this.documentStatus = 2
-      }
-    },
     // 提交编辑
     submitEdit() {
       editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
@@ -1151,6 +449,7 @@ export default {
         } else { this.$message.error('编辑失败') }
       })
     },
+    // 删除任务单
     handleDelete(row) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -1175,149 +474,7 @@ export default {
         })
       })
     },
-    handleDelete1(index) {
-      this.$confirm('此操作将移除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteData1(this.外协加工任务单明细流水号[index]).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('移除成功')
-            this.getList()
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              this.returns = response.data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.loading = false
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3.push(this.returns[i])
-                  this.loading = false
-                })
-              }
-            })
-          } else { this.$message.error('移除失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    searchData() {
-      if (this.input !== '') {
-        this.check = 1
-      } else {
-        this.check = 0
-      }
-      searchManufactor(this.check, this.input).then(response => {
-        this.List2 = response.data
-      })
-    },
-    indexMethod(index) {
-      return index + 1
-    },
-    handleSelectionChange(val) {
-      this.processNum = val
-    },
+    // 打回车间
     getBack() {
       if (this.processNum.length !== 0) {
         this.result = 0
@@ -1336,140 +493,73 @@ export default {
     },
     // 选入零件
     getSpareParts() {
-      if (this.Number !== null) {
-        this.result = 0
-        for (let i = 0; i < this.processNum.length; i++) {
-          insertParts(this.processNum[i].工艺计划流水号, this.Number).then(response => {
-            this.result += parseInt(response.data[0].result)
-            if (this.processNum.length === this.result) {
-              this.contrast = 3000000000000
-              this.contrast1 = 0
-              this.loading = true
-              this.getList()
-              this.List3 = []
-              this.零件图号 = []
-              this.零件名称 = []
-              this.批次数量 = []
-              this.外协预算总价格 = []
-              this.加工价格_成交 = []
-              this.外协分类 = []
-              this.材料费 = []
-              this.材料价格_价格 = []
-              this.其他价格 = []
-              this.机加工开始时间 = []
-              this.机加工结束时间 = []
-              this.外协加工任务单明细流水号 = []
-              this.process = []
-              getParts(this.Number).then(response => {
-                this.returns = response.data
-                this.加工价格合计 = 0
-                this.材料价格合计 = 0
-                this.其他价格合计 = 0
-                if (response.data.length !== 0) {
-                  this.外协员电话 = response.data[0].联系电话
-                  this.联系人 = response.data[0].联系人
-                  this.联系人电话 = response.data[0].电话
-                  this.运费 = response.data[0].运费
-                  this.card = true
-                } else {
-                  this.card = false
-                }
-                const children = document.getElementsByClassName('tableData')
-                const parent = document.getElementById('1')
-                if (children.length !== 0) {
-                  for (let i = children.length - 1; i >= 0; i--) {
-                    parent.removeChild(children[i])
-                  }
-                }
-                const tr = []
-                for (let i = 0; i < this.returns.length; i++) {
-                  tr[i] = document.createElement('tr')
-                  tr[i].setAttribute('class', 'tableData')
-                  tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                      '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                  $('#tableHead').after(tr[i])
-                }
-                for (let j = 0; j < this.returns.length; j++) {
-                  document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                  document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                  document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                  document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                  document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                  document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                  document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                  document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                  document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                  document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                  if (response.data[j].机加工开始时间 !== null) {
-                    document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                  }
-                  if (response.data[j].机加工结束时间 !== null) {
-                    document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                  }
-                  this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                  this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                  this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-                }
-                this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-                this.大写金额 = convertCurrency(this.总计)
-                if (response.data.length === 0) {
-                  this.loading = false
-                }
-                for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                  this.零件图号.push(response.data[i].零件图号)
-                  this.零件名称.push(response.data[i].零件名称)
-                  this.批次数量.push(response.data[i].批次数量)
-                  this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                  this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                  this.外协分类.push(response.data[i].外协分类)
-                  this.材料费.push(response.data[i].材料费.toFixed(2))
-                  this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                  this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                  if (response.data[i].机加工开始时间 !== null) {
-                    this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                  } else {
-                    this.机加工开始时间.push(' ')
-                  }
-                  if (response.data[i].机加工结束时间 !== null) {
-                    this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                  } else {
-                    this.机加工结束时间.push(' ')
-                  }
-                  this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                  this.process[i] = []
-                  spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                    for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                      this.process[i].push(response.data[k].工艺名称简称)
-                      document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                    }
-                  }).then(() => {
-                    this.List3.push(this.returns[i])
-                    this.loading = false
-                  })
-                }
-              })
-            }
+      if (this.Number) {
+        insertParts(this.工艺计划流水号, this.Number).then(response => {
+          this.loading = true
+          this.List3 = []
+          getParts(this.Number).then(response => {
+            this.List3 = response.data
+            this.loading = false
           })
+        })
+      } else {
+        this.$message.warning('请选择外协加工任务单')
+      }
+    },
+    // 保存
+    confirmPrice() {
+      if (this.Number) {
+        var 外协加工任务单明细流水号组 = []
+        var 加工价格_成交组 = []
+        for (let i = 0; i < this.List3.length; i++) {
+          外协加工任务单明细流水号组.push(this.List3[i].外协加工任务单明细流水号)
+          加工价格_成交组.push(this.List3[i].加工价格_成交)
         }
+        getPrice(外协加工任务单明细流水号组, 加工价格_成交组).then(response => {
+          this.loading = true
+          this.List3 = []
+          getParts(this.Number).then(response => {
+            this.List3 = response.data
+            this.loading = false
+          })
+        })
       } else {
-        this.$message.warning('请选择订单')
+        this.$message.warning('请选择外协加工任务单')
       }
     },
-    downLoadRWD(tableid) {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
+    // 提交
+    Deal() {
+      if (this.Number) {
+        this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editData1(this.Number, this.ManufactorNumber).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('提交成功')
+              this.fetchData()
+            } else { this.$message.error('提交失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消提交'
+          })
+        })
       } else {
-        getExplorer()
-        method5(tableid)
-        Cleanup()
+        this.$message.warning('请选择外协加工任务单')
       }
     },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.差价 < 0) {
-        return 'chajia'
+    // 导出任务单
+    exportTable() {
+      if (!this.Number) {
+        this.$message.warning('请选择外协加工任务单')
       } else {
-        return ''
+        var param = []
+        param[0] = ['外协加工任务单流水号', this.Number]
+        var Data = this.CreateData('2001', '报表_外协加工任务单明细', param)
+        this.exportExcel_NPOI(Data)
       }
     },
     // 分页
@@ -1481,45 +571,37 @@ export default {
     handleCurrentChange(val) {
       this.pageList = val
       this.fetchData()
+    },
+    // 移除
+    handleDelete1(row) {
+      this.$confirm('此操作将移除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteData1(row.外协加工任务单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('移除成功')
+            this.getList()
+            this.loading = true
+            this.List3 = []
+            getParts(this.Number).then(response => {
+              this.List3 = response.data
+              this.loading = false
+            })
+          } else { this.$message.error('移除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     }
   }
 }
 </script>
 
 <style scoped>
-  .el-card{
-    margin: 0px;
-  }
-  td{
-    width: 100px;
-    height: 30px;
-    text-align:center;
-  }
-  .el-table .chengjiao {
-    background: #AEF199;
-  }
-  .el-input__inner {
-    height: 30px;
-  }
-</style>
-<style>
-  .el-table .chajia {
-    background: #EBF953;
-  }
-  #tableHead td{
-    border:1px solid black;
-  }
-  .tableData td{
-    border:1px solid black;
-  }
-  #tableFoot td{
-    border:1px solid black;
-  }
-  .tbodyHead td{
-    text-align: left;
-  }
-  .foot td{
-    width: 7%;
-    text-align: left;
-  }
+
 </style>
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index c77162c3..aa22e3de 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -22,17 +22,17 @@
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
         <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
-          <el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
+          <el-table-column label="零件图号" prop="零件图号" align="center" width="175px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件名称" prop="零件名称" align="center" width="140px" show-overflow-tooltip>
+          <el-table-column label="零件名称" prop="零件名称" align="center" width="130px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="材料" prop="材料" align="center" show-overflow-tooltip>
+          <el-table-column label="材料" prop="材料" align="center" min-width="82px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.材料 }}
             </template>
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index 10a0e1e4..d9b633be 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -1,116 +1,46 @@
 <template>
   <div>
     <el-card>
-      <span>项目名称</span>
-      <el-select v-model="projectValue" placeholder="请选择项目名称" clearable filterable size="small" style="width: 185px">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>机床图号</span>
-      <el-select v-model="machineValue" placeholder="请选择机床图号" clearable filterable size="small" style="width: 185px">
-        <el-option
-          v-for="item in machine"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>组号</span>
-      <el-select v-model="groupValue" placeholder="请选择组号" clearable filterable size="small" style="width: 100px">
-        <el-option
-          v-for="item in group"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-select v-model="whetherToImport" clearable placeholder="是否导入" filterable size="small" style="width: 100px">
-        <el-option
-          v-for="item in whetherToImports"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-
-      <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
-      <el-upload
-        :disabled="disabled"
-        :action="action"
-        :on-success="uploadSuccess"
-        :on-error="uploadFailure"
-        :show-file-list="showFileList"
-        :file-list="fileList"
-        style="float: right; margin: 0px 50px"
-        class="upload-demo"
-        multiple>
-        <el-button type="primary" size="small" style="float: right; margin: 0px 50px" plain @click="batchImportOfDrawings">图纸批量导入</el-button>
-      </el-upload>
+      <el-row style="width: 600px">
+        <el-input v-model="partNumber" placeholder="零件图号" style="width: 180px" size="small" clearable/>
+        <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
+        <el-upload
+          :disabled="disabled"
+          :action="action"
+          :on-success="uploadSuccess"
+          :on-error="uploadFailure"
+          :show-file-list="showFileList"
+          :file-list="fileList"
+          style="float: right; margin: 0px 50px"
+          class="upload-demo"
+          multiple>
+          <el-button type="primary" size="small" style="float: right;" plain @click="batchImportOfDrawings">图纸导入</el-button>
+        </el-upload>
+      </el-row>
     </el-card>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" border size="mini" style="width: 100%;max-height: 520px" height="520">
+      <el-table v-loading="loading" :data="tableData" border size="mini" style="width: 555px;height: 700px" height="520">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="机床图号" align="center" min-width="100px">
+        <el-table-column label="零件图号" align="center" width="180px">
           <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
+            {{ scope.row.name }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="100px">
+        <el-table-column label="文件格式" align="center" width="80px">
           <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
+            {{ scope.row.suffix }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" min-width="100px">
+        <el-table-column label="上传时间" align="center" width="150px">
           <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
+            {{ scope.row.上传时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.零件备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件类型" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.零件类型名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="是否导入" align="center">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.是否导入)===1" type="success">已导入</span>
-            <span v-else type="danger">未导入</span>
-          </template>
-        </el-table-column>
-        <el-table-column min-width="50px" label="零件图纸" align="center">
+        <el-table-column width="80px" label="零件图纸" align="center">
           <template slot-scope="scope">
             <el-button circle icon="el-icon-search" size="small" @click="getNum(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column min-width="80px" label="操作" align="center">
-          <template slot-scope="scope">
-            <el-upload
-              :disabled="disabled"
-              :action="action"
-              :on-success="uploadSuccess"
-              :on-error="uploadFailure"
-              :show-file-list="showFileList"
-              :file-list="fileList"
-              class="upload-demo"
-              multiple>
-              <el-button :disabled="disabled" size="mini" type="text" icon="el-icon-upload2" round @click="getAction(scope.row)">点击上传</el-button>
-            </el-upload>
-          </template>
-        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -123,10 +53,7 @@
           @current-change="handleCurrentChanges"/>
       </div>
     </el-card>
-    <el-dialog
-      :show-close="close"
-      :visible.sync="dialogVisible"
-      width="15%">
+    <el-dialog :visible.sync="dialogVisible" width="350px">
       <div v-for="(file, key) in hadFile" :key="key">
         <div class="wrapper">
           <div class="content">
@@ -149,114 +76,54 @@
 
 <script>
 import request from '@/utils/request'
-import { projectSelect, machineSelect, groupSelect, basicPartsData } from '@/api/TechnologyCenter/PartDrawingMaintenance'
+import { getTableData } from '@/api/TechnologyCenter/PartDrawingMaintenance'
 import { MESUploadFile, MESDownloadFile } from '@/utils/request'
 export default {
   data() {
     return {
-      close: false,
-      dialogVisible: false,
-      partID: '',
-      projectValue: '',
-      project: [],
-      machineValue: '',
-      machine: [],
-      groupValue: '',
-      group: [],
+      partNumber: '', // 零件图号
+      tableData: [],
+      loading: false,
+      total: 0,
       pageCurrent: 1,
       pageSize: 10,
-      total: null,
-      loading: false,
-      tableData: [],
-      fileList: [],
-      showFileList: false,
-      action: '',
+      dialogVisible: false,
+      close: false, // 是否显示关闭按钮
       disabled: false,
-      tableName: '机加工MES_零件图PDF表',
-      num: '',
-      num1: '1',
-      hadFile: [],
       isDeleteShow: false,
       deleteShow: '1',
-      row1: [],
-      operationType: '0',
-      str: '',
-      arr: [],
-      whetherToImport: '',
-      whetherToImports: [{
-        value: '1',
-        label: '已导入'
-      }, {
-        value: 'null',
-        label: '未导入'
-      }]
+      action: '',
+      showFileList: false,
+      hadFile: [],
+      fileList: []
     }
   },
-  computed: {
-    groupName() {
-      for (let i = 0; i < this.group.length; i++) {
-        if (this.group[i].value === this.groupValue) {
-          return this.group[i].label
-        }
-      }
-    }
-  },
-  watch: {
-    project(val) {
-      if (val.length > 0) {
-        this.projectValue = val[0].value
-      }
-    },
-    projectValue(val) {
-      this.machineValue = ''
-      this.machine = []
-      this.groupValue = ''
-      this.group = []
-      if (val) {
-        this.getMachineSelect(val)
-      }
-    },
-    machine(val) {
-      if (val.length > 0) {
-        this.machineValue = val[0].value
-      }
-    },
-    machineValue(val) {
-      this.groupValue = ''
-      this.group = []
-      if (val) {
-        this.getGroupSelect(val)
-      }
-    },
-    group(val) {
-      if (val.length > 0) {
-        this.groupValue = val[0].value
-      }
-    },
-    groupValue(val) {
-      if (val) {
-        this.pageCurrent = 1
-        this.pageSize = 10
-        this.getTableData()
-      }
-    }
-  },
-  mounted() {
-    this.fetchData()
+  created() {
+    this.getTableData()
   },
   methods: {
-    getAction(row) {
-      this.num = row.零件图号
-      this.action = `${MESUploadFile}?&num=${this.num}&tableName=${this.tableName}&type=2`
+    // 查询
+    getTableData() {
+      var partNumber_check = this.partNumber ? 1 : 0
+      this.loading = true
+      getTableData(partNumber_check, this.partNumber, this.pageSize, this.pageCurrent).then(response => {
+        this.loading = false
+        this.tableData = response.data.rows
+        this.total = response.data.total
+      })
     },
+    handleSizeChanges(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChanges(val) {
+      this.pageCurrent = val
+      this.getTableData()
+    },
+    // 上传
     batchImportOfDrawings() {
-      this.action = `${MESUploadFile}?&num=${this.num1}&tableName=${this.tableName}&type=1`
-    },
-    getNum(row) {
-      this.row1 = row
-      this.dialogVisible = true
-      this.num = row.基本件流水号
-      this.getFileList(row.零件图号)
+      this.action = `${MESUploadFile}?&num=1&tableName=机加工MES_零件图PDF表&type=1`
     },
     uploadSuccess(res, file, fileList) {
       this.getTableData()
@@ -293,40 +160,16 @@ export default {
         // this.getTableData()
       }
     },
-    uploadFailure(a, file, fileList) {
+    uploadFailure(res, file, fileList) {
       fileList.map(file => {
         this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`)
       })
     },
-    fetchData() {
-      this.getSelect(projectSelect, ['项目名称', '项目流水号'], 'project')
-    },
-    getMachineSelect(val) {
-      this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machine', val)
-    },
-    getGroupSelect(val) {
-      this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
-    },
-    getTableData() {
-      const project_check = this.projectValue ? 1 : 0
-      const machine_check = this.machineValue ? 1 : 0
-      const group_check = this.groupValue ? 1 : 0
-      const whetherToImport_check = this.whetherToImport ? 1 : 0
-      this.loading = true
-      basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, whetherToImport_check, this.whetherToImport, this.pageSize, this.pageCurrent).then(response => {
-        this.loading = false
-        this.tableData = response.data.rows
-        this.total = response.data.total
-      })
-    },
-    handleSizeChanges(val) {
-      this.pageCurrent = 1
-      this.pageSize = val
-      this.getTableData()
-    },
-    handleCurrentChanges(val) {
-      this.pageCurrent = val
-      this.getTableData()
+    // 查看零件图
+    getNum(row) {
+      this.num = row.num
+      this.dialogVisible = true
+      this.getFileList(row.name)
     },
     async getFileList(value) {
       this.hadFile = []
@@ -337,35 +180,25 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select * from ${this.tableName} where 是否启用 = 1 and name = '${value}'`
+            name: `select * from 机加工MES_零件图PDF表 where 是否启用 = 1 and name = '${value}'`
           }
         }).then(data => {
           this.suffix = data.data
           if (data.data.length > 0) {
-            if (this.operationType === '1') {
-              data.data.map(item => {
-                this.hadFile.push({
-                  url: `${MESDownloadFile}?id=${item.uid}.${item.suffix}&name=${item.name}.${item.suffix}`,
-                  name: `${item.name}.${item.suffix}`,
-                  suffix: item.suffix,
-                  id: item.uid
-                })
+            const server = `${MESDownloadFile}`.split('/')
+            data.data.map(item => {
+              this.hadFile.push({
+                url: `http://${server[2]}/webpage/part/${item.uid}.${item.suffix}`,
+                name: `${item.name}.${item.suffix}`,
+                suffix: item.suffix,
+                id: item.uid
               })
-            } else if (this.operationType === '0') {
-              const server = `${MESDownloadFile}`.split('/')
-              data.data.map(item => {
-                this.hadFile.push({
-                  url: `http://${server[2]}/webpage/part/${item.uid}.${item.suffix}`,
-                  name: `${item.name}.${item.suffix}`,
-                  suffix: item.suffix,
-                  id: item.uid
-                })
-              })
-            }
+            })
           }
         })
       }
     },
+    // 删除零件图
     async deleteFileData(id) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -377,7 +210,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `delete from ${this.tableName} where uid = N'${id}'`
+            name: `delete from 机加工MES_零件图PDF表 where uid = N'${id}'`
           }
         }).then(response => {
           this.getTableData()
@@ -442,7 +275,7 @@ export default {
     font-size: 26px;
   }
   .info{
-    width:100px;
+    width: 160px;
     height: 50px;
     position: absolute;
     left: 44px;
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 758ea9a1..3aa16475 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -72,7 +72,7 @@
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px;margin: 3px 10px"
+              style="width: 220px;margin: 3px 10px"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
@@ -337,7 +337,7 @@
           icon="el-icon-check"
           @click="submitAddPurchaseOrder">确定</el-button>
         <el-button
-          v-show="title2==='编辑外购计划单'"
+          v-show="title2==='编辑采购计划单'"
           type="primary"
           size="small"
           icon="el-icon-check"
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index ec0f64cc..b5d69537 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -1,30 +1,20 @@
 <template>
-  <section class="app-main">
-    <!-- <router-view :key="key"></router-view> -->
+  <!--<section class="app-main">-->
+  <section id="app-main" class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive id="keepAlive">
-        <router-view v-if="$route.meta.keepAlive"/>
+      <!-- or name="fade" -->
+      <!-- <router-view :key="key"></router-view> -->
+      <keep-alive>
+        <router-view/>
       </keep-alive>
     </transition>
-    <transition name="fade-transform" mode="out-in">
-      <router-view v-if="!$route.meta.keepAlive"/>
-    </transition>
   </section>
 </template>
 
 <script>
-import store from '@/store'
 export default {
   name: 'AppMain',
   computed: {
-    keepAliveList() {
-      var keepAliveList = ''
-      store.state.tagsView.cachedViews.map(v => {
-        keepAliveList = keepAliveList + v + ','
-      })
-      console.log(keepAliveList)
-      return keepAliveList
-    }
     // key() {
     //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
     // }
@@ -35,9 +25,8 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  width: 1380px;
   position: relative;
   overflow: hidden;
-  /*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/
+  /*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
 }
 </style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index b86b571d..b0a0be89 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -27,13 +27,6 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
-import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
-import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
-import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
-import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
-import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
-import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
 export default {
   components: {
     Breadcrumb,
@@ -64,200 +57,7 @@ export default {
       'token'
     ])
   },
-  mounted() {
-    if (this.id.toString() === '3') {
-      this.checkApproval()
-      this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
-    } else if (this.token.toString() === '11' || this.token.toString() === '12') {
-      this.comfirmMaterial()
-      this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
-    } else if (this.token.toString() === '2' || this.token.toString() === '3') {
-      this.comfirmMaterial_CG()
-      this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
-    } else if (this.token.toString() === '15') {
-      this.comfirmMaterial_KG()
-      this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
-    } else if (this.token.toString() === '5') {
-      this.comfirmUrgentItem()
-      this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60)
-    }
-  },
-  beforeDestroy() {
-    clearInterval(this.timer)
-  },
   methods: {
-    comfirmMaterial_KG() {
-      getPickingList().then(res => {
-        if (res.data.length) {
-          this.noticeContractKG = null
-          this.noticeContractKG = this.$notify.success({
-            title: '提示',
-            message: '您有新的领料单需要备料确认，请及时处理，点击查看',
-            onClick: () => {
-              setPickingList().then(res => {
-                this.$router.push({ path: '/Inventory/MaterialOut' })
-                setTimeout(this.noticeContractKG.close(), 1000)
-              })
-            },
-            duration: 1000 * 60
-          })
-        }
-      })
-    },
-    comfirmMaterial_CG() {
-      getMaterial_NOTES().then(res => {
-        if (res.data.length) {
-          this.noticeContract1 = null
-          this.noticeContract1 = this.$notify.success({
-            title: '提示',
-            message: '有新采购物料审批结果，点击查看',
-            onClick: () => {
-              setChakan().then(res => {
-                this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' })
-                setTimeout(this.noticeContract1.close(), 1000)
-              })
-            },
-            duration: 1000 * 60
-          })
-        }
-      })
-      if (this.token.toString() === '2') {
-        searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => {
-          if (res.data.length) {
-            this.noticeContract2 = null
-            this.noticeContract2 = this.$notify.success({
-              title: '提示',
-              message: '有合同请款申请审批结果，点击查看',
-              onClick: () => {
-                setChakan().then(res => {
-                  this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
-                  setTimeout(this.noticeContract2.close(), 1000)
-                })
-              },
-              duration: 1000 * 60
-            })
-          }
-        })
-        initApproval(1, 999, 1).then(res => {
-          if (res.data.rows.length) {
-            this.noticeContract3 = null
-            this.noticeContract3 = this.$notify.success({
-              title: '提示',
-              message: '有合同请款申请待审批，点击查看',
-              onClick: () => {
-                setChakan().then(res => {
-                  this.$router.push({ path: '/PurchasingCenter/FundApproval1' })
-                  setTimeout(this.noticeContract3.close(), 1000)
-                })
-              },
-              duration: 1000 * 60
-            })
-          }
-        })
-      } else if (this.token.toString() === '3') {
-        searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => {
-          if (res.data.length) {
-            this.noticeContract4 = null
-            this.noticeContract4 = this.$notify.success({
-              title: '提示',
-              message: '有合同请款申请审批结果，点击查看',
-              onClick: () => {
-                setChakan().then(res => {
-                  this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
-                  setTimeout(this.noticeContract4.close(), 1000)
-                })
-              },
-              duration: 1000 * 60
-            })
-          }
-        })
-      }
-    },
-    comfirmMaterial() {
-      getMaterial().then(res => {
-        if (res.data.length) {
-          this.noticeContract5 = null
-          this.noticeContract5 = this.$notify.success({
-            title: '提示',
-            message: '您有采购物料申请待审批，请及时处理，点击查看',
-            onClick: () => {
-              this.$router.push({ path: '/PurchasingCenter/MaterialManagement' })
-              setTimeout(this.noticeContract5.close(), 1000)
-            },
-            duration: 1000 * 60
-          })
-        }
-      })
-    },
-    checkApproval() {
-      searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
-        if (res.data.total) {
-          this.noticeContract6 = null
-          this.noticeContract6 = this.$notify.success({
-            title: '提示',
-            message: '您有采购合同待审批，请及时处理，点击查看',
-            onClick: () => {
-              this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' })
-              setTimeout(this.noticeContract6.close(), 1000)
-            },
-            duration: 1000 * 60
-          })
-        }
-      })
-      const p1 = new Promise((resolve, reject) => {
-        initApproval(1, 999, 1).then(res => {
-          resolve(res)
-        })
-      })
-      const p2 = new Promise((resolve, reject) => {
-        initApprovalOffline(1, 999, 1).then(res => {
-          resolve(res)
-        })
-      })
-      Promise.race([p1, p2]).then(res => {
-        if (res.data.total) {
-          this.noticeFund = this.$notify.success({
-            title: '提示',
-            message: '您有合同请款申请待审批，请及时处理，点击查看',
-            onClick: () => {
-              this.$router.push({ path: '/PurchasingCenter/FundApproval2' })
-              setTimeout(this.noticeFund.close(), 1000)
-            },
-            duration: 1000 * 60 * 5
-          })
-        }
-      })
-      searchTableInvoice(0, null, null, 1, 999, this.token).then(res => {
-        if (res.data.total) {
-          this.noticeInvoice = null
-          this.noticeInvoice = this.$notify.success({
-            title: '提示',
-            message: '您有发票结算申请待审批，请及时处理，点击查看',
-            onClick: () => {
-              this.$router.push({ path: '/PurchasingCenter/InvoiceSettlementApprove' })
-              setTimeout(this.noticeInvoice.close(), 1000)
-            },
-            duration: 1000 * 60 * 5
-          })
-        }
-      })
-    },
-    comfirmUrgentItem() {
-      console.log(1111)
-      searchUrgentItem().then(res => {
-        if (res.data.length > 0) {
-          this.noticeContractJJ = null
-          this.noticeContractJJ = this.$notify.success({
-            title: '提示',
-            message: '您有加急件未打印，请及时处理',
-            onClick: () => {
-              setTimeout(this.noticeContractJJ.close(), 1000)
-            },
-            duration: 1000 * 60
-          })
-        }
-      })
-    },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index d3e43f8b..8d545f2c 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -53,17 +53,21 @@ export default {
   },
   methods: {
     // generateTitle, // generateTitle by vue-i18n
+    // generateRoute() {
+    //   if (this.$route.name) {
+    //     return this.$route
+    //   }
+    //   return false
+    // },
     generateRoute() {
       switch (this.$route.name) {
-        // 生产监控
         case 'EquipmentMonitoring':
-          document.getElementsByClassName('app-main')[0].style.width = '1710px'
-          document.getElementsByClassName('main-container')[0].style.minWidth = '1710px'
+          document.getElementById('app-main').style.width = '1710px'
+          break
+        case '0': // 补位用（switch至少两个case,否则显示警告）
           break
-        // 默认
         default:
-          document.getElementsByClassName('app-main')[0].style.width = '1380px'
-          document.getElementsByClassName('main-container')[0].style.minWidth = '1380px'
+          document.getElementById('app-main').style.width = '1380px'
       }
       if (this.$route.name) {
         return this.$route
@@ -71,9 +75,6 @@ export default {
       return false
     },
     isActive(route) {
-      if (!this.$route.meta.keepAlive) {
-        this.$route.meta.keepAlive = true
-      }
       return route.path === this.$route.path || route.name === this.$route.name
     },
     addViewTags() {
@@ -104,14 +105,8 @@ export default {
         if (this.isActive(view)) {
           const latestView = views.slice(-1)[0]
           if (latestView) {
-            if (this.$route.meta.keepAlive) {
-              this.$route.meta.keepAlive = false
-            }
             this.$router.push(latestView.path)
           } else {
-            if (this.$route.meta.keepAlive) {
-              this.$route.meta.keepAlive = false
-            }
             this.$router.push('/')
           }
         }