From 8ac502a9064ffb1c75e7cede76e9a22b9497d8fb Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 5 Feb 2020 19:29:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=88=B0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Outsourcing/OutsourcingTaskQuery.js   |  12 +-
 .../OutsourcingTaskQuery/index.vue            | 539 +-----------------
 2 files changed, 36 insertions(+), 515 deletions(-)

diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js
index 9fc5abcd..1ce240e4 100644
--- a/src/api/Outsourcing/OutsourcingTaskQuery.js
+++ b/src/api/Outsourcing/OutsourcingTaskQuery.js
@@ -13,14 +13,14 @@ export function shouhuo(num) {
   })
 }
 // 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) {
+export function getTable(checked, contractNumber, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_查询页',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=0&单据状态=1&外协员编号_check=0&外协员编号=' + num,
+      name: '车间生产管理工艺_外协执行_查询外协任务单',
+      param: '厂家或表单号_check=' + checked + '&厂家或表单号=' + contractNumber,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -156,14 +156,14 @@ export function deleteData1(Number) {
   })
 }
 // 零件到货
-export function Arrival(Number, Num) {
+export function Arrival(num1, Number, Num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间生产管理_外协零件_到货',
-      param: `外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}`
+      param: '外协加工任务单流水号=' + num1 + `&外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}`
     }
   })
 }
@@ -174,7 +174,7 @@ export function getParts(Number) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单明细_查询数据',
+      name: '车间生产管理工艺_外协加工任务单明细_查询数据',
       param: '外协加工任务单流水号=' + Number + '=int'
     }
   })
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 5faed134..a4dd7a02 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -5,7 +5,7 @@
         <!--<span>表单号:</span>-->
         <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>-->
         <span>厂家:</span>
-        <el-input v-model="manufacturers" size="small" placeholder="厂家" style="width:160px" clearable @keyup.enter.native="pageSize=10;pageList=1;fetchData()"/>
+        <el-input v-model="manufacturers" size="small" placeholder="厂家或外协任务单号" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()"/>
         <!--<span>下达任务日期:</span>-->
         <!--<el-date-picker-->
         <!--v-model="time"-->
@@ -15,7 +15,7 @@
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
       </el-card>
       <el-card>
-        <el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="550" border @row-click="searchProcess" >
+        <el-table v-loading="loading2" :data="List" :row-class-name="tableData1ClassName" highlight-current-row size="mini" height="550" border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
             <template slot-scope="scope">
               {{ scope.row.表单号 }}
@@ -23,7 +23,7 @@
           </el-table-column>
           <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
             <template slot-scope="scope">
-              {{ scope.row.外协厂家 }}
+              {{ scope.row.外协厂家名称 }}
             </template>
           </el-table-column>
         </el-table>
@@ -43,9 +43,6 @@
     <el-col :span="14">
       <el-card>
         <el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">收货</el-button>
-        <!--<el-tooltip :open-delay="1200" effect="dark" content="打印外协任务单" placement="top">-->
-        <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;float: right" @click="exportTable('RWD')">导出单据</el-button>-->
-        <!--</el-tooltip>-->
         <el-table v-loading="loading" :data="List3" border stripe size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column
             :selectable="selectable"
