diff --git a/src/api/BasicData/PartsNumberMaintenance.js b/src/api/BasicData/PartsNumberMaintenance.js
index 668b2d9d..d0f660ab 100644
--- a/src/api/BasicData/PartsNumberMaintenance.js
+++ b/src/api/BasicData/PartsNumberMaintenance.js
@@ -67,7 +67,7 @@ export function searchTable6(machineCheck, machine, groupCheck, group) {
     }
   })
 }
-export function basicPartsData(machine_check, machine, group_check, group) {
+export function basicPartsData(machine_check, machine, group_check, group, part_check, part) {
   return request({
     url: '',
     method: 'post',
@@ -75,12 +75,12 @@ export function basicPartsData(machine_check, machine, group_check, group) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_零件明细表_基本件_查询数据_综合gj',
-      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
+      name: 'PDM_零件明细表_基本件_查询数据_综合gj_数量维护',
+      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&零件图号_check=${part_check}&零件图号=${part}`
     }
   })
 }
-export function purchasePartsData(num) {
+export function purchasePartsData(num, part_check, part) {
   return request({
     url: '',
     method: 'post',
@@ -88,8 +88,8 @@ export function purchasePartsData(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_零件明细表_标准件和外购件_查询数据',
-      param: `组件流水号=${num}`
+      name: 'PDM_零件明细表_标准件和外购件_查询数据_数量维护',
+      param: `组件流水号=${num}&物料名称_check=${part_check}&物料名称=${part}`
     }
   })
 }
diff --git a/src/api/BasicData/WorkshopProcessMaintenance.js b/src/api/BasicData/WorkshopProcessMaintenance.js
index 9cb178f9..4c6fdcf4 100644
--- a/src/api/BasicData/WorkshopProcessMaintenance.js
+++ b/src/api/BasicData/WorkshopProcessMaintenance.js
@@ -113,7 +113,7 @@ export function addProcess(ProcessClassificationNum, ProcessName, ShortName) {
   })
 }
 // 编辑工艺
-export function editProcess(ProcessClassificationNum, ProcessName, ShortName) {
+export function editProcess(ProcessClassificationNum, ProcessName, ShortName, Requirement) {
   return request({
     url: '',
     method: 'post',
@@ -122,7 +122,7 @@ export function editProcess(ProcessClassificationNum, ProcessName, ShortName) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_基础表_工艺名称_修改名称及简称',
-      param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName
+      param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + '&工艺要求=' + Requirement
     }
   })
 }
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 87edffbe..2c7e69f2 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -308,7 +308,7 @@ export function selectBidBond() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '投标保证金管理_投标保证金查询',
+      name: '投标保证金管理_投标保证金查询_新',
       param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
     }
   })
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index 9b9aa6ab..6cb24d57 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -17,7 +17,7 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime,
     }
   })
 }
-export function getInvoice(Number, pageCurrent, pageSize) {
+export function getInvoice(Number, check2, starttime, endTime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -26,12 +26,12 @@ export function getInvoice(Number, pageCurrent, pageSize) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
+      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-export function getPayment(Number, pageCurrent, pageSize) {
+export function getPayment(Number, check2, starttime, endTime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -40,7 +40,7 @@ export function getPayment(Number, pageCurrent, pageSize) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_外协付款记录_查询数据',
-      param: '外协厂家流水号=' + Number,
+      param: '外协厂家流水号=' + Number + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index 3f1c2a98..7c92c8fa 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -30,7 +30,7 @@ export function getTable1(check, partNumber) {
   })
 }
 // 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
+export function getTable(checked, contractNumber, check) {
   return request({
     url: '',
     method: 'post',
@@ -39,8 +39,7 @@ export function getTable(checked, contractNumber, check, pageCurrent, pageSize)
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
-      Pagination: pageCurrent + '&' + pageSize
+      param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
index be287ea5..ca96b60f 100644
--- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -62,7 +62,7 @@ export function initPartDrawing(check1, name) {
   })
 }
 // 查询外购备料
-export function searchPurchasedMaterials(check1, name) {
+export function searchPurchasedMaterials(check1, name, order, partName) {
   return request({
     url: '',
     method: 'post',
@@ -71,7 +71,7 @@ export function searchPurchasedMaterials(check1, name) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '备料管理_外购备料_查询数据',
-      param: `零件图号_check=${check1}&零件图号=${name}`
+      param: `零件图号_check=${check1}&零件图号=${name}&排序名称=${partName}&排序方式=${order}`
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index da35a928..89286890 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -15,6 +15,19 @@ export function searchCailiao(name) {
     }
   })
 }
+// 获取新到货单编号
+export function searchNewOrder() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '备料管理_获取新到货单编号'
+    }
+  })
+}
 // 查询采购单
 export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check, num1) {
   return request({
@@ -74,7 +87,7 @@ export function searchLxMateriel(num, check, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) {
+export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime) {
   return request({
     url: '',
     method: 'post',
@@ -83,8 +96,7 @@ export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime,
       ModularID: router.currentRoute.path,
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`
     }
   })
 }
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 87acf530..0301e37c 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -21,16 +21,14 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <span style="margin-left: 10px">零件图号:</span>
         <el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 180px" size="small" clearable/>
