From 750a4edcc710fbcff6806a6e4195b7bfe87e1c62 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 21 Jun 2019 09:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PartWorkCraftSelect_rdlc.js               |   4 +-
 src/api/Outsourcing/OutsourcingTaskQuery.js   |   8 +-
 .../PartWorkCraftSelect_rdlc/index.vue        |  22 +-
 .../ProcessQuotaEstablishment/index.vue       |   6 +-
 .../OutsourcingTaskQuery/index.vue            | 728 +++---------------
 5 files changed, 122 insertions(+), 646 deletions(-)

diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
index 3f8f6066..76649a97 100644
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -78,8 +78,8 @@ export function returnEdit(num) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_在制零件工艺调整_修改工艺',
-      param: '工艺计划流水号=' + num
+      name: '车间生产管理工艺_在制零件工艺调整_修改工艺_循环',
+      param: `工艺计划流水号组=${num}`
     }
   })
 }
diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js
index d59d251b..ac006459 100644
--- a/src/api/Outsourcing/OutsourcingTaskQuery.js
+++ b/src/api/Outsourcing/OutsourcingTaskQuery.js
@@ -155,15 +155,15 @@ export function deleteData1(Number) {
     }
   })
 }
-// 选入零件
-export function insertParts(processNum, Number) {
+// 零件到货
+export function Arrival(Number) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理_外协加工任务单明细_增加数据',
-      param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int'
+      name: '车间生产管理_外协零件_到货',
+      param: `外协加工任务单明细流水号组=${Number}`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 8a3308e0..4fa43c68 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -50,7 +50,12 @@
         height="550"
         border
         highlight-current-row
+        @selection-change="handleSelectionChange"
         @row-click="click">
+        <el-table-column
+          type="selection"
+          align="center"
+          width="55"/>
         <el-table-column label="机床号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -175,7 +180,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1,
 export default {
   data() {
     return {
-      partNumValue: '',
+      partNumValue: [],
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',
@@ -208,10 +213,10 @@ export default {
   },
   methods: {
     returnEdit() { // 在制零件工艺修改
-      if (this.partNumValue === '' || this.partNumValue === null) {
+      if (this.partNumValue.length === 0) {
         this.$message.error('请选择零件')
       } else {
-        this.$confirm(`此操作会将 ${this.零件图号} 打回至未编制状态, 是否继续?`, '提示', {
+        this.$confirm(`此操作会将零件打回至未编制状态, 是否继续?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -219,8 +224,8 @@ export default {
           returnEdit(this.partNumValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('打回成功')
-              this.partNumValue = ''
-              this.tableData = []
+              this.partNumValue = []
+              this.searchData()
               this.tableData2 = []
             } else {
               this.$message.error('打回失败')
@@ -279,12 +284,17 @@ export default {
       })
     },
     click(row) {
-      this.partNumValue = row.工艺计划流水号
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {
         this.tableData2 = response.data
       })
     },
+    handleSelectionChange(val) {
+      this.partNumValue = []
+      for (let i = 0; i < val.length; i++) {
+        this.partNumValue.push(val[i].工艺计划流水号)
+      }
+    },
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index cc5a3154..31aa01c9 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -32,7 +32,7 @@
           <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
         </el-option>
       </el-select>
-      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
+      <el-checkbox v-model="checked" :disabled="isShow2 || (token !== '6' && token !== '19')" size="small" style="margin:10px">是否核准</el-checkbox>
       <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
       <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
       <div v-show="isShow">
@@ -695,7 +695,8 @@ export default {
   computed: {
     ...mapGetters([
       'name',
-      'id'
+      'id',
+      'token'
     ])
   },
   mounted() {
@@ -1064,6 +1065,7 @@ export default {
       })
     },
     initPerson() { // 初始化工艺员
+      console.log(this.token, 12334)
       initPerson().then(response => {
         this.tableData3 = response.data
       })
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index f77450ea..912c23d1 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -5,9 +5,7 @@
       <span>表单号:</span>
       <el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
       <span>外协厂家:</span>
-      <el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:250px" clearable>
-        <el-button slot="append" icon="el-icon-search" @click="onFocus1();param=0"/>
-      </el-input>
+      <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
       <span>下达任务日期:</span>
       <el-date-picker
         v-model="time"
@@ -20,12 +18,6 @@
 
     <el-card>
       <el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
-        <el-table-column label="收货状态" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.单据状态==='作废'" type="success" size="small" style="margin: 0px">已收货</el-tag>
-            <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="付款状态" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
@@ -57,11 +49,6 @@
             {{ scope.row.运费 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="200px">
-          <template slot-scope="scope">
-            <el-button :disabled="scope.row.单据状态==='作废'" type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="shouhuo(scope.row)">收货</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -76,6 +63,51 @@
       </div>
     </el-card>
 
+    <el-card>
+      <el-table
+        ref="multipleTable"
+        :data="List3"
+        border
+        highlight-current-row
+        height="450"
+        tooltip-effect="dark"
+        style="width: 100%;margin-top: 20px"
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          :selectable="selectable"
+          type="selection"
+          align="center"
+          width="55"/>
+        <el-table-column label="收货状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.到货状态===1" type="success" size="small" style="margin: 0px">已收货</el-tag>
+            <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
+          </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>
+      <el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px;margin-top: 15px" @click="getSpareParts">收货</el-button>
+    </el-card>
+
     <el-card>
       <div id="RWD">
         <table cellspacing="0px" align="center" width="100%" style="">
@@ -145,28 +177,11 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
-      <div align="center">
-        <el-input v-model="input" size="small" style="width:200px"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
-      </div>
-      <el-table :data="List2" max-height="370" 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>
-
   </div>
 </template>
 
 <script>
-import { handlechange, shouhuo, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber } from '@/api/Outsourcing/OutsourcingTaskQuery'
+import { handlechange, shouhuo, getTable, getprocedure, spareParts, Arrival, getParts } from '@/api/Outsourcing/OutsourcingTaskQuery'
 import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
@@ -179,6 +194,7 @@ export default {
   },
   data() {
     return {
+      OutsouringNumber: [],
       wancheng: '',
       gongxulsh: [],
       bianliang: [],
@@ -288,7 +304,6 @@ export default {
   },
   created() {
     this.fetchData()
-    this.getList()
   },
   methods: {
     exportTable() {
@@ -318,7 +333,6 @@ export default {
               shouhuo(row.外协加工任务单流水号).then(response => {
                 if (response.data[0].result === '1') {
                   this.fetchData()
-                  this.getList()
                 }
               })
             }
@@ -378,7 +392,7 @@ export default {
       }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.ManufactorNumber, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
+      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {
@@ -389,6 +403,9 @@ export default {
       })
       this.loading2 = false
     },
+    selectable(row, index) { // 控制某行是否可选
+      return parseInt(row.到货状态) !== 1 // 已经到货
+    },
     // 查询
     searchProcess(row) {
       this.wancheng = ''
@@ -417,7 +434,6 @@ export default {
       this.外协加工任务单明细流水号 = []
       this.process = []
       this.freight = row.运费
-      this.ManufactorNumber = row.外协厂家流水号
       this.Number = row.外协加工任务单流水号
       getParts(this.Number).then(response => {
         const data = response.data
@@ -425,7 +441,19 @@ export default {
           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
+        for (let j = 0; j < data.length; j++) {
+          this.List3.push({
+            零件图号: data[j].零件图号,
+            零件名称: data[j].零件名称,
+            批次数量: data[j].批次数量,
+            到货状态: data[j].到货状态,
+            工艺计划流水号: data[j].工艺计划流水号,
+            外协加工任务单明细流水号: data[j].外协加工任务单明细流水号,
+            单件是否外协: data[j].单件是否外协,
+            外协工序: ''
+          })
+        }
+        this.getProcedure(this.List3)
         this.加工价格合计 = 0
         this.材料价格合计 = 0
         this.其他价格合计 = 0
@@ -525,89 +553,6 @@ export default {
       this.dialogFormVisible = false
       this.$refs[formName].resetFields()
     },
-    submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.title === '增加') {
-            this.submitAdd()
-            this.title = ''
-          } else if (this.title === '编辑') {
-            this.submitEdit()
-            this.title = ''
-          }
-        }
-      })
-    },
-    handleAdd() {
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
-      this.title = '增加'
-      this.dialogFormVisible = true
-      var time = new Date()
-      var month = time.getMonth() + 1
-      var day = time.getDate()
-      if (month >= 1 && month <= 9) {
-        month = '0' + month
-      }
-      if (day >= 1 && day <= 9) {
-        day = '0' + day
-      }
-      this.form.下达任务日期 = time.getFullYear() + '/' + month + '/' + day
-      getNumber(this.form.下达任务日期).then(response => {
-        this.form.表单号 = response.data.result[0].Column1
-      })
-      this.form.运费 = null
-      this.form.外协厂家 = ''
-    },
-    submitAdd() {
-      addTable(this.form.表单号, this.id, this.ManufactorNumber1, this.form.下达任务日期, this.form.运费).then(response => {
-        if (response.data[0].result === '1') {
-          this.$notify({
-            title: '成功',
-            message: '信息添加成功',
-            type: 'success'
-          })
-          this.dialogFormVisible = false
-          this.fetchData()
-        } else {
-          this.$message.error('信息添加失败')
-        }
-      })
-    },
-    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 => {
@@ -615,30 +560,10 @@ export default {
           for (let j = 0; j < response.data.length; j++) {
             this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
           }
-          this.List1[i].外协工序 = this.procedure[i]
+          this.List3[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.外协厂家名称
-        this.ManufactorNumber = 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, '', 0, '', 0, '', 0, '', '', '', '', '', '', '', '', '', '', '', '', 0, 0, '', 0, 0, 0, '', '']
@@ -694,359 +619,21 @@ export default {
       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
-                })
-              }
-            })
-          }
-        })
+    indexMethod(index) {
+      return index + 1
+    },
+    handleSelectionChange(val) {
+      this.OutsouringNumber = []
+      for (let i = 0; i < val.length; i++) {
+        this.OutsouringNumber.push(val[i].外协加工任务单明细流水号)
       }
     },
-    // 确定价格
-    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.documentStatus = 2
-      this.sign = 1
-      this.$confirm('成交后单据不可修改, 确定成交吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        editData1(this.Number, this.ManufactorNumber, this.freight, this.documentStatus, this.sign, this.Explain).then(response => {
+    getSpareParts() { // 选入零件
+      if (this.OutsouringNumber.length !== 0) {
+        Arrival(this.OutsouringNumber).then(response => {
+          console.log(response.data)
           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.ManufactorNumber1, this.form.运费, this.documentStatus, 1, this.Explain).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('编辑成功')
-          this.dialogFormVisible = false
-          this.fetchData()
-        } else { this.$message.error('编辑失败') }
-      })
-    },
-    handleDelete(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteData(row.外协加工任务单流水号).then(response => {
-          if (response.data[0].result === '1') {
-            if (this.List && this.List.length === 1 && this.pageList > 1) { // 判断删除的是否是最后一页最后一行，如果是且不是第一页，页数减一
-              this.pageList--
-            }
-            this.$message.success('删除成功')
-            this.fetchData()
-            this.getList()
-            this.card = false
-          } else { this.$message.error('删除失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    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.$message.success('到货成功')
             this.contrast = 3000000000000
             this.contrast1 = 0
             this.loading = true
@@ -1066,6 +653,19 @@ export default {
             this.process = []
             getParts(this.Number).then(response => {
               this.returns = response.data
+              for (let j = 0; j < response.data.length; j++) {
+                this.List3.push({
+                  零件图号: response.data[j].零件图号,
+                  零件名称: response.data[j].零件名称,
+                  批次数量: response.data[j].批次数量,
+                  到货状态: response.data[j].到货状态,
+                  工艺计划流水号: response.data[j].工艺计划流水号,
+                  外协加工任务单明细流水号: response.data[j].外协加工任务单明细流水号,
+                  单件是否外协: response.data[j].单件是否外协,
+                  外协工序: ''
+                })
+              }
+              this.getProcedure(this.List3)
               this.加工价格合计 = 0
               this.材料价格合计 = 0
               this.其他价格合计 = 0
@@ -1076,7 +676,6 @@ export default {
                 this.运费 = response.data[0].运费
                 this.card = true
               } else {
-                this.loading = false
                 this.card = false
               }
               const children = document.getElementsByClassName('tableData')
@@ -1091,7 +690,7 @@ export default {
                 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>'
+                  '<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++) {
@@ -1142,157 +741,22 @@ export default {
                 }
                 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('移除失败') }
+          } else {
+            this.$message.error('到货失败')
+          }
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    searchData() {
-      searchManufactor(this.input).then(response => {
-        this.List2 = response.data
-      })
-    },
-    indexMethod(index) {
-      return index + 1
-    },
-    handleSelectionChange(val) {
-      this.processNum = val
-    },
-    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
-                  })
-                }
-              })
-            }
-          })
-        }
       } else {
-        this.$message.warning('请选择订单')
+        this.$message.warning('请选择零件')
       }
     },
     downLoadRWD(tableid) {