@@ -73,93 +70,21 @@
               {{ 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-card>
     </el-col>
-    <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="6">{{ 任务单号 }}</td>
-              <td colspan="4">任务下达日期:</td>
-              <td colspan="4">{{ 任务下达日期 }}</td>
-              <td colspan="3">外协厂家:</td>
-              <td colspan="9">{{ 外协厂家 }}</td>
-            </tr>
-            <tr class="tbodyHead">
-              <td colspan="2">外协员:</td>
-              <td colspan="6">{{ 外协员 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="6">{{ 外协员电话 }}</td>
-              <td colspan="3">联系人:</td>
-              <td colspan="3">{{ 联系人 }}</td>
-              <td colspan="2">电话:</td>
-              <td colspan="4">{{ 联系人电话 }}</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="17" 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>
-            <tr class="foot">
-              <td colspan="4">外协员:</td>
-              <td colspan="4">外协科长:</td>
-              <td colspan="4">采购二部长:</td>
-              <td colspan="4">制品部长:</td>
-              <td colspan="4">定额科统计员:</td>
-              <td colspan="4">定额科长:</td>
-              <td colspan="4">外协厂:</td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-    </el-card>
-
   </div>
 </template>
 
 <script>
-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 { getTable, Arrival, getParts } from '@/api/Outsourcing/OutsourcingTaskQuery'
 import { mapGetters } from 'vuex'
 import elInput from 'element-ui/packages/input'
-import $ from 'jquery'
 
 export default {
   components: {
@@ -263,7 +188,7 @@ export default {
       机加工结束时间: [],
       外协加工任务单明细流水号: [],
       total: null, // 总条数
-      pageSize: 10, // 每页显示条数
+      pageSize: 20, // 每页显示条数
       pageList: 1, // 后台获取页
       currentPage: 1 // 显示当前页
     }
@@ -280,320 +205,32 @@ export default {
     this.fetchData()
   },
   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()
-        printNode.remove()
-      }
-    },
-    shouhuo(row) {
-      this.$confirm('此操作将不可更改, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.wancheng === 1) {
-          for (let i = 0; i < this.gongxulsh.length; i++) {
-            handlechange(this.gongxulsh[i].工序流水号, '0000')
-            if (i === this.gongxulsh.length - 1) {
-              shouhuo(row.外协加工任务单流水号).then(response => {
-                if (response.data[0].result === '1') {
-                  this.fetchData()
-                }
-              })
-            }
-          }
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        })
-      })
-    },
     fetchData() {
       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.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).then(response => {
+      var check
+      this.manufacturers ? check = 1 : check = 0
+      getTable(check, this.manufacturers, 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) {
-            response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
-          }
-        }
         this.List = response.data.rows
       })
       this.loading2 = false
     },
-    selectable(row, index) { // 控制某行是否可选
+    // 控制某行是否可选
+    selectable(row, index) {
       return parseInt(row.到货状态) !== 1 // 已经到货
     },
     // 查询
     searchProcess(row) {
-      this.wancheng = ''
-      this.gongxulsh = []
-      this.任务单号 = row.表单号
-      this.任务下达日期 = row.任务下达日期
-      this.外协厂家 = row.外协厂家
-      this.外协员 = row.外协计划员
-      // 以上是新增的
-      this.contrast = 3000000000000
-      this.contrast1 = 0
+      this.Number = row.外协加工任务单流水号
       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.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
-        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
-        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
-        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.gongxulsh.push({
-                工序流水号: response.data[k].工序流水号
-              })
-              this.process[i][k] = response.data[k].工艺名称简称
-              document.getElementsByClassName('tableData')[i].children[4].innerHTML += response.data[k].工艺名称简称 + '/'
-            }
-          }).then(() => {
-            this.wancheng = 1
-          })
-        }
-      }).then(() => {
-        // this.List3 = this.bianliang
+      getParts(row.外协加工任务单流水号).then(response => {
+        this.List3 = response.data
         this.loading = false
       })
     },
-    callOff(formName) {
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
-    },
-    getProcedure(row) {
-      for (let i = 0; i < row.length; i++) {
-        getprocedure(row[i].工艺计划流水号, row[i].单件是否外协).then(response => {
-          this.List3[i].外协工序 = ''
-          this.procedure[i] = ''
-          for (let j = 0; j < response.data.length; j++) {
-            this.procedure[i] = this.procedure[i] + ' ' + response.data[j].工艺名称简称
-          }
-          this.List3[i].外协工序 = this.procedure[i]
-        })
-      }
-    },
-    getSummaries(param) {
-      const { data } = param
-      const sums = ['', '', '', 0, '', 0, '', 0, '', 0, '', 0, '', '', '', '', '', '', '', '', '', '', '', '', 0, 0, '', 0, 0, 0, '', '']
-      sums[1] = '费用'
-      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[25] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
-      }
-      sums[25] = Math.round(sums[25] * 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
-    },
-    indexMethod(index) {
-      return index + 1
-    },
     handleSelectionChange(val) {
       this.OutsouringNumber = []
       this.工艺计划流水号 = []
@@ -602,124 +239,17 @@ export default {
         this.工艺计划流水号.push(val[i].工艺计划流水号)
       }
     },
+    // 收货
     getSpareParts() {
       if (this.OutsouringNumber.length !== 0) {
         this.loading = true
-        Arrival(this.OutsouringNumber, this.工艺计划流水号).then(response => {
+        Arrival(this.Number, this.OutsouringNumber, this.工艺计划流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('到货成功')
-            this.contrast = 3000000000000
-            this.contrast1 = 0
-            this.List3 = []
-            this.零件图号 = []
-            this.零件名称 = []
-            this.批次数量 = []
-            this.外协预算总价格 = []
-            this.加工价格_成交 = []
-            this.外协分类 = []
-            this.材料费 = []
-            this.材料价格_价格 = []
-            this.其他价格 = []
-            this.机加工开始时间 = []
-            this.机加工结束时间 = []
-            this.外协加工任务单明细流水号 = []
-            this.process = []
+            this.fetchData()
             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
-              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.总计)
-              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.loading = false
-                })
-              }
+              this.List3 = response.data
+              this.loading = false
             })
           } else {
             this.$message.error('到货失败')
@@ -729,21 +259,10 @@ export default {
         this.$message.warning('请选择零件')
       }
     },