-        <span class="demonstration" style="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"
+          style="width: 240px;margin-left: 10px"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           range-separator="～"
@@ -52,18 +50,18 @@
         <!--type="date"-->
         <!--placeholder="选择日期"/>-->
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
-          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 580px;margin-top: 3px" height="800px" @sort-change="sortChange">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 600px;margin-top: 3px" height="800px" @sort-change="sortChange">
         <!--<el-table-column label="项目名称" prop="项目名称" align="center" width="150" show-overflow-tooltip>-->
         <!--<template slot-scope="scope">-->
         <!--{{ scope.row.项目名称 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="机床图号" prop="机床图号" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 4d5167f1..55d90244 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>机床图号</span>
       <el-select v-model="machineValue" placeholder="请选择机床图号" style="margin: 0px 20px 0px 0px" filterable size="small">
         <el-option
           v-for="item in machine"
@@ -10,7 +9,6 @@
           :value="item.value"/>
       </el-select>
 
-      <span>组号</span>
       <el-select v-model="groupValue" placeholder="请选择组号" style="margin: 0px 20px 0px 0px" filterable size="small">
         <el-option
           v-for="item in group"
@@ -19,8 +17,7 @@
           :value="item.value"/>
       </el-select>
 
-      <span>零件图号:</span>
-      <el-input v-model="partNumber" clearable filterable size="small" placeholder="零件图号" style="width: 200px;"/>
+      <el-input v-model="partNumber" clearable filterable size="small" placeholder="零件图号或物料名称" style="width: 200px;"/>
 
       <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData();pageCurrent1 = 1;pageSize1 = 10;getTable();pageCurrent2 = 1;pageSize2 = 10;getTable1()">查询</el-button>
     </el-card>
@@ -850,8 +847,9 @@ export default {
     getTableData() {
       const machine_check = this.machineValue ? 1 : 0
       const group_check = this.groupValue ? 1 : 0
+      const part_check = this.partNumber ? 1 : 0
       this.loading = true
-      basicPartsData(machine_check, this.machineValue, group_check, this.groupValue).then(response => {
+      basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, part_check, this.partNumber).then(response => {
         this.loading = false
         const res = response.data
         this.total = res.total
@@ -868,7 +866,7 @@ export default {
         })
       })
       this.loadingWB = true
-      purchasePartsData(this.groupValue).then(response => {
+      purchasePartsData(this.groupValue, part_check, this.partNumber).then(response => {
         this.loadingWB = false
         const data = response.data
         this.totalWB = data.total
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 91080446..86c3d2a3 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -148,7 +148,7 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
+import { searchtable, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
 import { exportExcelMethod } from './exportExcel'
 import $ from 'jquery'
 export default {
@@ -227,26 +227,8 @@ export default {
           // this.tableData.push({
           //   重量: response.data.rows[0].重量
           // })
-          this.Data = response.data.rows
+          this.tableData = response.data.rows
           this.total = response.data.total
-        }
-      }).then(() => {
-        for (let i = 0; i < this.Data.length; i++) {
-          searchtable2(this.Data[i].工艺计划流水号).then(response => {
-            this.tableData.push({
-              工艺计划流水号: this.Data[i].工艺计划流水号,
-              零件名称: this.Data[i].零件名称,
-              零件图号: this.Data[i].零件图号,
-              备料打印: this.Data[i].备料打印,
-              是否外购备料: this.Data[i].是否外购备料,
-              工艺要求: response.data[0].工艺要求,
-              材料: this.Data[i].材料,
-              重量: this.Data[i].重量,
-              批次数量: this.Data[i].批次数量,
-              备料任务接受时间: this.Data[i].备料任务接受时间,
-              备料任务分配时间: this.Data[i].备料任务分配时间
-            })
-          })
           this.loading = false
         }
       })
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 13452296..ee362b84 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -3294,7 +3294,7 @@ export default {
           name: `select 前几列.*,case when 完成时间 = '未完成' then '未完成' else convert(nvarchar(50),入库时间,21) end as 完成时间
                 from (SELECT 组号 ,组件名称,SUM(isnull(批次数量,0))as 投产数量,SUM(isnull(入库数量,0))as 入库数量,MAX(入库时间) as 入库时间
                 from 车间生产管理工艺_零件工艺计划_传递后_视图
-                where 机床流水号 = 89
+                where 机床流水号 = ${this.machineValue1}
                 group by 组号,组件名称) as 前几列
                 left join (SELECT 组号,'未完成' as 完成时间
                 from 车间生产管理工艺_零件工艺计划_传递后_视图
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index f53381dd..11de789f 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -1,455 +1,576 @@
 <template>
   <div class="app-container">
-    <el-card style="padding: 3px">
-      <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
-      <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
-      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
-      <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
-        <!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
-      </el-tooltip>
-      <!--      <span style="margin-left: 40px">有效时间：</span>-->
-      <!--      <el-date-picker-->
-      <!--        v-model="time"-->
-      <!--        type="date"-->
-      <!--        size="small"-->
-      <!--        value-format="yyyy-MM-dd"-->
-      <!--        placeholder="选择日期"/>-->
-      <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
-      <!--        &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
-      <!--        <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
-      <!--      </el-tooltip>-->
-      <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
-      <!--        &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
-      <!--        <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
-      <!--      </el-tooltip>-->
-    </el-card>
-
-    <el-card>
-      <el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
-        <el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
-          <template slot-scope="scope">
-            {{ scope.row.设备名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
-          <template slot-scope="scope">
-            {{ scope.row.设备编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
-          <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">p-->
-        <!--            {{ 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" >-->
-        <!--          <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="70px">
-          <template slot-scope="scope">
-            <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
-            <el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    <!--      <div class="block" style="margin-top: 10px;">-->
-    <!--        <el-pagination-->
-    <!--          :current-page="pageCurrent"-->
-    <!--          :page-sizes="[10, 20, 30, 40]"-->
-    <!--          :page-size="pageSize"-->
-    <!--          :total="total"-->
-    <!--          layout="total, sizes, prev, pager, next, jumper"-->
-    <!--          @size-change="handleSizeChange"-->
-    <!--          @current-change="handleCurrentChange"/>-->
-    <!--      </div>-->
-    </el-card>
-    <!--    <el-card>-->
-    <!--      <span>有效时间：</span>-->
-    <!--      <el-date-picker-->
-    <!--        v-model="time"-->
-    <!--        type="date"-->
-    <!--        size="small"-->
-    <!--        value-format="yyyy-MM-dd"-->
-    <!--        placeholder="选择日期"/>-->
-    <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
-    <!--        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
-    <!--      </el-tooltip>-->
-    <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
-    <!--        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
-    <!--      </el-tooltip>-->
-    <!--    </el-card>-->
-
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
-        <el-row>
-          <el-col :span = "12">
-            <el-form-item label="设备名称" prop="设备名称" >
-              <el-input v-model="form.设备名称" placeholder="设备名称" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span = "12">
-            <el-form-item label="设备编号" prop="设备编号" >
-              <el-input v-model="form.设备编号" placeholder="设备编号" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span = "12">
-            <el-form-item label="设备型号" prop="设备型号" >
-              <el-input v-model="form.设备型号" placeholder="设备型号" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span = "12">
-            <el-form-item label="设备加工工艺" prop="设备加工工艺" >
-              <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" filterable size="small" style="width:200px" clearable >
-                <el-option
-                  v-for="item in processingName"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-show="false">
-          <el-col :span = "12">
-            <el-form-item label="设备加工能力" prop="设备加工能力" >
-              <el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span = "12">
-            <el-form-item label="设备性能指标" prop="设备性能指标" >
-              <el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-show="false">
-          <el-col :span = "12">
-            <el-form-item label="班次类型" prop="班次类型" >
-              <el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
-                <el-option
-                  v-for="item in typeOfShift"
-                  :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 v-model="form.设备工时系数" placeholder="设备工时系数" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-show="false">
-          <el-col :span = "12">
-            <el-form-item label="整改工时系数" prop="整改工时系数" >
-              <el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span = "12">
-            <el-form-item label="预留工时系数" prop="预留工时系数" >
-              <el-input v-model="form.预留工时系数" placeholder="预留工时系数" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <el-row>
+      <el-col style="width: 290px">
+        <el-card>
+          <el-row>
+            <el-button type="distribution" style="margin: 10px 10px 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
+            <el-button size="small" style="margin: 10px 10px 3px 0" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
+            <el-button size="small" style="margin: 10px 0 3px 0" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
+            <el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" highlight-current-row stripe border tooltip-effect="dark" style="width: 100%" height="600">
+              <el-table-column align="center" label=" " width="50px">
+                <template slot-scope="scope">
+                  <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
+                    {{ a }}
+                  </el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="工艺分类">
+                <template slot-scope="scope">
+                  {{ scope.row.工艺分类名称 }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col style="width: 550px;">
+        <el-card>
+          <el-button type="primary" plain style="margin: 10px 0 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
+          <el-table :data="tableData2" :row-key="getRowKeys" size="mini" highlight-current-row stripe border height="600" width="100%">
+            <!--<el-table-column type="expand" label="详情">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">-->
+            <!--<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">-->
+            <!--<el-tooltip effect="dark" content="编辑" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit-outline"-->
+            <!--@click="editTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--<el-tooltip effect="dark" content="删除" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--style="margin-left: 20px"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="delTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--</el-table>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column label="工艺名称" align="center" width="200">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工艺要求" align="center" width="200">
+              <template slot-scope="scope">
+                {{ scope.row.工艺要求 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-edit-outline" style="margin-left: 10px" @click="editProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="delProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <!--<el-button size="mini" type="primary" plain icon="el-icon-circle-plus-outline" @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>-->
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增工艺分类" center style="min-height: 300px" width="400px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
+        <el-form-item label="工艺分类" prop="ProcessClassification">
+          <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
+        </el-form-item>
       </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 @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form1')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
+        <el-form-item label="工艺分类" prop="ProcessClassification">
+          <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form1')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
+        <el-form-item label="工艺名称" prop="Process">
+          <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="工艺名称简称" prop="ProcessShort">
+          <el-input v-model="form2.ProcessShort" size="small" clearable style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form2')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
+        <el-form-item label="工艺名称" prop="Process">
+          <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="工艺名称简称" prop="ProcessShort">
+          <el-input v-model="form2.ProcessShort" size="small" clearable style="width:200px"/>
+        </el-form-item>
+        <el-form-item label="工艺要求" prop="Process">
+          <el-input v-model="form2.Requirement" size="small" clearable style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form2')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
+        <el-form-item label="工艺要求" prop="Process">
+          <el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form3')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
+        <el-form-item label="工艺要求" prop="TechnologicalRequirements">
+          <el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="calloff">取 消</el-button>
+        <el-button type="primary" @click="submit1('form3')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
-
 </template>
 
 <script>
-import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
-import { getNowTime } from '@/utils/tool'
+import { searchProcessClassification, searchProcessNameOfProcessClassification, searchTechnologicalRequirementsOfProcessNum, searchProcessClassificationOfProcessClassificationNum, addProcessClassification, editProcessClassification, delProcessClassification, addProcess, delProcess, editProcess, addTechnologicalRequirements, editTechnologicalRequirements, delTechnologicalRequirements } from '@/api/BasicData/WorkshopProcessMaintenance'
 export default {
   data() {
     return {
-      equipmentName: '', // 设备名称
-      List: [],
-      check: 0,
-      time: '',
-      pageCurrent: 1,
-      pageSize: 10,
-      total: null,
-      title: '',
-      dialogFormVisible: false,
-      processingName: [],
-      processing1: '', // 工艺名称简称
-      equipmentSerialNumber: '', // 设备流水号
-      typeOfShift: [
-        { value: '0', label: 0 },
-        { value: '1', label: 1 },
-        { value: '2', label: 2 },
-        { value: '3', label: 3 },
-        { value: '4', label: 4 }],
-      form: {
-        设备名称: '',
-        设备编号: '',
-        设备型号: '',
-        设备性能指标: '',
-        设备加工能力: '',
-        设备加工工艺: '',
-        班次类型: '',
-        设备工时系数: '',
-        整改工时系数: '',
-        预留工时系数: ''
+      // 工艺分类所需变量
+      a: '',
+      expands: [],
+      tableData1: [],
+      ProcessNum: '',
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      ProcessClassificationNum: '',
+      radio: null,
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      dialogFormVisible6: false,
+      temp: null,
+      ProcessClassificationNumS: '',
+      form1: {
+        ProcessClassification: ''
       },
-      rules: {
-        设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
-        设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
-        设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
-        设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
-        // 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
-        // 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
-        // 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
-        // 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
-        // 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
-      }
+      form2: {
+        Process: '',
+        ProcessShort: '',
+        Requirement: ''
+      },
+      form3: {
+        TechnologicalRequirements: ''
+      },
+      rules1: {
+        ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }]
+      },
+      rules2: {
+        Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }],
+        ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }]
+      },
+      rules3: {
+        TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }]
+      },
+      tableData2: [],
+      tableData3: [],
+      Num: [],
+      maxNum: '',
+      max: [],
+      code: ''
     }
   },
   created() {
-    this.initialization()
-    this.fetchData()
+    this.searchProcessClassification()
   },
   methods: {
-    fetchData() {
-      this.List = []
-      if (this.equipmentName !== '') {
-        this.check = 1
-      } else {
-        this.check = 0
-      }
-      getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
-        this.List = response.data
-        // this.total = response.data.total
+    searchProcessClassification() {
+      this.loading1 = true
+      searchProcessClassification().then(response => {
+        this.loading1 = false
+        this.tableData1 = response.data
+        this.total1 = response.data
+        return this.tableData1
+      }).then(data => {
+        this.Num = data
+        this.max = []
+        for (let i = 0; i < this.Num.length; i++) {
+          this.max.push(this.Num[i].工艺分类流水号)
+        }
+        return this.max
+      }).then(data => {
+        const a = data
+        this.maxNum = a[0]
+        for (let j = 0; j < a.length; j++) {
+          if (this.maxNum < a[j]) {
+            this.maxNum = a[j]
+          }
+        }
+        return this.maxNum
+      }).then(data => {
+        const b = data
+        this.radio = b
+        return this.radio
+      }).then(data => {
+        const c = data
+        this.loading2 = true
+        searchProcessNameOfProcessClassification(c).then(response => {
+          this.loading2 = false
+          this.tableData2 = response.data
+        })
       })
     },
-    initialization() {
-      initProcessing().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.processingName.push({
-            label: response.data[i].工艺名称,
-            value: response.data[i].工艺编号,
-            processing: response.data[i].工艺名称简称
-          })
+    addProcessClassification() {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.form1 = {}
+      this.dialogFormVisible1 = true
+      this.temp = 1
+    },
+    editProcessClassification() {
+      if (this.radio !== '') {
+        this.temp = 2
+        this.dialogFormVisible2 = true
+        searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => {
+          this.form1.ProcessClassification = response.data[0].工艺分类名称
+        })
+      } else {
+        this.$message.warning('请选择工艺分类')
+      }
+    },
+    submitProcessClassification() {
+      editProcessClassification(this.radio, this.form1.ProcessClassification).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息更新成功')
+          this.dialogFormVisible2 = false
+          this.searchProcessClassification()
+        } else {
+          this.$message.error('信息更新失败')
         }
       })
     },
-    handleAdd() {
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
-      this.title = '新增车间设备'
-      this.form = {
-        设备名称: '',
-        设备编号: '',
-        设备型号: '',
-        设备加工工艺: ''
-      }
-      this.form.设备性能指标 = 1
-      this.form.设备加工能力 = 1
-      this.form.班次类型 = 1
-      this.form.设备工时系数 = 1
-      this.form.整改工时系数 = 0
-      this.form.预留工时系数 = 0
-      this.dialogFormVisible = true
+    submitaddProcessClassification() {
+      addProcessClassification(this.form1.ProcessClassification).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('增加成功')
+          this.searchProcessClassification()
+          this.dialogFormVisible1 = false
+        } else { this.$message.error('增加失败') }
+      })
     },
-    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.form.设备加工能力 = row.设备加工能力工时
-      this.form.设备加工工艺 = parseInt(row.工艺属性代码)
-      this.form.班次类型 = row.班次类型
-      this.form.设备工时系数 = row.设备工时系数
-      this.form.整改工时系数 = row.整改工时比例
-      this.form.预留工时系数 = row.设备预留工时系数
-      this.equipmentSerialNumber = row.设备流水号
-    },
-    submit(formName) {
-      console.log(this.title)
+    submit1(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '增加') {
-            this.submitAdd()
-          } else if (this.title === '编辑') {
-            this.submitEdit()
+          if (this.temp === 1) {
+            this.submitaddProcessClassification()
+            this.form1 = {
+              ProcessClassification: ''
+            }
+            this.temp = null
+          } else if (this.temp === 2) {
+            this.submitProcessClassification()
+            this.form1 = {
+              ProcessClassification: ''
+            }
+            this.temp = null
+          } else if (this.temp === 3) {
+            this.submitaddProcess()
+            this.form2 = {
+              Process: '',
+              ProcessShort: ''
+            }
+            this.temp = null
+          } else if (this.temp === 4) {
+            this.submiteditProcess()
+            this.form2 = {
+              Process: '',
+              ProcessShort: '',
+              Requirement: ''
+            }
+            this.temp = null
+          } else if (this.temp === 5) {
+            this.submitTechnologicalRequirements()
+            this.form3 = {
+              TechnologicalRequirements: ''
+            }
+            this.temp = null
+          } else if (this.temp === 6) {
+            this.submiteditTechnologicalRequirements()
+            this.form3 = {
+              TechnologicalRequirements: ''
+            }
+            this.temp = null
           }
         }
       })
     },
-    submitAdd() {
-      for (let i = 0; i < this.processingName.length; i++) {
-        if (this.form.设备加工工艺 === this.processingName[i].value) {
-          this.processing1 = this.processingName[i].processing
-        }
+    delProcessClassification() {
+      if (this.radio !== '') {
+        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delProcessClassification(this.radio).then(response => {
+            if (response.data[0].result === '1') {
+              this.searchProcessClassification()
+              this.$message.success('删除成功')
+            } else {
+              this.$message.error('删除失败')
+            }
+          })
+        })
+      } else {
+        this.$message.warning('请选择工艺分类')
       }
-      addTable(this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.processing1, this.form.设备加工工艺, this.form.班次类型, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
+    },
+    calloff() {
+      this.dialogFormVisible1 = false
+      this.dialogFormVisible2 = false
+      this.dialogFormVisible3 = false
+      this.dialogFormVisible4 = false
+      this.dialogFormVisible5 = false
+      this.dialogFormVisible6 = false
+      this.form1 = {
+        ProcessClassification: ''
+      }
+      this.form2 = {
+        Process: '',
+        ProcessShort: ''
+      }
+      this.form3 = {
+        TechnologicalRequirements: ''
+      }
+    },
+    getCurrentRow(row) {
+      searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => {
+        this.form1.ProcessClassification = response.data[0].工艺分类名称
+      })
+      this.loading2 = true
+      searchProcessNameOfProcessClassification(row).then(response => {
+        this.loading2 = false
+        this.tableData2 = response.data
+      })
+    },
+    searchTechnologicalRequirementsOfProcessNum(row, expandedRows) {
+      // this.expands = []
+      // this.expands.push(row.工艺编号)
+      if (expandedRows.length > 1) {
+        expandedRows.shift()
+      }
+      this.loading3 = true
+      searchTechnologicalRequirementsOfProcessNum(row.工艺编号).then(response => {
+        this.loading3 = false
+        this.tableData3 = response.data
+      })
+    },
+    addProcess() {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      if (this.radio !== '') {
+        this.form2.Process = ''
+        this.form2.ProcessShort = ''
+        this.dialogFormVisible3 = true
+        this.temp = 3
+      } else {
+        this.$message.warning('请选择一个工艺分类')
+      }
+    },
+    submitaddProcess() {
+      addProcess(this.radio, this.form2.Process, this.form2.ProcessShort).then(response => {
         if (response.data[0].result === '1') {
-          this.$notify({
-            title: '成功',
-            message: '信息添加成功',
-            type: 'success'
+          this.$message.success('增加成功')
+          this.loading2 = true
+          searchProcessNameOfProcessClassification(this.radio).then(response => {
+            this.loading2 = false
+            this.tableData2 = response.data
           })
-          this.dialogFormVisible = false
-          this.fetchData()
+          this.dialogFormVisible3 = false
+        } else { this.$message.error('增加失败') }
+      })
+    },
+    editProcess(row) {
+      this.dialogFormVisible4 = true
+      this.temp = 4
+      this.form2.Process = row.工艺名称
+      this.form2.ProcessShort = row.工艺名称简称
+      this.ProcessNum = row.工艺编号
+    },
+    submiteditProcess() {
+      editProcess(this.ProcessNum, this.form2.Process, this.form2.ProcessShort, this.form2.Requirement).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息更新成功')
+          this.dialogFormVisible4 = true
+          searchProcessNameOfProcessClassification(this.radio).then(response => {
+            this.loading2 = false
+            this.tableData2 = response.data
+          })
+          this.dialogFormVisible4 = false
         } else {
-          this.$message.error('信息添加失败')
+          this.$message.error('信息更新失败')
         }
       })
     },
-    ADD() {
-      this.addForm('form')
-      this.dialogFormVisible = true
-      this.form.contractSigningDate = getNowTime()// new Date()
-      this.temp = 1
-      this.title = '增加'
+    getRowKeys(row) {
+      return row.工艺编号
     },
-    submitEdit() {
-      console.log(2323)
-      editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
+    delProcess(row) {
+      this.$confirm('此操作将永久删除' + row.工艺名称 + '行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delProcess(row.工艺编号).then(response => {
+          if (response.data[0].result === '1') {
+            this.loading2 = true
+            searchProcessNameOfProcessClassification(this.radio).then(response => {
+              this.loading2 = false
+              this.tableData2 = response.data
+            })
+            this.$message.success('删除成功')
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      })
+    },
+    addTechnologicalRequirements(row) {
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.ProcessNum = row.工艺编号
+      this.form3.TechnologicalRequirements = ''
+      this.dialogFormVisible5 = true
+      this.temp = 5
+    },
+    submitTechnologicalRequirements() {
+      if (this.form3.TechnologicalRequirements !== '') {
+        addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.loading3 = true
+            searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
+              this.loading3 = false
+              this.tableData3 = response.data
+            })
+            this.dialogFormVisible5 = false
+          } else { this.$message.error('增加失败') }
+        })
+      } else {
+        this.$message.error('请输入工艺要求')
+        this.dialogFormVisible5 = false
+      }
+    },
+    editTechnologicalRequirements(row) {
+      this.temp = 6
+      this.dialogFormVisible6 = true
+      this.form3.TechnologicalRequirements = row.工艺要求
+      this.code = row.工艺要求流水号
+      this.ProcessNum = row.工艺编号
+    },
+    submiteditTechnologicalRequirements() {
+      editTechnologicalRequirements(this.code, this.form3.TechnologicalRequirements).then(response => {
         if (response.data[0].result === '1') {
-          this.$notify({
-            title: '成功',
-            message: '信息编辑成功',
-            type: 'success'
+          this.$message.success('信息更新成功')
+          this.loading3 = true
+          searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
+            this.loading3 = false
+            this.tableData3 = response.data
           })
-          this.dialogFormVisible = false
-          this.title = ''
-          this.fetchData()
+          this.dialogFormVisible6 = false
         } else {
-          this.$message.error('信息编辑失败')
+          this.$message.error('信息更新失败')
         }
       })
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    handleDelete(row) {
+    delTechnologicalRequirements(row) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        if (this.List && this.List.length === 1 && this.pageCurrent > 1) {
-          this.pageCurrent--
-        }
-        deleteTable(row.设备流水号).then(response => {
+        delTechnologicalRequirements(row.工艺要求流水号).then(response => {
           if (response.data[0].result === '1') {
+            this.loading3 = true
+            searchTechnologicalRequirementsOfProcessNum(row.工艺编号).then(response => {
+              this.loading3 = false
+              this.tableData3 = response.data
+            })
             this.$message.success('删除成功')
-            this.fetchData()
-          } else { this.$message.error('删除失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+          } else {
+            this.$message.error('删除失败')
+          }
         })
       })
-    },
-    setUp() {
-      if (this.time !== '') {
-        setUp(this.time).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('设定成功')
-          } else { this.$message.error('设定失败') }
-        })
-      } else {
-        this.$message.warning('请选择有效时间')
-      }
-    },
-    generate() {
-      generate().then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('生成成功')
-        } else { this.$message.error('生成失败') }
-      })
-    },
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.pageCurrent = 1
-      this.fetchData()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.fetchData()
     }
   }
 }
 </script>
+
 <style scoped>
-  .el-card{
-    margin-bottom: 1px;
-  }
-  /*.el-button--success {*/
-  /*  background: #ecf5ff;*/
-  /*  border-color: #2d72d5;*/
-  /*  color: #2d72d5;*/
-  /*}*/
-  /*.el-button--primary {*/
-  /*  background: #fdf6ec;*/
-  /*  border-color: #ff9759;*/
-  /*  color: #ff9759;*/
-  /*}*/
+  /*.el-card {*/
+  /*  margin-top: 15px;*/
+  /*  margin-left: 15px;*/
+ /* }!**!*/
+
 </style>
 <style lang="scss">
-  .button111{
-    background:rgb(253,246,236);
-    border-color: #ff9759;
-    color: #ff9759;
-    &:hover{
-      background: #ff9759;
-      border-color: #ff9759;
-      color: white;
+  .subTableHeader {
+    th {
+      background: #8ff4ea !important;
+      color: black;
     }
-    &:focus{
-      background: #ff9759;
-      border-color: #ff9759;
-      color: white;
+
+    tr.el-table__row td {
+      background-color: #d8e5f6 !important;
+    }
+
+    tr.el-table__row.el-table__row--striped td {
+      background: #e9f0f9 !important;
     }
   }
 </style>
+
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index a22238ad..bb52fbef 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -113,7 +113,7 @@
         </el-table-column>
         <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-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</span>
             <span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
           </template>
         </el-table-column>
@@ -167,7 +167,7 @@
             <el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top" style="margin-left: 0px">
               <div style="display: inline-block">
                 <el-button
-                  :disabled="scope.row.是否禁用"
+                  :disabled="scope.row.是否禁用||Number(scope.row.未收金额) ===0"
                   size="mini"
                   type="text"
                   icon="el-icon-money"
@@ -419,7 +419,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-form-item label="保证金金额(万元)" prop="保证金金额">
+          <el-form-item label="转履约金额(万元)" prop="保证金金额">
             <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" :max="PerformanceBondform.保证金金额max" style="width: 200px" size="small"/>
           </el-form-item>
         </el-row>
@@ -609,7 +609,7 @@ export default {
         保证金金额: [{ 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' }]
       }
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 9b2e1617..8c4d1556 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -4,7 +4,7 @@
       <el-input v-model="ManufacturerName" clearable placeholder="外协厂家名称" size="small" style="width:200px;margin: 10px 0 3px 0;" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
       <el-button type="primary" size="small" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
       <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
-        <el-button type="distribution" icon="el-icon-circle-plus-outline" style="margin-left: 10px" size="small" @click="editType1('form');param = 0">新增</el-button>
+        <el-button type="distribution" icon="el-icon-circle-plus-outline" style="margin-left: 10px" size="small" @click="editType1('form');param = 0">外协厂家</el-button>
       </el-tooltip>
       <el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
         <el-table-column label="序号" align="center" type="index" width="50"/>
@@ -33,11 +33,6 @@
             {{ 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">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -94,20 +89,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="银行" prop="Fax">
-              <el-input v-model="form.Fax" placeholder="银行" clearable size="small"/>
+            <el-form-item label="备注" prop="Remarks">
+              <el-input v-model="form.Remarks" placeholder="备注" clearable size="small" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-show="FALSE">
           <el-col :span="12">
             <el-form-item label="设备情况" prop="EquipmentCondition">
               <el-input v-model="form.EquipmentCondition" placeholder="设备情况" clearable size="small"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="备注" prop="Remarks">
-              <el-input v-model="form.Remarks" placeholder="备注" clearable size="small" />
+            <el-form-item label="银行" prop="Fax">
+              <el-input v-model="form.Fax" placeholder="银行" clearable size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index be646140..2fdcd7c6 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-card>
       <div style="margin-top: 7px; margin-bottom: 7px">
-        <el-input v-model="supplierNameValue" size="small" placeholder="外协厂家或零件图号" style="width: 180px" clearable/>
-        <el-date-picker v-model="timer" type="daterange" value-format="yyyy-MM-dd" size="small" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
+        <el-input v-model="supplierNameValue" size="small" placeholder="外协厂家零件图号表单号项目名称" style="width: 220px" clearable/>
+        <el-date-picker v-model="timer" type="daterange" value-format="yyyy-MM-dd" size="small" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"/>
         <el-select v-model="MaterialsValue" placeholder="外协状态" filterable size="small" style="width: 120px" clearable>
           <el-option
             v-for="item in Materials"
@@ -138,7 +138,7 @@ export default {
       searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], 100000000, this.pageCurrent).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           this.tableData1.push({
-            到货状态: response.data.rows[i].到货状态,
+            到货状态: response.data.rows[i].到货状态 === '0' ? '未到' : '已到',
             项目名称: response.data.rows[i].项目名称,
             零件图号: response.data.rows[i].零件图号,
             零件名称: response.data.rows[i].零件名称,
@@ -147,7 +147,7 @@ export default {
             表单号: response.data.rows[i].表单号,
             工艺计划流水号: response.data.rows[i].工艺计划流水号,
             单件是否外协: response.data.rows[i].单件是否外协,
-            任务下达日期: response.data.rows[i].任务下达日期,
+            任务下达日期: response.data.rows[i].任务下达日期 ? response.data.rows[i].任务下达日期.split(' ')[0] : '',
             外协工序: ''
           })
         }
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 9a715fa3..59ed0f2c 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -4,6 +4,17 @@
       <el-row style="width: 1020px">
         <el-row>
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
+          <el-date-picker
+            v-model="startTime"
+            size="small"
+            type="daterange"
+            align="center"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            range-separator="～"
+            style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"/>
           <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="300" style="width: 690px;" border element-loading-text="拼命加载中" @row-click="rowClick">
@@ -45,18 +56,18 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-row>
-      <el-col style="width: 600px">
+      <el-col style="width: 520px">
         <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-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="400" style="width: 100%" border element-loading-text="拼命加载中">
-          <el-table-column label="发票号" prop="发票号" align="center" width="180px">
+          <el-table-column label="发票号" prop="发票号" align="center" width="160px">
             <template slot-scope="scope">
               {{ scope.row.发票号 }}
             </template>
           </el-table-column>
-          <el-table-column label="开票金额(元)" prop="开票金额" align="center" width="110px">
+          <el-table-column label="到票金额(元)" prop="到票金额" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.开票金额 }}
             </template>
@@ -66,7 +77,7 @@
               {{ scope.row.开票时间 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" fixed="right" width="200px">
+          <el-table-column align="center" label="操作" fixed="right" width="130px">
             <template slot-scope="scope">
               <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button>
               <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button>
@@ -85,10 +96,10 @@
             @current-change="handleCurrentChange2"/>
         </div>
       </el-col>
-      <el-col style="width: 420px">
+      <el-col style="width: 350px">
         <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-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="400" style="width: 100%" border element-loading-text="拼命加载中">
           <el-table-column label="付款金额(元)" prop="付款金额" align="center" width="110px">
@@ -101,7 +112,7 @@
               {{ scope.row.付款日期 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" fixed="right" width="200px">
+          <el-table-column align="center" label="操作" fixed="right" width="130px">
             <template slot-scope="scope">
               <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button>
               <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button>
@@ -209,6 +220,7 @@ export default {
       id_edit1: '',
       param1: 0,
       title1: '',
+      startTime: '',
       dialogFormVisible1: false,
       form1: {
         发票号: '',
@@ -242,9 +254,10 @@ export default {
       this.loading = true
       this.tableData = []
       var check
-      var check2 = 0
+      var check2
+      this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
       this.ManufacturerName ? check = 1 : check = 0
-      searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+      searchtable(check, this.ManufacturerName, check2, this.startTime[0], this.startTime[1], this.pageCurrent, this.pageSize).then(response => {
         this.loading = false
         if (response.data.rows.length !== 0) {
           this.tableData = response.data.rows
@@ -259,14 +272,16 @@ export default {
       this.tableData2 = []
       this.loading3 = true
       this.tableData3 = []
-      getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+      var check2
+      this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
+      getInvoice(row.外协厂家流水号, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
         this.loading2 = false
         if (response.data.rows.length !== 0) {
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }
       })
-      getPayment(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+      getPayment(row.外协厂家流水号, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
         this.loading3 = false
         if (response.data.rows.length !== 0) {
           this.tableData3 = response.data.rows
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 5482254d..afaf8490 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -35,11 +35,11 @@
     </el-card>
     <el-card>
       <el-col :span="8">
-        <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
-        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-input v-model="manufacturers" size="small" placeholder="外协厂家或表单号" style="width:160px" clearable @keyup.enter.native="fetchData()"/>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="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" border @row-click="searchProcess" >
+        <el-button type="distribution" size="mini" plain 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="550" size="mini" border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
             <template slot-scope="scope">
               {{ scope.row.表单号 }}
@@ -57,27 +57,16 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="block" style="margin-top: 10px;">
-          <el-pagination
-            v-show="!loading2"
-            :current-page="currentPage"
-            :page-sizes="[20, 30, 40]"
-            :page-size="pageSize"
-            :total="total"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"/>
-        </div>
       </el-col>
       <el-col :span="16">
         <div>
           <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
           <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
+            <el-button type="success" size="mini" icon="el-icon-upload2" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>
+            <el-button type="success" size="mini" icon="el-icon-tickets" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>
           </el-tooltip>
         </div>
         <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
@@ -103,7 +92,7 @@
           </el-table-column>
           <el-table-column label="外协价格" align="center" width="130px">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.加工价格_成交" size="small"/>
+              <el-input v-positive="'float'" v-model="scope.row.加工价格_成交" type="float" size="small"/>
             </template>
           </el-table-column>
           <el-table-column label="机加工开始时间" align="center" width="150px">
@@ -284,29 +273,18 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
     this.getList()
   },
   methods: {
     // 初始化查询
     fetchData() {
-      this.ManufacturerName = []
-      initOutHelp().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.ManufacturerName.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-        }
-      })
       this.loading2 = true
       this.List = []
       this.List3 = []
       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)
-        this.List = response.data.rows
+      getTable(this.num1, this.manufacturers, this.isChecked).then(response => {
+        this.List = response.data
       })
       this.loading2 = false
     },
@@ -326,6 +304,15 @@ export default {
     },
     // 查询未选入零件
     getList() {
+      this.ManufacturerName = []
+      initOutHelp().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ManufacturerName.push({
+            label: response.data[i].外协厂家名称,
+            value: response.data[i].外协厂家流水号
+          })
+        }
+      })
       this.partNumber ? this.check = 1 : this.check = 0
       this.loading1 = true
       this.List1 = []
@@ -349,7 +336,19 @@ export default {
       this.Number = row.外协加工任务单流水号
       this.ManufactorNumber = row.外协厂家流水号
       getParts(row.外协加工任务单流水号).then(response => {
-        this.List3 = response.data
+        if (response.data.length !== 0) {
+          for (let i = 0; i < response.data.length; i++) {
+            this.List3.push({
+              外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
+              加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
+              机加工开始时间: response.data[i].机加工开始时间,
+              零件图号: response.data[i].零件图号,
+              零件名称: response.data[i].零件名称,
+              批次数量: response.data[i].批次数量,
+              外协工序: response.data[i].外协工序
+            })
+          }
+        }
         this.loading = false
       })
     },
@@ -429,9 +428,11 @@ export default {
               message: '信息添加成功',
               type: 'success'
             })
-            this.dialogFormVisible = false
             this.title = ''
+            this.manufacturers = this.form.表单号
+            console.log(this.manufacturers, 111111)
             this.fetchData()
+            this.dialogFormVisible = false
           } else {
             this.$message.error('信息添加失败')
           }
@@ -451,7 +452,7 @@ export default {
     },
     // 删除任务单
     handleDelete(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+      this.$confirm('该表单外协任务将释放', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -499,6 +500,7 @@ export default {
           this.List3 = []
           getParts(this.Number).then(response => {
             this.List3 = response.data
+            this.getList()
             this.loading = false
           })
         })
@@ -574,7 +576,7 @@ export default {
     },
     // 移除
     handleDelete1(row) {
-      this.$confirm('此操作将移除该行, 是否继续?', '提示', {
+      this.$confirm('确定取消该条外协任务吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 3aa16475..857dbcd7 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -11,9 +11,20 @@
             <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
               <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
             </el-tooltip>
-            <el-table v-loading="loading1" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border stripe highlight-current-row style="width:795px ;margin-top:3px;" height="690" size="mini" @selection-change="handleSelectionChange">
+            <el-table
+              v-loading="loading1"
+              :data="tableData1"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
+              border
+              stripe
+              highlight-current-row
+              style="width:795px ;margin-top:3px;"
+              height="690"
+              size="mini"
+              @sort-change="sortChange"
+              @selection-change="handleSelectionChange">
               <el-table-column type="selection" align="center" width="45"/>
-              <el-table-column label="机床图号" prop="机床图号" width="120" align="center">
+              <el-table-column label="机床图号" prop="机床图号" width="120" sortable="custom" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
@@ -28,7 +39,7 @@
                   {{ scope.row.零件图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="零件名称" prop="零件名称" width="140" align="center" show-overflow-tooltip>
+              <el-table-column label="零件名称" prop="零件名称" width="140" sortable="custom" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.零件名称 }}
                 </template>
@@ -38,7 +49,7 @@
                   {{ scope.row.批次数量 }}
                 </template>
               </el-table-column>
-              <el-table-column label="材料" prop="材料" width="150" align="center" show-overflow-tooltip>
+              <el-table-column label="材料" prop="材料" width="150" sortable="custom" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.材料 }}
                 </template>
@@ -83,7 +94,7 @@
             <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
             <!--</el-tooltip>-->
             <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
-            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
+            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
               <el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
             </el-tooltip>
@@ -395,6 +406,8 @@ export default {
       pageCurrent: 1,
       pageSize: 10,
       total: null,
+      partName: '',
+      order: '',
       partDrawingNumber: '',
       Buyer: '',
       loading1: false,
@@ -482,10 +495,42 @@ export default {
   },
   created() {
     this.searchRawMaterial()
+    this.getCurrentTime()
+    this.searchTable2()
     // this.searchTable1()
     // this.searchTable2()
   },
   methods: {
+    getCurrentTime() {
+      this.dateRange = [this.getTime1(70), this.getTime0(0)]
+    },
+    getTime0(num) {
+      var date0 = new Date()
+      var date = new Date(date0.getTime() + num * 24 * 60 * 60 * 1000)
+      var month = this.zeroFill(date.getMonth() + 1)
+      var day = this.zeroFill(date.getDate())
+      var hour = this.zeroFill(date.getHours())
+      var minute = this.zeroFill(date.getMinutes())
+      var second = this.zeroFill(date.getSeconds())
+      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+    },
+    getTime1(num) {
+      var date0 = new Date()
+      var date = new Date(date0.getTime() - num * 24 * 60 * 60 * 1000)
+      var month = this.zeroFill(date.getMonth() + 1)
+      var day = this.zeroFill(date.getDate())
+      var hour = this.zeroFill(date.getHours())
+      var minute = this.zeroFill(date.getMinutes())
+      var second = this.zeroFill(date.getSeconds())
+      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+    },
+    zeroFill(i) {
+      if (i >= 0 && i <= 9) {
+        return '0' + i
+      } else {
+        return i
+      }
+    },
     // 获取原材料
     searchRawMaterial() {
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
@@ -562,6 +607,23 @@ export default {
         img.src = url
       })
     },
+    sortChange(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '零件名称') {
+        this.partName = 1
+      } else if (column.prop === '机床图号') { this.partName = 2 } else if (column.prop === '材料') {
+        this.partName = 3
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable1()
+    },
     fetchData() {
       initPartDrawing(0, this.partDrawingNumberValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -576,7 +638,7 @@ export default {
       this.loading1 = true
       this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0
       // this.pageCurrent1, this.pageSize1,
-      searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => {
+      searchPurchasedMaterials(this.check1, this.partDrawingNumber, this.order, this.partName).then(response => {
         this.tableData1 = response.data
         this.total1 = response.data.total
         this.loading1 = false
@@ -706,27 +768,15 @@ export default {
       }))
     },
     exportExcel2(row) {
-      this.searchTable3(row).then(val => {
-        console.log(row, 11111)
-        console.log(this.tableData4)
-        if (this.tableData4.length !== 0) {
-           import('@/vendor/Export2Excel').then(excel => {
-             const tHeader = ['备料状态', '物料编码', '零件名称', '材料', '数量', '成品尺寸', '单位', '备注']
-             const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '总数量', '成品尺寸', '单位', '备注1']
-             const list = this.tableData4
-             const data = this.formatJson(filterVal, list)
-             excel.export_json_to_excel({
-               header: tHeader,
-               data,
-               filename: row.采购单名称 + '-' + row.计划完成日期,
-               autoWidth: true,
-               bookType: 'xlsx'
-             })
-           })
-        } else {
-          this.$message.warning('没有导出内容')
-        }
-      })
+      if (this.tableData4.length !== 0) {
+        var param = []
+        param[0] = ['采购计划流水号', row.采购计划流水号]
+        param[1] = ['供应商', row.供应商名称]
+        var Data = this.CreateData('2001', '报表_备料管理_采购计划明细_查询数据', param)
+        this.exportExcel_NPOI(Data)
+      } else {
+        this.$message.warning('暂无数据')
+      }
     },
     searchTable3(row) { // 查询采购计划明细
       this.purchasingOrderNumber = row.采购计划流水号
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 9c03e274..e2b3cfeb 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -4,35 +4,33 @@
       <div style="white-space: nowrap">
         <el-card style="width: 1329px;">
           <div>
-            <span style="margin-left: 10px">供应商:</span>
-            <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">
+            <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="searchTable4()">
               <el-option
                 v-for="item in supplierName"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-            <span>请款时间段:</span>
             <el-date-picker
               v-model="dateRange"
               :picker-options="pickerOptions"
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px;margin: 3px 0"
+              style="width: 240px"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
-            <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+            <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable4()">查询</el-button>
             <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
+            <el-button type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
           </div>
         </el-card>
-        <el-card style="width: 660px;margin-left: 0px;display: inline-block">
-          <span>到货单</span>
-          <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5">
-            <el-table-column label="关联情况" align="center" width="80">
+        <el-card style="width: 650px;margin-left: 0px;display: inline-block">
+          <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 650px" height="260px" size="mini" highlight-current-row @row-click="searchTable5">
+            <el-table-column label="进程" align="center" width="80">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
                 <span v-else type="primary" size="mini">未结算</span>
@@ -73,21 +71,8 @@
             <!--</template>-->
             <!--</el-table-column>-->
           </el-table>
-          <div class="block">
-            <el-pagination
-              :current-page="pageCurrent4"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize4"
-              :total="total4"
-              style="display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange4"
-              @current-change="handleCurrentChange4"/>
-          </div>
         </el-card>
-        <el-card style="width: 660px;margin-left: 3px;display: inline-block;vertical-align: top">
-          <span>到货单明细</span>
-          <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
+        <el-card style="width: 670px;margin-left: 3px;display: inline-block;vertical-align: top">
           <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
           <el-table
             v-loading=""
@@ -117,12 +102,12 @@
                 {{ scope.row.单位 }}
               </template>
             </el-table-column>
-            <el-table-column label="单价" align="right" width="80">
+            <el-table-column label="单价(元)" align="right" width="80">
               <template slot-scope="scope">
                 {{ scope.row.单价.toFixed(2) }}
               </template>
             </el-table-column>
-            <el-table-column label="金额" align="right" width="80">
+            <el-table-column label="金额(元)" align="right" width="95">
               <template slot-scope="scope">
                 {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
               </template>
@@ -144,7 +129,6 @@
           </el-table>
         </el-card>
         <el-card style="width: 1329px">
-          <span>关联备料材料</span>
           <el-table
             v-loading=""
             :data="tableData6"
@@ -152,7 +136,7 @@
             border
             show-summary
             highlight-current-row
-            style="margin: 3px 0; width: 1280px"
+            style="margin: 3px 0; width: 1310px"
             height="500px"
             size="mini">
             <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150">
@@ -175,22 +159,22 @@
                 {{ scope.row.数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="240">
-              <template slot-scope="scope">
-                {{ scope.row.成品尺寸 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="总重量" align="center" prop="总重量" width="100">
-              <template slot-scope="scope">
-                {{ scope.row.重量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="单位" align="center" width="70" >
+            <el-table-column label="单位" align="center" width="110" >
               <template slot-scope="scope">
                 {{ scope.row.单位 }}
               </template>
             </el-table-column>
-            <el-table-column label="总金额" align="center" prop="总金额" width="130">
+            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="210">
+              <template slot-scope="scope">
+                {{ scope.row.成品尺寸 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="重量小计(KG)" align="center" prop="总重量" width="130">
+              <template slot-scope="scope">
+                {{ scope.row.重量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="金额小计(KG)" align="center" prop="总金额" width="130">
               <template slot-scope="scope">
                 {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
               </template>
@@ -212,24 +196,23 @@
           </el-table>
         </el-card>
 
-        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="380px">
+        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
           <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
-            <el-row>
-              <el-form-item label="供应商" prop="supplierNameValue">
-                <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" size="small" filterable @change="searchTable20()">
-                  <el-option
-                    v-for="item in supplierNames"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"/>
-                </el-select>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="到货日期" prop="invoiceTime">
-                <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
-              </el-form-item>
-            </el-row>
+            <el-form-item label="到货单号">
+              <el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
+            </el-form-item>
+            <el-form-item label="供应商" prop="supplierNameValue">
+              <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
+                <el-option
+                  v-for="item in supplierNames"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="到货日期" prop="invoiceTime">
+              <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button
@@ -321,37 +304,37 @@
                       {{ scope.row.物料零件编码 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="零件名称" align="center" width="90px">
+                  <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="70px">
+                  <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="70px">
+                  <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="70px">
+                  <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="110px">
+                  <el-table-column label="到货数" align="center" width="120px">
                     <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
                     </template>
                   </el-table-column>
-                  <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
+                  <el-table-column label="到货重量" align="center" width="120px" prop="到货重量">
                     <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
                     </template>
                   </el-table-column>
-                  <el-table-column label="成品尺寸（长、宽、高）" align="center">
+                  <el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
                     <template slot-scope="scope">
                       {{ scope.row.成品尺寸 }}
                     </template>
@@ -458,24 +441,24 @@
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="备料件数" align="center" width="70px">
+            <el-table-column label="备料数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.采购数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="已到件数" align="center" width="70px">
+            <el-table-column label="已到数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.到货数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="到货件数" align="center" width="110px">
+            <el-table-column label="到货数" align="center" width="120px">
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="到货重量" align="center" width="110px">
+            <el-table-column label="到货重量" align="center" width="120px">
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
               </template>
             </el-table-column>
             <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -504,7 +487,7 @@
 </template>
 <script>
 import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,
-  searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel } from '@/api/WorkshopProcurement/NewArrivalList.js'
+  searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel, searchNewOrder } from '@/api/WorkshopProcurement/NewArrivalList.js'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -592,6 +575,7 @@ export default {
       pageCurrent4: 1,
       pageSize4: 10,
       tableData5: [],
+      NewOrder: '',
       到货单流水号: '',
       中间变量: '',
       form: {
@@ -666,9 +650,40 @@ export default {
   created() {
     this.fetchdata()
     this.searchTable2()
+    this.getCurrentTime()
     // this.searchTable4()
   },
   methods: {
+    getCurrentTime() {
+      this.dateRange = [this.getTime1(30), this.getTime0(0)]
+    },
+    getTime0(num) {
+      var date0 = new Date()
+      var date = new Date(date0.getTime() + num * 24 * 60 * 60 * 1000)
+      var month = this.zeroFill(date.getMonth() + 1)
+      var day = this.zeroFill(date.getDate())
+      var hour = this.zeroFill(date.getHours())
+      var minute = this.zeroFill(date.getMinutes())
+      var second = this.zeroFill(date.getSeconds())
+      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+    },
+    getTime1(num) {
+      var date0 = new Date()
+      var date = new Date(date0.getTime() - num * 24 * 60 * 60 * 1000)
+      var month = this.zeroFill(date.getMonth() + 1)
+      var day = this.zeroFill(date.getDate())
+      var hour = this.zeroFill(date.getHours())
+      var minute = this.zeroFill(date.getMinutes())
+      var second = this.zeroFill(date.getSeconds())
+      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+    },
+    zeroFill(i) {
+      if (i >= 0 && i <= 9) {
+        return '0' + i
+      } else {
+        return i
+      }
+    },
     saveData(row) {
       var a = 0
       this.tableData30.map(v => {
@@ -748,8 +763,8 @@ export default {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
-        if (index === 1) {
-          sums[index] = '总重量：'
+        if (index === 0) {
+          sums[index] = '小计'
           return
         } else if (index === 2) {
           const values = data.map(item => Number(item['数量']))
@@ -769,9 +784,6 @@ export default {
         } else if (index === 3) {
           sums[index] = 'KG'
           return
-        } else if (index === 4) {
-          sums[index] = '总金额：'
-          return
         } else if (index === 5) {
           const values = data.map(item => Number(item['金额']))
           if (!values.every(value => isNaN(value))) {
@@ -799,7 +811,7 @@ export default {
           sums[index] = '未绑定重量：'
           return
         } else if (index === 4) {
-          sums[index] = this.未绑定数量
+          sums[index] = this.未绑定数量 + ' KG'
         } if (index === 5) {
           sums[index] = '绑定重量：'
           return
@@ -814,7 +826,7 @@ export default {
                 return parseInt(Number(prev) * 100) / 100
               }
             }, 0)
-            sums[index]
+            sums[index] += ' KG'
           } else {
             sums[index] = 'N/A'
           }
@@ -851,28 +863,26 @@ export default {
       } else {
         this.check2 = 0
       }
-      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
-        this.tableData4 = response.data.rows
-        this.total4 = response.data.total
-      })
+      if ((this.supplierNameValue !== '' && this.supplierNameValue !== null) || this.dateRange !== '') {
+        searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1]).then(response => {
+          this.tableData4 = response.data
+        })
+      } else {
+        this.tableData4 = []
+        this.$message.warning('请填入查询条件')
+      }
     },
     Calculation() {
       this.form10.金额 = this.form10.单价 * this.form10.数量
     },
-    handleSizeChange4(val) { // 采购单列表分页
-      this.pageSize4 = val
-      this.pageCurrent4 = 1
-      this.searchTable4()
-    },
-    handleCurrentChange4(val) { // 采购单列表分页
-      this.pageCurrent4 = val
-      this.searchTable4()
-    },
     // 创建采购单
     addArrivalOrder() {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
+      searchNewOrder().then(response => {
+        this.NewOrder = response.data[0].到货单号
+      })
       this.title = '新增到货单'
       this.form.备注 = ''
       this.form.supplierNameValue = ''
@@ -894,8 +904,6 @@ export default {
           addPurchaseOrder(this.form.备注, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建到货单成功')
-              this.pageCurrent4 = 1
-              this.pageSize4 = 10
               this.searchTable4()
               this.dialogVisible = false
             } else { this.$message.error('新建到货单失败') }
@@ -1168,12 +1176,16 @@ export default {
       })
     },
     downloadExcel() {
-      var param = []
-      param[0] = ['到货单流水号', this.num1]
-      param[1] = ['编号', this.num2]
-      param[2] = ['供应商', this.sup]
-      var Data = this.CreateData('12', '报表_备料管理_到货单明细查询', param)
-      this.exportExcel_NPOI(Data)
+      if (this.num1) {
+        var param = []
+        param[0] = ['到货单流水号', this.num1]
+        param[1] = ['编号', this.num2]
+        param[2] = ['供应商', this.sup]
+        var Data = this.CreateData('2001', '报表_备料管理_到货单明细查询', param)
+        this.exportExcel_NPOI(Data)
+      } else {
+        this.$message.warning('请先选择到货单')
+      }
     }
   }
 }
@@ -1218,6 +1230,25 @@ export default {
     right: 15px;
     top: 5px;
   }
+  .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>
   .el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 708412eb..f8e287db 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -1,279 +1,191 @@
 <template>
-  <div class="app-container">
-    <el-card style="width: 1137px">
-      <span>机床号：</span>
-      <el-select v-model="Machine" filterable clearable size="small" style="width: 150px;" placeholder="机床号" @change="getGroup">
-        <el-option
-          v-for="item in Machines"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
-        </el-option>
-      </el-select>
-      <span>组号：</span>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 120px;" @change="getTableData">
-        <el-option
-          v-for="item in Groups"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>零件号：</span>
-      <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
-      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
-    </el-card>
-    <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="55"/>
-        <el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" width="220">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--<div class="block">-->
-      <!--<el-pagination-->
-      <!--:current-page="pageCurrent10"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="pageSize10"-->
-      <!--:total="total10"-->
-      <!--style="display:inline-block;width:50%"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--@size-change="handleSizeChange10"-->
-      <!--@current-change="handleCurrentChange10"/>-->
-      <!--</div>-->
-    </el-card>
-    <el-card style="width: 1137px">
-      <span>离线备料单号:</span>
-      <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
-      <span style="margin-left: 10px">供应商:</span>
-      <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable @change="searchTable">
-        <el-option
-          v-for="item in supplierNames"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
-      <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
-      <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
-      <!--</el-tooltip>-->
-      <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
-    </el-card>
-    <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
-        <el-table-column label="采购状态" prop="采购计划状态" align="center" width="90">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
-            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
-            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="离线采购计划编号" align="center" width="200">
-          <template slot-scope="scope">
-            {{ scope.row.离线采购计划编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="离线采购计划名称" align="center" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.离线采购计划名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" width="250" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="下单日期" prop="下单日期" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.下单日期.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="290">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
-              <div style="display: inline-block">
-                <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--<div class="block">-->
-      <!--<el-pagination-->
-      <!--:current-page="pageCurrent2"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="pageSize2"-->
-      <!--:total="total2"-->
-      <!--style="display:inline-block;width:50%"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--@size-change="handleSizeChange2"-->
-      <!--@current-change="handleCurrentChange2"/>-->
-      <!--</div>-->
-    </el-card>
-    <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
-        <el-table-column label="采购状态" align="center" width="90">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
-            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
-            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="物料编码" prop="物料零件编码" align="center" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.物料零件编码 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" width="160">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" prop="材料" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" prop="数量" width="100px">
-          <template slot-scope="scope">
-            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.数量" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="成品尺寸（长、宽、高）" align="center" width="160px">
-          <template slot-scope="scope">
-            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="备注" width="220px">
-          <template slot-scope="scope">
-            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100px">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card style="width: 1137px">
-      <div id="WGBLD" style="width: 1037px;margin: 0 auto">
-        <table cellspacing="0px" align="center" border="1 solid black" width="100%">
-          <tr style="height: 60px">
-            <th colspan="12"><h3>江苏高精机电装备有限公司</h3></th>
-          </tr>
-          <tr style="height: 40px">
-            <th colspan="12"><h4>{{ 采购单名称 }}</h4></th>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
-            <td colspan="4" style="text-align: center;width: 35%">{{ 下单单位 }}</td>
-            <td colspan="2" style="text-align: center;width: 15%">单号</td>
-            <td colspan="4" style="text-align: center;width: 35%">{{ 单号 }}</td>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
-            <td colspan="4" style="text-align: center;width: 35%">{{ 下单日期 }}</td>
-            <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
-            <td colspan="4" style="text-align: center;width: 35%">{{ 计划完成日期 }}</td>
-          </tr>
-        </table>
-        <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
-          <tr id="tablehead" style="height: 35px">
-            <td style="text-align: center;width: 7%">序号</td>
-            <td colspan="2" style="text-align: center;width: 20%">物料编码</td>
-            <td colspan="2" style="text-align: center;width: 10%">名称</td>
-            <td colspan="2" style="text-align: center;width: 10%">材料</td>
-            <td colspan="2" style="text-align: center;width: 8%">数量</td>
-            <td colspan="2" style="text-align: center;width: 20%">成品尺寸（长、宽、高）</td>
-            <td style="text-align: center;width: 17%">备注</td>
-          </tr>
-          <tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
-            <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
-            <td colspan="2" style="text-align: center;width: 20%">{{ list.物料零件编码 }}</td>
-            <td colspan="2" style="text-align: center;width: 10%">{{ list.零件名称 }}</td>
-            <td colspan="2" style="text-align: center;width: 10%">{{ list.材料 }}</td>
-            <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
-            <td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
-            <td style="text-align: center;width: 17%">{{ list.备注 }}</td>
-          </tr>
-        </table>
-        <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
+  <div>
+    <div style="width: 100%;overflow:auto">
+      <div style="white-space: nowrap">
+        <el-card style="margin-left: 0px;width:820px; display: inline-block;height: 745px">
+          <el-col>
+            <el-select v-model="Machine" filterable clearable size="small" style="width: 150px;margin-top: 3px" placeholder="机床图号" @change="getGroup">
+              <el-option
+                v-for="item in Machines"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                <div style="float: left">{{ item.label }}</div>
+                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+              </el-option>
+            </el-select>
+            <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 120px;" @change="getTableData">
+              <el-option
+                v-for="item in Groups"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
+            <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="getTableData()">查询</el-button>
+            <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="690px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" align="center" width="55"/>
+              <el-table-column label="机床图号" prop="机床图号" width="120" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="组号" prop="组号" width="80" sortable="custom" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.组号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="180">
+                <template slot-scope="scope">
+                  {{ scope.row.零件图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="零件名称" align="center" width="140">
+                <template slot-scope="scope">
+                  {{ scope.row.零件名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="数量" align="center" width="70">
+                <template slot-scope="scope">
+                  {{ scope.row.批次数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="材料" prop="材料" align="center" sortable="custom" width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.材料 }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-card>
+        <el-card style="margin-left: 1px;width:1120px; display: inline-block;">
+          <div> <!--slot="header"-->
+            <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
+            <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px;margin-top: 3px" clearable/>
+            <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 200px" filterable clearable @change="searchTable">
+              <el-option
+                v-for="item in supplierNames"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
+            <el-button type="distribution" size="small" plain icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">采购计划单</el-button>
+            <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
+            <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
+            <!--</el-tooltip>-->
+            <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
+          </div>
+          <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
+            <el-table-column label="进程" prop="采购计划状态" align="center" width="70">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
+                <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+                <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="离线备料计划编号" align="center" width="140">
+              <template slot-scope="scope">
+                {{ scope.row.离线采购计划编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="离线备料名称" align="center" width="160">
+              <template slot-scope="scope">
+                {{ scope.row.离线采购计划名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="供应商" align="center" width="200" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="下单日期" prop="下单日期" align="center" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.下单日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="240">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
+                  <div style="display: inline-block">
+                    <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--<div class="block">-->
+          <!--<el-pagination-->
+          <!--:current-page="pageCurrent2"-->
+          <!--:page-sizes="[10, 20, 30, 40]"-->
+          <!--:page-size="pageSize2"-->
+          <!--:total="total2"-->
+          <!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
+          <!--layout="total, sizes, prev, pager, next, jumper"-->
+          <!--@size-change="handleSizeChange2"-->
+          <!--@current-change="handleCurrentChange2"/>-->
+          <!--</div>-->
+          <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;margin-top: 10px" height="455px" size="mini">
+            <el-table-column label="进程" align="center" width="70">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+                <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+                <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="140" show-overflow-tooltip>
+              <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="材料" prop="材料" align="center" width="95">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" prop="数量" width="100px">
+              <template slot-scope="scope">
+                <el-input v-positive="'int'" :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.数量" size="mini" type="int" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
+              <template slot-scope="scope">
+                <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="备注" min-width="100px">
+              <template slot-scope="scope">
+                <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="90px" fixed="right">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
       </div>
-    </el-card>
-    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="520px">
-      <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="150px">
-        <el-form-item label="离线采购计划名称" prop="离线采购计划名称">
-          <el-input v-model="form2.离线采购计划名称" size="small"/>
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplierNameValue">
-          <el-select v-model="form2.supplierNameValue" placeholder="供应商" size="small" filterable>
-            <el-option
-              v-for="item in supplierNames"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          v-show="title2==='创建离线采购计划'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitAddPurchaseOrder">确定</el-button>
-        <el-button
-          v-show="title2==='编辑离线采购计划'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitEditPurchaseOrder">确定</el-button>
-      </div>
-    </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -443,7 +355,7 @@ export default {
     getTableData() {
       this.tableData10 = []
       if (!this.Machine && !this.Group && !this.number) {
-        this.$message.error('请输入筛选条件！')
+        this.$message.warning('请输入筛选条件！')
         return
       }
       if (this.Machine === '') {
@@ -497,7 +409,7 @@ export default {
     searchTable() {
       this.tableData = []
       if (!this.purchasingOrder && !this.supplierName) {
-        this.$message.error('请输入筛选条件！')
+        this.$message.warning('请输入筛选条件！')
         return
       }
       this.purchasingOrder ? this.check3 = 1 : this.check3 = 0
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 83310a04..6a740620 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -74,7 +74,7 @@
             {{ scope.row.开票时间 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="开票金额(元)" width="100px">
+        <el-table-column align="center" label="开票金额(元)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.开票金额.toFixed(2) }}
           </template>
@@ -153,7 +153,7 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" align="center" width="120" prop="到货金额">
+        <el-table-column label="金额(元)" align="center" width="100" prop="到货金额">
           <template slot-scope="scope">
             {{ scope.row.到货金额.toFixed(2) }}
           </template>
@@ -165,7 +165,7 @@
                 <el-button
                   type="text"
                   size="mini"
-                  icon="el-icon-delete"
+                  icon="el-icon-right"
                   @click="deleteTable10(scope.row)"/>
               </div>
             </el-tooltip>
@@ -173,7 +173,7 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="新增备料到票" center style="min-height: 300px" width="800px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
         <div style="width: 45%;float: left;margin-top: 5px">
           <div style="background: white">
@@ -186,14 +186,14 @@
                   :value="item.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="发票号" prop="money">
+            <el-form-item label="发票号">
               <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
             </el-form-item>
             <el-form-item label="到票时间" prop="invoiceTime">
               <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
             </el-form-item>
-            <el-form-item label="到票金额" prop="money">
-              <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
+            <el-form-item label="到票金额(元)" prop="money">
+              <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="开票金额"/>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form1.remark" size="small"/>
@@ -213,7 +213,7 @@
                 {{ scope.row.日期.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="金额" align="center">
+            <el-table-column label="金额(元)" align="center">
               <template slot-scope="scope">
                 {{ scope.row.到货金额.toFixed(2) }}
               </template>
@@ -223,8 +223,37 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
-        <el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
+        <el-button size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="编辑备料到票" center style="height: 600px" width="400px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
+        <el-form-item label="供应商" prop="supplierNameValue">
+          <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
+            <el-option
+              v-for="item in supplierNames"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发票号" prop="money">
+          <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
+        </el-form-item>
+        <el-form-item label="到票时间" prop="invoiceTime">
+          <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
+        </el-form-item>
+        <el-form-item label="到票金额(元)" prop="money">
+          <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="开票金额"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form1.remark" size="small"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -241,15 +270,14 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center">
+        <el-table-column label="金额(元)" align="center">
           <template slot-scope="scope">
             {{ scope.row.到货金额.toFixed(2) }}
           </template>
         </el-table-column>
       </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button>
-      </div>
+      <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+      <el-button type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">关联到货单</el-button>
     </el-dialog>
   </div>
 </template>
@@ -300,6 +328,7 @@ export default {
       invoiceNum: '',
       invoiceTime: '',
       Name: '',
+      SUM: 0.00,
       arrest: [],
       pageCurrent1: 1,
       pageSize1: 30,
@@ -319,6 +348,7 @@ export default {
       supplierNames: [],
       dialogVisible: false,
       dialogVisible1: false,
+      dialogVisible2: false,
       title1: '',
       form1: {
         supplierNameValue: '',
@@ -329,7 +359,8 @@ export default {
         remark: ''
       },
       rules1: {
-        supplierNameValue: [{ required: true, message: '请选择供应商' }]
+        supplierNameValue: [{ required: true, message: '请选择供应商' }],
+        money: [{ required: true, message: '请填写到票金额' }]
       }
     }
   },
@@ -440,7 +471,6 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '新增备料到票'
       this.tableData4 = []
       this.dialogVisible1 = true
       console.log(this.supplierNames)
@@ -480,14 +510,13 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.title1 = '编辑备料到票'
-      this.dialogVisible1 = true
+      this.dialogVisible2 = true
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间
       this.form1.money = row.开票金额
       this.form1.Number = row.发票号
       this.form1.remark = row.备注
-      this.form1.supplierNameValue = row.供应商
+      this.form1.supplierNameValue = parseInt(row.供应商)
       if (row.开票时间 === '1900/1/1') {
         this.form1.invoiceTime = null
       }
@@ -499,7 +528,7 @@ export default {
           editInvoice(this.form1.invoiceNumValue, this.form1.invoiceTime, this.form1.money, this.form1.Number, this.form1.remark, this.form1.supplierNameValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
-              this.dialogVisible1 = false
+              this.dialogVisible2 = false
               this.searchTable1()
             } else { this.$message.error('编辑失败') }
           })
@@ -536,6 +565,10 @@ export default {
       this.searchTable4()
     },
     handleSelectionChange(val) {
+      this.SUM = 0
+      for (let i = 0; i < val.length; i++) {
+        this.SUM += parseFloat(val[i].到货金额).toFixed(2)
+      }
       this.arrest = val
     },
     // 选入
@@ -584,7 +617,7 @@ export default {
       var param = []
       param[0] = ['发票流水号', row.发票流水号]
       param[1] = ['供应商', row.供应商名称]
-      var Data = this.CreateData('12', '报表_备料管理_发票明细_查询数据', param)
+      var Data = this.CreateData('2001', '报表_备料管理_发票_查询数据', param)
       this.exportExcel_NPOI(Data)
       // const _ExcelDownLoad = ExcelDownLoad
       // this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 28e87173..eee1c839 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -10,7 +10,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 180px" clearable/>
-        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px" clearable>
+        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px;margin-left: 10px" clearable>
           <el-option
             v-for="item in Materials"
             :key="item.value"
@@ -30,8 +30,8 @@
           range-separator="～"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
+        <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 10px" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+        <el-button type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
     <el-card style="width: 100%">
@@ -43,7 +43,7 @@
         stripe
         size="mini"
         style="width: 100%"
-        height="760"
+        height="750"
         @sort-change="sortChange">
         <el-table-column
           label="序号"
@@ -51,8 +51,10 @@
           type="index"
           width="50"/>
         <el-table-column
-          label="备料状态"
+          label="进程"
           align="center"
+          prop="进程"
+          sortable="custom"
           width="80px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
@@ -73,7 +75,7 @@
         <el-table-column
           label="物料编码"
           align="center"
-          min-width="180px">
+          width="180px">
           <template slot-scope="scope">{{ scope.row.物料编码 }}</template>
         </el-table-column>
         <el-table-column
@@ -92,12 +94,12 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
-        <el-table-column label="备料件数" align="center" width="70">
+        <el-table-column label="备料件数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.采购数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="100">
+        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="120">
           <template slot-scope="scope">
             {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
           </template>
@@ -105,7 +107,7 @@
         <el-table-column
           label="到货件数"
           align="center"
-          width="70">
+          width="100">
           <template slot-scope="scope">{{ scope.row.到货数量 }}</template>
         </el-table-column>
         <el-table-column
@@ -136,7 +138,7 @@
 </template>
 
 <script>
-import { searchSupplier, searchTable, searchTablesheet } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
+import { searchSupplier, searchTable } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
 export default {
   name: 'Index',
   data() {
@@ -204,31 +206,38 @@ export default {
       }))
     },
     exportExcel() {
-      let check, check1, check2, check3
-      this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
-      this.supplierNameValue ? check = 1 : check = 0
-      this.partNumber ? check1 = 1 : check1 = 0
-      if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
-        check2 = 1
+      if (this.tableData.length !== 0) {
+        let check, check1, check2, check3
+        this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
+        this.supplierNameValue ? check = 1 : check = 0
+        this.partNumber ? check1 = 1 : check1 = 0
+        if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
+          check2 = 1
+        } else {
+          check2 = 0
+        }
+        var param = []
+        param[0] = ['供应商流水号_check', check]
+        param[1] = ['供应商流水号', this.supplierNameValue]
+        param[2] = ['零件图号_check', check1]
+        param[3] = ['零件图号', this.partNumber]
+        param[4] = ['备料状态_check', check2]
+        param[5] = ['备料状态', this.MaterialsValue]
+        param[6] = ['下单时间_check', check3]
+        if (check3 === 0) {
+          param[7] = ['开始时间', '']
+          param[8] = ['结束时间', '']
+        } else {
+          param[7] = ['开始时间', this.dateRange[0]]
+          param[8] = ['结束时间', this.dateRange[1]]
+        }
+        param[9] = ['排序名称', this.ordername]
+        param[10] = ['排序方式', this.order]
+        var Data = this.CreateData('2001', '报表_备料管理_外购备料_综合查询数据', param)
+        this.exportExcel_NPOI(Data)
       } else {
-        check2 = 0
+        this.$message.warning('暂无数据')
       }
-      searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(res => {
-        console.log(res.data, 11)
-        import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备料件数', '备料时间', '到货件数', '到货时间', '结算时间']
-          const filterVal = ['备料状态', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间']
-          const list = res.data
-          const data = this.formatJson(filterVal, list)
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: '外购备料',
-            autoWidth: true,
-            bookType: 'xlsx'
-          })
-        })
-      })
     },
     fetchData() {
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
@@ -251,6 +260,8 @@ export default {
         this.ordername = 3
       } else if (column.prop === '下单日期') {
         this.ordername = 4
+      } else if (column.prop === '进程') {
+        this.ordername = 5
       } else {
         this.ordername = ''
       }
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 09deef39..2b0c68b7 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -4,21 +4,19 @@
       <div style="white-space: nowrap">
         <el-card style="width: 1663px">
           <el-col>
-            <span>请款时间段:</span>
+            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
             <el-date-picker
               v-model="dateRange"
               :picker-options="pickerOptions"
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px;margin: 3px 0"
+              style="width: 240px;margin-left: 10px"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
-            <span style="margin-left: 10px">供应商:</span>
-            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
             <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
               <el-button
                 type="primary"
@@ -32,7 +30,7 @@
               <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</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: 10px 0 0 130px" @click="exportExcel">导出</el-button>
+              <el-button type="success" plain class="el-icon-download" size="small" style="margin: 10px 0 10px 130px" @click="exportExcel">导出</el-button>
             </el-tooltip>
           </el-col>
         </el-card>
@@ -66,7 +64,7 @@
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
+            <el-table-column label="请款金额(元)" align="center" min-width="90" width="90" prop="请款金额">
               <template slot-scope="scope">
                 {{ parseFloat(scope.row.请款金额).toFixed(2) }}
               </template>
@@ -75,10 +73,10 @@
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
                 <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
-                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
+                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">未通过</span>
               </template>
             </el-table-column>
-            <el-table-column label="未通过审批原因" width="120" align="center">
+            <el-table-column label="未通过原因" width="120" align="center">
               <template slot-scope="scope">
                 {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
               </template>
@@ -86,8 +84,8 @@
             <el-table-column label="付款情况" width="100" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
-                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
-                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
+                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已付</span>
+                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">未付</span>
               </template>
             </el-table-column>
             <el-table-column label="未付款原因" width="100" align="center">
@@ -120,21 +118,26 @@
         <el-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
           <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
             <el-table-column width="50" align="center" type="index" label="序号"/>
-            <el-table-column min-width="120" align="center" label="发票号">
+            <el-table-column width="120" align="center" label="发票号">
               <template slot-scope="scope">
                 {{ scope.row.发票号 }}
               </template>
             </el-table-column>
-            <el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
+            <el-table-column width="170" align="center" label="供应商" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
+            <el-table-column align="center" label="到票金额(元)" width="90px" prop="到票金额">
               <template slot-scope="scope">
                 {{ scope.row.开票金额.toFixed(2) }}
               </template>
             </el-table-column>
+            <el-table-column label="到票时间" align="center" width="90">
+              <template slot-scope="scope">
+                {{ scope.row.开票时间 | formatTime }}
+              </template>
+            </el-table-column>
           </el-table>
         </el-card>
         <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
@@ -158,12 +161,12 @@
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="开票金额" align="center" min-width="70">
+            <el-table-column label="到票金额(元)" align="center" min-width="90">
               <template slot-scope="scope">
                 {{ scope.row.开票金额 }}
               </template>
             </el-table-column>
-            <el-table-column label="开票时间" align="center" min-width="70">
+            <el-table-column label="到票时间" align="center" min-width="70">
               <template slot-scope="scope">
                 {{ scope.row.开票时间 | formatTime }}
               </template>
@@ -280,7 +283,7 @@ export default {
       param[2] = ['结束时间', this.dateRange[1]]
       param[3] = ['供应商名称_check', this.check2]
       param[4] = ['供应商名称', this.supplierName0]
-      var Data = this.CreateData('03', '报表_备料管理_请款_查询数据', param)
+      var Data = this.CreateData('2001', '报表_备料管理_请款_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
     // dateFormat(row, column) {