diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index 988f2114..3f1c2a98 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -15,34 +15,6 @@ export function initOutHelp() {
     }
   })
 }
-// 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 初始化获取外协厂家数据
-export function getData1() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 初始化获取已预算价格，未选入到外协加工任务单的零件
 export function getTable1(check, partNumber) {
   return request({
@@ -52,11 +24,41 @@ export function getTable1(check, partNumber) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_外协_新',
+      name: '车间生产管理工艺_外协任务执行_未选入零件_查询',
       param: '零件图号_check=' + check + '=int&零件图号=' + partNumber + '=string'
     }
   })
 }
+// 初始化获取已生成的外协加工任务单
+export function getTable(checked, contractNumber, check, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
+      param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询任务单明细
+export function getParts(Number) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据',
+      param: '外协加工任务单流水号=' + Number
+    }
+  })
+}
+
 // 打回
 export function getBack(processPlan) {
   return request({
@@ -71,59 +73,45 @@ export function getBack(processPlan) {
     }
   })
 }
-// 获取零件工序信息（零件号表中）
-export function getprocedure(processPlan, single) {
+// 选入零件
+export function insertParts(processNum, Number) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新',
-      param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_选入_循环执行',
+      param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum
     }
   })
 }
-// 外协厂家查询
-export function searchManufactor(check, name) {
+// 计算价格
+export function getPrice(Number, money) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件',
-      param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string'
+      type: '2',
+      name: '车间生产管理工艺_外协加工任务单_保存_循环执行',
+      param: '外协加工任务单明细流水号组=' + Number + '&加工价格_成交组=' + money
     }
   })
 }
-// 确定价格
-export function spareParts(processNum, single) {
+// 成交
+export function editData1(Number, manufacturers, freight, Explain) {
   return request({
     url: '',
     method: 'post',
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=21=int&单件是否外协=' + single + '=int'
-    }
-  })
-}
-// 暂未启用
-export function spareParts1(processNum, single) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_全部_新',
-      param: '工艺计划流水号=' + processNum + '=int&工序数量=31=int&单件是否外协=' + single + '=int'
+      type: '2',
+      name: '车间生产管理_外协加工任务单_修改数据',
+      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
     }
   })
 }
@@ -155,20 +143,6 @@ export function editData(Number, manufacturers, freight, Explain) {
     }
   })
 }
-// 成交
-export function editData1(Number, manufacturers, freight, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&单据状态=2&入库标志=1&扣款说明=' + Explain + '&扣款_质量=0&扣款_计划=0&扣款_其他=0'
-    }
-  })
-}
 // 删除外协加工任务单
 export function deleteData(Number) {
   return request({
@@ -197,34 +171,7 @@ export function deleteData1(Number) {
     }
   })
 }
-// 选入零件
-export function insertParts(processNum, Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_增加数据',
-      param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
-    }
-  })
-}
-// 查询任务单明细
-export function getParts(Number) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '车间生产管理_外协加工任务单明细_查询数据',
-      param: '外协加工任务单流水号=' + Number + '=int'
-    }
-  })
-}
+
 // 数据库生产表单号
 export function getNumber(time) {
   return request({
@@ -239,17 +186,3 @@ export function getNumber(time) {
     }
   })
 }