-    downLoadRWD(tableid) {
-      if (this.List3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        getExplorer()
-        method5(tableid)
-        Cleanup()
-      }
-    },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.差价 < 0) {
-        return 'chajia'
-      } else {
-        return ''
+    tableData1ClassName({ row, rowIndex }) {
+      row.index = rowIndex
+      if (row.到货状态 === '1') {
+        return 'WXDHdh'
       }
     },
     // 分页
@@ -766,6 +285,9 @@ export default {
   }
 </style>
 <style>
+  .WXDHdh{
+    background: #9bd7fc !important;
+  }
   td{
     width: 100px;
     height: 30px;
@@ -799,4 +321,3 @@ export default {
     height: 30px;
   }
 </style>
-

From f4bfc2bf83a0cd39d6a2700c51b979445f200951 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Thu, 6 Feb 2020 11:43:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InitialProduction/index.vue               | 40 +++++++++----------
 .../ProcessTaskAssignment/index.vue           |  1 -
 .../TechnologyCenter/QueryParts/index.vue     |  4 +-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 2b84551e..05c56527 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -456,27 +456,27 @@ export default {
       'id'
     ])
   },
-  watch: {
-    // 如果路由有变化，会再次执行该方法
-    '$route'(to) {
-      const _this = this
-      console.log(to, 2222)
-      if (to.name === 'InitialProduction') {
-        _this.typeChange()
-      }
-    }
-    // '$route': {
-    //   handler(route) {
-    //     const _this = this
-    //     console.log(route.name)
-    //     if (route.name === 'InitialProduction') {
-    //       _this.typeChange()
-    //     }
-    //   }
-    // }
-  },
+  // watch: {
+  //   // 如果路由有变化，会再次执行该方法
+  //   '$route'(to) {
+  //     const _this = this
+  //     console.log(to, 2222)
+  //     if (to.name === 'InitialProduction') {
+  //       _this.typeChange()
+  //     }
+  //   }
+  //   // '$route': {
+  //   //   handler(route) {
+  //   //     const _this = this
+  //   //     console.log(route.name)
+  //   //     if (route.name === 'InitialProduction') {
+  //   //       _this.typeChange()
+  //   //     }
+  //   //   }
+  //   // }
+  // },
   created() {
-    // this.typeChange()
+    this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
   },
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 3ff0d547..282a1c6a 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -36,7 +36,6 @@
         height="750"
         highlight-current-row
         border
-        stripe
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
         <el-table-column align="center" label="零件号" prop="零件号" width="160">
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 838f5213..0cdeaa5e 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -245,7 +245,7 @@
             <el-button
               :disabled="Number(id)!==0"
               size="mini"
-              plsin
+              plain
               type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
@@ -290,7 +290,7 @@
           <el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
         </el-form-item>
         <el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
-          <el-input v-model="form.零件数量" placeholder="零件数量" size="small" style="width:200px" clearable/>
+          <el-input-number v-model="form.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
         </el-form-item>
         <el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
           <el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>

From aed3f2c83e9dc3297860d32db16e4e4cce0893d9 Mon Sep 17 00:00:00 2001
From: jiangfuzhuang <jiangfuzhuang@meswork.com>
Date: Thu, 6 Feb 2020 11:46:54 +0800
Subject: [PATCH 3/5] 77

---
 src/views/ManufacturingCenter/InitialProduction/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 2b84551e..47d75a09 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -113,7 +113,7 @@
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="规格" prop="规格" align="center">
+          <el-table-column label="规格" prop="规格" align="center" width="170">
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
@@ -148,17 +148,19 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200px" fixed="right" align="center">
+          <el-table-column label="操作" width="170px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
                 :disabled="checked_hebing"
                 size="mini"
                 type="primary"
+                style="padding: 4px 8px"
                 plain
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
               <el-button
                 size="mini"
                 type="primary"
+                style="padding: 4px 8px"
                 plain
                 @click="handleEditNumber(scope.$index, scope.row)">更改数量</el-button>
             </template>

From f72cb16fa088bb88793fd4bc191eb9d258a35a2c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 6 Feb 2020 12:01:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=AA=E6=94=B9=E4=BA=86=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E8=B4=A7=E4=BD=8D=E7=AE=A1=E7=90=86=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=A1=86=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/InventoryManagement/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index b18e0f50..79c95e6f 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -421,14 +421,18 @@ export default {
     // 编辑
     handleEdit(index, row, formName) {
       this.temp = 2
-      this.dialogFormVisible = true
       this.form.WarehouseNumber = row.仓库编号
       this.form.WarehouseName = row.仓库名称
       this.form.WarehouseDescription = row.仓库描述
       this.form.Address = row.地址
-      this.form.ContactpeopleValue = row.人员编号
+      if (this.role !== '15') {
+        this.form.ContactpeopleValue = this.Contactpeople[0].value
+      } else {
+        this.form.ContactpeopleValue = parseInt(row.人员编号)
+      }
       this.form.Note = row.备注
       this.HouseNumber = row.仓库流水号
+      this.dialogFormVisible = true
     },
     // 执行修改
     chaEdit() {

From 72797e4b7038d9a20f6fb049d52c0cd904c84945 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 6 Feb 2020 12:23:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePurchaseContract/index.vue               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 159e251a..06eefe6a 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -149,13 +149,13 @@
       </el-tooltip>
       <hr>
       <!--html代码-->
-      <div v-show="false">{{ content }}</div>
+      <!--<div v-show="false">{{ content }}</div>-->
       <!--富文本编辑器-->
-      <div v-show="!preview" id="tinymce" style="height:850px;">
-        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>
-      </div>
+      <!--<div v-show="!preview" id="tinymce" style="height:850px;">-->
+      <!--<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>-->
+      <!--</div>-->
       <!--网页预览-->
-      <div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
+      <div v-show="!preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
     </el-card>
   </div>
 </template>
@@ -421,7 +421,7 @@ export default {
     },
     submitTotal() { // 确定合同总额
       // this.$refs.tinymce.destroyTinymce()
-      this.$refs.tinymce.initTinymce()
+      // this.$refs.tinymce.initTinymce()
       document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
       document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
       document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -778,7 +778,7 @@ export default {
           document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
           document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
           this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-          this.$refs.tinymce.initTinymce()
+          // this.$refs.tinymce.initTinymce()
           setTimeout(() => {
             this.$refs.tinymce.setContent(this.contentNew)
           }, 1000)