-// 计算价格
-export function getPrice(Number, money, money1, money2, money3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '车间生产管理_外协加工任务单明细_修改数据',
-      param: '外协加工任务单明细流水号=' + Number + '=int&加工价格_预算=' + money + '&加工价格_成交=' + money1 + '&材料价格_价格=' + money2 + '&其他价格=' + money3 + '&入库标志=1=int&交检数量=0=int&合格数量=0=int&回用数量=0=int&废品数量=0=int'
-    }
-  })
-}
diff --git a/src/utils/request.js b/src/utils/request.js
index 1aaa917f..0a04c177 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` //
 export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
+export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 09a2e50c..ecb3de1b 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -32,7 +32,7 @@
     </el-card>
     <el-tabs type="border-card" @tab-click="selectPart">
       <el-tab-pane label="基本件">
-        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1140px" height="300px" @selection-change="handleSelectionChange">
+        <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange">
           <el-table-column align="center" width="50" type="selection"/>
           <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -64,7 +64,7 @@
               {{ 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>
@@ -119,7 +119,7 @@
               {{ 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>
@@ -169,7 +169,7 @@
               {{ 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>
@@ -473,7 +473,7 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件数量" width="70">
+        <el-table-column align="center" label="零件数量" width="80">
           <template slot-scope="scope">
             {{ scope.row.零件数量 }}
           </template>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index d5329d35..d468574a 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -5,21 +5,8 @@
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
       <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="getList()">查询</el-button>
       <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
-      <el-table
-        v-loading="loading1"
-        ref="multipleTable"
-        :data="List1"
-        border
-        size="mini"
-        stripe
-        highlight-current-row
-        height="350"
-        tooltip-effect="dark"
-        style="width: 100%;margin-top: 20px"
-        @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"/>
+      <el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="350" style="width: 100%;margin-top: 20px" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"/>
         <el-table-column label="项目名称" prop="项目名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -40,36 +27,6 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="材料费" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.材料费 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="分类" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.外协分类 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="投产" align="center" width="65px" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.传递时间_短 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="计划结束" align="center" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.计划结束时间_短 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="预算" align="center" >-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ (scope.row.外协预算总价格).toFixed(2) }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="零件类型" align="center" width="">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.是否临时件 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="外协工序" align="center" show-overflow-tooltip min-width="150px">
           <template slot-scope="scope">
             {{ scope.row.外协工序 }}
@@ -127,143 +84,43 @@
         <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
-              {{ 零件图号[scope.$index] }}
+              {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
           <el-table-column label="零件名称" align="center" min-width="120px">
             <template slot-scope="scope">
-              {{ 零件名称[scope.$index] }}
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协工序" align="center" min-width="120px">
+            <template slot-scope="scope">
+              {{ scope.row.外协工序 }}
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center" width="60px">
             <template slot-scope="scope">
-              {{ 批次数量[scope.$index] }}
+              {{ scope.row.批次数量 }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="预算(加工)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 外协预算总价格[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="外协价格" align="center" width="130px">
             <template slot-scope="scope">
-              <el-input v-model="加工价格_成交[scope.$index]" size="small"/>
+              <el-input v-model="scope.row.加工价格_成交" size="small"/>
             </template>
           </el-table-column>
-          <!--<el-table-column label="材料类别" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 外协分类[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="预算(材料)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 材料费[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="成交(材料)" align="center" width="130px">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="材料价格_价格[scope.$index]" size="small"/>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="其他价格" align="center" width="120px">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="其他价格[scope.$index]" size="small"/>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <el-table-column label="计划开始" align="center" width="100px">
+          <el-table-column label="机加工开始时间" align="center" width="150px">
             <template slot-scope="scope">
-              {{ (机加工开始时间[scope.$index]) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="计划结束" align="center" width="100px">
-            <template slot-scope="scope">
-              {{ (机加工结束时间[scope.$index]) }}
+              {{ scope.row.机加工开始时间 }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.$index)">移出</el-button>
+              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-card>
-    <el-card v-show="false">
-      <div id="RWD">
-        <table cellspacing="0px" align="center" width="100%" style="">
-          <tbody id="1">
-            <tr>
-              <td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
-              <td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="2">任务单号:</td>
-              <td colspan="5">{{ 任务单号 }}</td>
-              <td colspan="5">下达日期:</td>
-              <td colspan="5">{{ 任务下达日期 }}</td>
-              <td colspan="3">外协厂家:</td>
-              <td colspan="8">{{ 外协厂家 }}</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="1">外协员:</td>
-              <td colspan="3">{{ 外协员 }}</td>
-              <td colspan="4">电话:</td>
-              <td colspan="6">{{ 外协员电话 }}</td>
-              <td colspan="3">联系人:</td>
-              <td colspan="3">{{ 联系人 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="6">{{ 联系人电话 }}</td>
-            </tr>
-            <tr id="tableHead">
-              <td style="width: 2%">序号</td>
-              <td colspan="5">零件图号</td>
-              <td colspan="2" style="width: 4%">零件名称</td>
-              <td colspan="2" style="width: 2%">数量</td>
-              <td colspan="9" width="30%">内容</td>
-              <!--<td colspan="1">零件类型</td>-->
-              <!--<td>外协类别</td>-->
-              <td>外协价格</td>
-              <!--<td>材料价格</td>-->
-              <!--<td>其他价格</td>-->
-              <td colspan="2">计划开始</td>
-              <td colspan="2">计划结束</td>
-            </tr>
 
-          </tbody>
-          <tfoot>
-            <tr id="tableFoot">
-              <td>费用</td>
-              <td colspan="27" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；人民币大写：{{ 大写金额 }}</td>
-              <!--；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元-->
-              <!--<td colspan="1">0</td>-->
-              <!--<td colspan="1"/>-->
-              <!--<td/>-->
-              <!--<td>{{ 加工价格合计 }}</td>-->
-              <!--<td>{{ 材料价格合计 }}</td>-->
-              <!--<td>{{ 其他价格合计 }}</td>-->
-              <!--<td colspan="2">{{ 最早时间 }}</td>-->
-              <!--<td colspan="2">{{ 最晚时间 }}</td>-->
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-    </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
-      <div align="center">
-        <el-input v-model="input" size="small" clearable style="width:200px"/>
-        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="searchData()">查询</el-button>
-      </div>
-      <el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
-        <el-table-column label="外协厂家" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div align="center" style="margin-top: 10px">
-        <el-button type="warning" size="small" icon="el-icon-edit-outline" @click="submit1">提交</el-button>
-      </div>
-    </el-dialog>
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
         <el-form-item label="表单号" prop="表单号" style="margin-left: 70px">
@@ -288,9 +145,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <!--<el-input v-model="form.外协厂家" readonly placeholder="外协厂家" size="small" style="width:200px" clearable>-->
-          <!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>-->
-          <!--</el-input>-->
         </el-form-item>
         <el-form-item v-show="false" label="运费" prop="运费" style="margin-left: 70px">
           <el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
@@ -305,12 +159,9 @@
 </template>
 
 <script>
-import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
-import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
-import { convertCurrency } from '@/vendor/int2Chinese'
+import { initOutHelp, getTable, getTable1, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
 import { mapGetters } from 'vuex'
 import elInput from 'element-ui/packages/input'
-import $ from 'jquery'
 
 export default {
   components: {
@@ -318,6 +169,7 @@ export default {
   },
   data() {
     return {
+      工艺计划流水号: [],
       isChecked: false,
       bianliang: [],
       card: false,
@@ -362,7 +214,6 @@ export default {
       ManufactorNumber1: null,
       manufacturers: '',
       dialogFormVisible: false,
-      dialogFormVisible1: false,
       data2: [],
       List: [],
       money: null,
@@ -372,7 +223,7 @@ export default {
       result: 0,
       documentStatus: null,
       sign: null,
-      Number: null,
+      Number: '',
       form: {
         表单号: '',
         下达任务日期: '',
@@ -438,21 +289,7 @@ export default {
     this.getList()
   },
   methods: {
-    exportTable() {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        const htmlNode = $('#RWD').html()
-        const body = $('body')
-        body.children().hide()
-        const printNode = $(htmlNode)
-        body.append(printNode)
-        window.print()
-        body.children().not('script').show()
-        body.children().not('#app').hide()
-        printNode.remove()
-      }
-    },
+    // 初始化查询
     fetchData() {
       this.ManufacturerName = []
       initOutHelp().then(response => {
@@ -464,210 +301,60 @@ export default {
         }
       })
       this.loading2 = true
-      var day3 = new Date(this.time)
-      var day4 = new Date(this.time)
-      day3.setTime(day3.getTime() - 24 * 60 * 60 * 1000)
-      day4.setTime(day4.getTime() + 24 * 60 * 60 * 1000)
-      var month1 = day3.getMonth() + 1
-      var month2 = day4.getMonth() + 1
-      var day1 = day3.getDate()
-      var day2 = day4.getDate()
-      if (month1 >= 1 && month1 <= 9) {
-        month1 = '0' + month1
-      }
-      if (day1 >= 1 && day1 <= 9) {
-        day1 = '0' + day1
-      }
-      if (month2 >= 1 && month2 <= 9) {
-        month2 = '0' + month2
-      }
-      if (day2 >= 1 && day2 <= 9) {
-        day2 = '0' + day2
-      }
-      this.time1 = day3.getFullYear() + '/' + month1 + '/' + day1
-      this.time2 = day4.getFullYear() + '/' + month2 + '/' + day2
-      if (this.formNumber !== '') {
-        this.num = 1
-      } else {
-        this.num = 0
-      }
-      if (this.manufacturers !== '') {
-        this.num1 = 1
-      } else {
-        this.num1 = 0
-      }
-      if (this.time === '' || this.time === null) {
-        this.num2 = 0
-      } else {
-        this.num2 = 1
-      }
-      if (this.documentStatus === '' || this.documentStatus === null) {
-        this.num3 = 0
-      } else {
-        this.num3 = 1
-      }
-      if (this.time1 === 'NaN/NaN/NaN') {
-        this.time1 = ''
-      }
-      if (this.time2 === 'NaN/NaN/NaN') {
-        this.time2 = ''
-      }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3, this.isChecked).then(response => {
+      this.Number = ''
+      this.manufacturers ? this.num1 = 1 : this.num1 = 0
+      getTable(this.num1, this.manufacturers, this.isChecked, this.currentPage, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].任务下达日期 !== null) {
-            response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
-          }
-        }
         this.List = response.data.rows
       })
       this.loading2 = false
     },
-    // 查询
+    // 表3合计
+    getSummaries(param) {
+      const { data } = param
+      const sums = ['', '', 0, 0, '', '']
+      sums[0] = '合计'
+      for (let i = 0; i < data.length; i++) {
+        sums[3] += parseInt(data[i].批次数量)
+      }
+      for (let i = 0; i < data.length; i++) {
+        sums[4] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
+      }
+      sums[4] = Math.round(sums[3] * 100) / 100 + ' 元'
+      return sums
+    },
+    // 查询未选入零件
+    getList() {
+      this.partNumber ? this.check = 1 : this.check = 0
+      this.loading1 = true
+      this.List1 = []
+      getTable1(this.check, this.partNumber).then(response => {
+        this.List1 = response.data
+        this.loading1 = false
+      })
+    },
+    // 表1多选
+    handleSelectionChange(val) {
+      this.processNum = val
+      this.工艺计划流水号 = []
+      for (let i = 0; i < val.length; i++) {
+        this.工艺计划流水号.push(val[i].工艺计划流水号)
+      }
+    },
+    // 点击表2 查询表3
     searchProcess(row) {
-      this.任务单号 = row.表单号
-      this.任务下达日期 = row.任务下达日期
-      this.外协厂家 = row.外协厂家
-      this.外协员 = row.外协计划员
-      // 以上是新增的
-      this.contrast = 3000000000000
-      this.contrast1 = 0
       this.loading = true
       this.List3 = []
-      this.bianliang = []
-      this.零件图号 = []
-      this.零件名称 = []
-      this.批次数量 = []
-      this.外协预算总价格 = []
-      this.加工价格_成交 = []
-      this.外协分类 = []
-      this.材料费 = []
-      this.材料价格_价格 = []
-      this.其他价格 = []
-      this.机加工开始时间 = []
-      this.机加工结束时间 = []
-      this.外协加工任务单明细流水号 = []
-      this.process = []
-      this.freight = row.运费
-      this.ManufactorNumber = row.外协厂家流水号
       this.Number = row.外协加工任务单流水号
-      getParts(this.Number).then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-        }
-        this.returns = data
-        this.List3 = data
-        this.加工价格合计 = 0
-        this.材料价格合计 = 0
-        this.其他价格合计 = 0
-        if (response.data.length !== 0) {
-          this.外协员电话 = response.data[0].联系电话
-          this.联系人 = response.data[0].联系人
-          this.联系人电话 = response.data[0].电话
-          this.运费 = response.data[0].运费
-          this.card = true
-        } else {
-          this.card = false
-        }
-        const children = document.getElementsByClassName('tableData')
-        const parent = document.getElementById('1')
-        if (children.length !== 0) {
-          for (let i = children.length - 1; i >= 0; i--) {
-            parent.removeChild(children[i])
-          }
-        }
-        const tr = []
-        for (let i = 0; i < this.returns.length; i++) {
-          tr[i] = document.createElement('tr')
-          tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-              '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td colspan="2"></td><td colspan="2"></td>'
-          $('#tableHead').after(tr[i])
-        }
-        for (let j = 0; j < this.returns.length; j++) {
-          console.log(document.getElementsByClassName('tableData')[j].children)
-          document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-          document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-          document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-          // document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-          // document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-          // document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-          // document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-          if (response.data[j].机加工开始时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-          }
-          if (response.data[j].机加工结束时间 !== null) {
-            document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-          }
-          this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[5].innerHTML)
-          // this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-          // this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-        }
-        this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-        this.大写金额 = convertCurrency(this.总计)
-        // RWD end
-        if (response.data.length === 0) {
-          this.loading = false
-        }
-        for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-          this.零件图号.push(response.data[i].零件图号)
-          this.零件名称.push(response.data[i].零件名称)
-          this.批次数量.push(response.data[i].批次数量)
-          this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-          this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-          this.外协分类.push(response.data[i].外协分类)
-          this.材料费.push(response.data[i].材料费.toFixed(2))
-          this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-          this.其他价格.push(response.data[i].其他价格.toFixed(2))
-          if (response.data[i].机加工开始时间 !== null) {
-            this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-          } else {
-            this.机加工开始时间.push(' ')
-          }
-          if (response.data[i].机加工结束时间 !== null) {
-            this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-          } else {
-            this.机加工结束时间.push(' ')
-          }
-          this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-          this.process[i] = []
-        }
-        for (let i = 0; i < this.returns.length; i++) {
-          spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-            for (let k = 0; k < response.data.length; k++) {
-              this.process[i][k] = response.data[k].工艺名称简称
-              document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-            }
-          }).then(() => {
-            // this.bianliang.push(this.returns[i])
-          })
-        }
-      }).then(() => {
-        // this.List3 = this.bianliang
+      this.ManufactorNumber = row.外协厂家流水号
+      getParts(row.外协加工任务单流水号).then(response => {
+        this.List3 = response.data
         this.loading = false
       })
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.title === '新增外协任务单') {
-            this.submitAdd()
-          } else if (this.title === '编辑外协任务单') {
-            this.submitEdit()
-          }
-        }
-      })
-    },
+    // 新增外协任务单
     handleAdd() {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
@@ -690,6 +377,46 @@ export default {
       this.form.外协厂家 = ''
       this.dialogFormVisible = true
     },
+    // 编辑外协任务单
+    handleEdit(row) {
+      if (this.$refs['form'] !== undefined) {
+        this.$refs['form'].resetFields()
+      }
+      this.title = '编辑外协任务单'
+      this.dialogFormVisible = true
+      this.form.表单号 = row.表单号
+      this.form.运费 = row.运费
+      this.form.外协厂家 = row.外协厂家
+      this.form.下达任务日期 = row.任务下达日期
+      this.ManufactorNumber1 = row.外协厂家流水号
+      this.Number = row.外协加工任务单流水号
+      if (row.入库标志 === null) {
+        this.sign = 1
+      }
+      if (row.单据状态 === '未成交') {
+        this.documentStatus = 1
+      } else {
+        this.documentStatus = 2
+      }
+    },
+    // 提交
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.title === '新增外协任务单') {
+            this.submitAdd()
+          } else if (this.title === '编辑外协任务单') {
+            this.submitEdit()
+          }
+        }
+      })
+    },
+    // 关闭
+    callOff(formName) {
+      this.dialogFormVisible = false
+      this.$refs[formName].resetFields()
+    },
+    // 提交新增
     submitAdd() {
       this.form.运费 = parseInt(this.form.运费)
       if (isNaN(this.form.运费)) {
@@ -712,434 +439,6 @@ export default {
         })
       }
     },
-    getList() {
-      if (this.partNumber !== '') {
-        this.check = 1
-      } else {
-        this.check = 0
-      }
-      this.loading1 = true
-      getTable1(this.check, this.partNumber).then(response => {
-        this.List1 = []
-        for (let j = 0; j < response.data.length; j++) {
-          this.List1.push({
-            项目名称: response.data[j].项目名称,
-            零件图号: response.data[j].零件图号,
-            零件名称: response.data[j].零件名称,
-            批次数量: response.data[j].批次数量,
-            加工价格_成交: response.data[j].加工价格_成交,
-            材料价格_价格: response.data[j].材料价格_价格,
-            其他价格: response.data[j].其他价格,
-            材料费: response.data[j].材料费,
-            外协分类: response.data[j].外协分类,
-            外协预算总价格: response.data[j].外协预算总价格,
-            传递时间_短: response.data[j].传递时间_短,
-            计划结束时间_短: response.data[j].计划结束时间_短,
-            是否临时件: response.data[j].是否临时件,
-            工艺计划流水号: response.data[j].工艺计划流水号,
-            单件是否外协: response.data[j].单件是否外协,
-            外协工序: ''
-          })
-        }
-        this.loading1 = false
-        this.getProcedure(this.List1)
-      })
-    },
-    getProcedure(row) {
-      for (let i = 0; i < row.length; i++) {
-        getprocedure(row[i].工艺计划流水号, row[i].单件是否外协).then(response => {
-          this.procedure[i] = ''
-          for (let j = 0; j < response.data.length; j++) {
-            this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
-          }
-          this.List1[i].外协工序 = this.procedure[i]
-        })
-      }
-    },
-    onFocus1() {
-      this.dialogFormVisible1 = true
-      this.input = ''
-      getData1().then(response => {
-        this.List2 = response.data
-      })
-    },
-    handleCurrentChange3(row) {
-      if (this.param === 0) {
-        this.name1 = row.外协厂家名称
-      } else {
-        this.form.外协厂家 = row.外协厂家名称
-        this.ManufactorNumber1 = row.外协厂家流水号
-      }
-    },
-    submit1() {
-      this.dialogFormVisible1 = false
-      this.manufacturers = this.name1
-    },
-    getSummaries(param) {
-      const { data } = param
-      const sums = ['', '', 0, 0, '', '']
-      sums[0] = '合计'
-      // sums[2] = '加工费:'
-      // sums[4] = '材料费:'
-      // sums[6] = '其他费用:'
-      // sums[8] = '运费:'
-      // sums[9] = parseInt(this.freight)
-      // sums[10] = '合计:'
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[24] += Math.round(parseFloat(data[i].外协预算总价格) * 100) / 100
-      // }
-      // sums[24] = Math.round(sums[24] * 100) / 100
-      for (let i = 0; i < data.length; i++) {
-        sums[2] += parseInt(data[i].批次数量)
-      }
-      for (let i = 0; i < data.length; i++) {
-        sums[3] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
-      }
-      sums[3] = Math.round(sums[3] * 100) / 100 + ' 元'
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[27] += Math.round(parseFloat(data[i].材料费) * 100) / 100
-      // }
-      // sums[27] = Math.round(sums[27] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[28] += Math.round(parseFloat(data[i].材料价格_价格) * 100) / 100
-      // }
-      // sums[28] = Math.round(sums[28] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   sums[29] += Math.round(parseFloat(data[i].其他价格) * 100) / 100
-      // }
-      // sums[29] = Math.round(sums[29] * 100) / 100
-      // for (let i = 0; i < data.length; i++) {
-      //   if (data[i].机加工开始时间 !== null) {
-      //     if (Date.parse(data[i].机加工开始时间) <= this.contrast) {
-      //       this.contrast = Date.parse(data[i].机加工开始时间)
-      //       sums[30] = data[i].机加工开始时间.substr(0, 10)
-      //       this.最早时间 = data[i].机加工开始时间.substr(0, 10)
-      //     }
-      //   }
-      // }
-      // for (let i = 0; i < data.length; i++) {
-      //   if (data[i].机加工结束时间 !== null) {
-      //     if (Date.parse(data[i].机加工结束时间) >= this.contrast1) {
-      //       this.contrast1 = Date.parse(data[i].机加工结束时间)
-      //       sums[31] = data[i].机加工结束时间.substr(0, 10)
-      //       this.最晚时间 = data[i].机加工结束时间.substr(0, 10)
-      //     }
-      //   }
-      // }
-      // sums[3] = sums[25]
-      // sums[5] = sums[28]
-      // sums[7] = sums[29]
-      // sums[11] = Math.round((sums[3] + sums[5] + sums[7] + sums[9]) * 100) / 100
-      // sums[26] = '---'
-      return sums
-    },
-    // 计算价格
-    calculatingPrice() {
-      this.code = 0
-      for (let i = 0; i < this.List3.length; i++) {
-        this.加工价格_成交[i] = (this.外协预算总价格[i] * (1 - this.money / 100)).toFixed(2)
-        getPrice(this.外协加工任务单明细流水号[i], this.外协预算总价格[i], this.加工价格_成交[i], this.材料价格_价格[i], this.其他价格[i]).then(response => {
-          this.code = this.code + parseInt(response.data[0].result)
-          if (this.code === this.List3.length) {
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              const data = response.data
-              for (let i = 0; i < data.length; i++) {
-                data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-              }
-              this.returns = data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              // RWD end
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3 = this.returns
-                  this.money = null
-                  this.loading = false
-                })
-              }
-            })
-          }
-        })
-      }
-    },
-    // 确定价格
-    confirmPrice() {
-      this.code1 = 0
-      for (let i = 0; i < this.List3.length; i++) {
-        getPrice(this.外协加工任务单明细流水号[i], this.外协预算总价格[i], this.加工价格_成交[i], this.材料价格_价格[i], this.其他价格[i]).then(response => {
-          this.code1 = this.code1 + parseInt(response.data[0].result)
-          if (this.code1 === this.List3.length) {
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              const data = response.data
-              for (let i = 0; i < data.length; i++) {
-                data[i].差价 = data[i].外协预算总价格 * 1.15.toFixed(2) + data[i].材料费 * 1.15.toFixed(2) - data[i].加工价格_成交.toFixed(2) - data[i].材料价格_价格.toFixed(2) - data[i].其他价格.toFixed(2)
-              }
-              this.returns = data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              // RWD end
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3 = this.returns
-                  this.loading = false
-                })
-              }
-            })
-          }
-        })
-      }
-    },
-    // 成交
-    Deal() {
-      this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        editData1(this.Number, this.ManufactorNumber, this.freight, this.Explain).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('提交成功')
-            this.fetchData()
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            this.card = false
-          } else { this.$message.error('提交失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消提交'
-        })
-      })
-    },
-    handleEdit(row) {
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
-      this.title = '编辑外协任务单'
-      this.dialogFormVisible = true
-      this.form.表单号 = row.表单号
-      this.form.运费 = row.运费
-      this.form.外协厂家 = row.外协厂家
-      this.form.下达任务日期 = row.任务下达日期
-      this.ManufactorNumber1 = row.外协厂家流水号
-      this.Number = row.外协加工任务单流水号
-      if (row.入库标志 === null) {
-        this.sign = 1
-      }
-      if (row.单据状态 === '未成交') {
-        this.documentStatus = 1
-      } else {
-        this.documentStatus = 2
-      }
-    },
     // 提交编辑
     submitEdit() {
       editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
@@ -1151,6 +450,7 @@ export default {
         } else { this.$message.error('编辑失败') }
       })
     },
+    // 删除任务单
     handleDelete(row) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -1175,149 +475,7 @@ export default {
         })
       })
     },
-    handleDelete1(index) {
-      this.$confirm('此操作将移除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteData1(this.外协加工任务单明细流水号[index]).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('移除成功')
-            this.getList()
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.loading = true
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
-            getParts(this.Number).then(response => {
-              this.returns = response.data
-              this.加工价格合计 = 0
-              this.材料价格合计 = 0
-              this.其他价格合计 = 0
-              if (response.data.length !== 0) {
-                this.外协员电话 = response.data[0].联系电话
-                this.联系人 = response.data[0].联系人
-                this.联系人电话 = response.data[0].电话
-                this.运费 = response.data[0].运费
-                this.card = true
-              } else {
-                this.loading = false
-                this.card = false
-              }
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementById('1')
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              for (let i = 0; i < this.returns.length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                    '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                $('#tableHead').after(tr[i])
-              }
-              for (let j = 0; j < this.returns.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                if (response.data[j].机加工开始时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                }
-                if (response.data[j].机加工结束时间 !== null) {
-                  document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                }
-                this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-              }
-              this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-              this.大写金额 = convertCurrency(this.总计)
-              if (response.data.length === 0) {
-                this.loading = false
-              }
-              for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                this.零件图号.push(response.data[i].零件图号)
-                this.零件名称.push(response.data[i].零件名称)
-                this.批次数量.push(response.data[i].批次数量)
-                this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                this.外协分类.push(response.data[i].外协分类)
-                this.材料费.push(response.data[i].材料费.toFixed(2))
-                this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                if (response.data[i].机加工开始时间 !== null) {
-                  this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                } else {
-                  this.机加工开始时间.push(' ')
-                }
-                if (response.data[i].机加工结束时间 !== null) {
-                  this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                } else {
-                  this.机加工结束时间.push(' ')
-                }
-                this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                this.process[i] = []
-              }
-              for (let i = 0; i < this.returns.length; i++) {
-                spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                  for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                    this.process[i].push(response.data[k].工艺名称简称)
-                    document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                  }
-                }).then(() => {
-                  this.List3.push(this.returns[i])
-                  this.loading = false
-                })
-              }
-            })
-          } else { this.$message.error('移除失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    searchData() {
-      if (this.input !== '') {
-        this.check = 1
-      } else {
-        this.check = 0
-      }
-      searchManufactor(this.check, this.input).then(response => {
-        this.List2 = response.data
-      })
-    },
-    indexMethod(index) {
-      return index + 1
-    },
-    handleSelectionChange(val) {
-      this.processNum = val
-    },
+    // 打回车间
     getBack() {
       if (this.processNum.length !== 0) {
         this.result = 0
@@ -1336,140 +494,65 @@ export default {
     },
     // 选入零件
     getSpareParts() {
-      if (this.Number !== null) {
-        this.result = 0
-        for (let i = 0; i < this.processNum.length; i++) {
-          insertParts(this.processNum[i].工艺计划流水号, this.Number).then(response => {
-            this.result += parseInt(response.data[0].result)
-            if (this.processNum.length === this.result) {
-              this.contrast = 3000000000000
-              this.contrast1 = 0
-              this.loading = true
-              this.getList()
-              this.List3 = []
-              this.零件图号 = []
-              this.零件名称 = []
-              this.批次数量 = []
-              this.外协预算总价格 = []
-              this.加工价格_成交 = []
-              this.外协分类 = []
-              this.材料费 = []
-              this.材料价格_价格 = []
-              this.其他价格 = []
-              this.机加工开始时间 = []
-              this.机加工结束时间 = []
-              this.外协加工任务单明细流水号 = []
-              this.process = []
-              getParts(this.Number).then(response => {
-                this.returns = response.data
-                this.加工价格合计 = 0
-                this.材料价格合计 = 0
-                this.其他价格合计 = 0
-                if (response.data.length !== 0) {
-                  this.外协员电话 = response.data[0].联系电话
-                  this.联系人 = response.data[0].联系人
-                  this.联系人电话 = response.data[0].电话
-                  this.运费 = response.data[0].运费
-                  this.card = true
-                } else {
-                  this.card = false
-                }
-                const children = document.getElementsByClassName('tableData')
-                const parent = document.getElementById('1')
-                if (children.length !== 0) {
-                  for (let i = children.length - 1; i >= 0; i--) {
-                    parent.removeChild(children[i])
-                  }
-                }
-                const tr = []
-                for (let i = 0; i < this.returns.length; i++) {
-                  tr[i] = document.createElement('tr')
-                  tr[i].setAttribute('class', 'tableData')
-                  tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
-                      '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                  $('#tableHead').after(tr[i])
-                }
-                for (let j = 0; j < this.returns.length; j++) {
-                  document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                  document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
-                  document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称
-                  document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].批次数量
-                  document.getElementsByClassName('tableData')[j].children[4].innerHTML = ''
-                  document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].是否临时件1
-                  document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].外协分类
-                  document.getElementsByClassName('tableData')[j].children[7].innerHTML = parseInt(response.data[j].加工价格_成交.toFixed(2))
-                  document.getElementsByClassName('tableData')[j].children[8].innerHTML = parseInt(response.data[j].材料价格_价格.toFixed(2))
-                  document.getElementsByClassName('tableData')[j].children[9].innerHTML = parseInt(response.data[j].其他价格.toFixed(2))
-                  if (response.data[j].机加工开始时间 !== null) {
-                    document.getElementsByClassName('tableData')[j].children[10].innerHTML = response.data[j].机加工开始时间.substr(0, 10)
-                  }
-                  if (response.data[j].机加工结束时间 !== null) {
-                    document.getElementsByClassName('tableData')[j].children[11].innerHTML = response.data[j].机加工结束时间.substr(0, 10)
-                  }
-                  this.加工价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[7].innerHTML)
-                  this.材料价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[8].innerHTML)
-                  this.其他价格合计 += parseInt(document.getElementsByClassName('tableData')[j].children[9].innerHTML)
-                }
-                this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
-                this.大写金额 = convertCurrency(this.总计)
-                if (response.data.length === 0) {
-                  this.loading = false
-                }
-                for (let i = 0; i < response.data.length; i++) { // 声明二维数组
-                  this.零件图号.push(response.data[i].零件图号)
-                  this.零件名称.push(response.data[i].零件名称)
-                  this.批次数量.push(response.data[i].批次数量)
-                  this.外协预算总价格.push(response.data[i].外协预算总价格.toFixed(2))
-                  this.加工价格_成交.push(response.data[i].加工价格_成交.toFixed(2))
-                  this.外协分类.push(response.data[i].外协分类)
-                  this.材料费.push(response.data[i].材料费.toFixed(2))
-                  this.材料价格_价格.push(response.data[i].材料价格_价格.toFixed(2))
-                  this.其他价格.push(response.data[i].其他价格.toFixed(2))
-                  if (response.data[i].机加工开始时间 !== null) {
-                    this.机加工开始时间.push(response.data[i].机加工开始时间.substr(0, 10))
-                  } else {
-                    this.机加工开始时间.push(' ')
-                  }
-                  if (response.data[i].机加工结束时间 !== null) {
-                    this.机加工结束时间.push(response.data[i].机加工结束时间.substr(0, 10))
-                  } else {
-                    this.机加工结束时间.push(' ')
-                  }
-                  this.外协加工任务单明细流水号.push(response.data[i].外协加工任务单明细流水号)
-                  this.process[i] = []
-                  spareParts(this.returns[i].工艺计划流水号, this.returns[i].单件是否外协).then(response => {
-                    for (let k = 0; k < response.data.length; k++) { // 执行n次2
-                      this.process[i].push(response.data[k].工艺名称简称)
-                      document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-                    }
-                  }).then(() => {
-                    this.List3.push(this.returns[i])
-                    this.loading = false
-                  })
-                }
-              })
-            }
+      if (this.Number) {
+        insertParts(this.工艺计划流水号, this.Number).then(response => {
+          this.loading = true
+          this.List3 = []
+          getParts(this.Number).then(response => {
+            this.List3 = response.data
+            this.loading = false
           })
-        }
+        })
       } else {
         this.$message.warning('请选择订单')
       }
     },
-    downLoadRWD(tableid) {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        getExplorer()
-        method5(tableid)
-        Cleanup()
+    // 保存
+    confirmPrice() {
+      var 外协加工任务单明细流水号组 = []
+      var 加工价格_成交组 = []
+      for (let i = 0; i < this.List3.length; i++) {
+        外协加工任务单明细流水号组.push(this.List3[i].外协加工任务单明细流水号)
+        加工价格_成交组.push(this.List3[i].加工价格_成交)
       }
+      getPrice(外协加工任务单明细流水号组, 加工价格_成交组).then(response => {
+        this.loading = true
+        this.List3 = []
+        getParts(this.Number).then(response => {
+          this.List3 = response.data
+          this.loading = false
+        })
+      })
     },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.差价 < 0) {
-        return 'chajia'
+    // 提交
+    Deal() {
+      this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        editData1(this.Number, this.ManufactorNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('提交成功')
+            this.fetchData()
+          } else { this.$message.error('提交失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消提交'
+        })
+      })
+    },
+    // 导出任务单
+    exportTable() {
+      if (!this.Number) {
+        this.$message.warning('请选择外协加工任务单')
       } else {
-        return ''
+        var param = []
+        param[0] = ['外协加工任务单流水号', this.Number]
+        var Data = this.CreateData('2001', '报表_外协加工任务单明细', param)
+        this.exportExcel_NPOI(Data)
       }
     },
     // 分页
@@ -1481,6 +564,32 @@ export default {
     handleCurrentChange(val) {
       this.pageList = val
       this.fetchData()
+    },
+    // 移除
+    handleDelete1(row) {
+      this.$confirm('此操作将移除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteData1(row.外协加工任务单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('移除成功')
+            this.getList()
+            this.loading = true
+            this.List3 = []
+            getParts(this.Number).then(response => {
+              this.List3 = response.data
+              this.loading = false
+            })
+          } else { this.$message.error('移除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     }
   }
 }