From 529f652458cf5279d64a7ec81ad762c6b9669ade Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 19 Feb 2020 16:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=83=A8=E5=88=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingPartsQuery/index.vue           | 79 +++++++------------
 .../OutsourcingTaskExecution/index.vue        | 30 +------
 .../OutsourcingTaskQuery/index.vue            | 21 +----
 .../Outsourcing/PreorderAssociation/index.vue |  4 +-
 src/views/layout/components/TagsView.vue      |  2 -
 5 files changed, 38 insertions(+), 98 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index 0fce960a..66661d46 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 65%">
+    <el-card>
       <div style="margin-top: 7px; margin-bottom: 7px">
         <span>外协厂家</span>
         <el-input v-model="supplierNameValue" size="small" placeholder="外协厂家或零件图号" style="width: 180px" clearable/>
@@ -18,47 +18,29 @@
         <el-button type="primary" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
       </div>
     </el-card>
-    <el-card style="width: 70%">
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        highlight-current-row
-        border
-        stripe
-        size="mini"
-        style="width: 100%"
-        height="760">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column
-          label="外协状态"
-          align="center"
-          width="70px">
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" height="700" style="width: 1210px">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="外协状态" align="center" width="90px">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
             <el-tag v-if="Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          label="项目名称"
-          align="center"
-          width="140px">
-          <template slot-scope="scope">{{ scope.row.项目名称 }}</template>
+        <el-table-column label="项目名称" align="center" width="140px">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
         </el-table-column>
-        <el-table-column
-          label="零件图号"
-          align="center"
-          width="160px">
-          <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
+        <el-table-column label="零件图号" align="center" width="160px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
         </el-table-column>
-        <el-table-column
-          label="零件名称"
-          align="center"
-          width="120px">
-          <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
+        <el-table-column label="零件名称" align="center" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
         </el-table-column>
         <el-table-column label="数量" align="center" width="70">
           <template slot-scope="scope">
@@ -70,23 +52,20 @@
             {{ scope.row.外协工序 }}
           </template>
         </el-table-column>
-        <el-table-column
-          label="外协厂家"
-          align="center"
-          width="160px">
-          <template slot-scope="scope">{{ scope.row.外协厂家名称 }}</template>
+        <el-table-column label="外协厂家" align="center" width="160px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
         </el-table-column>
-        <el-table-column
-          label="外协单号"
-          align="center"
-          width="200">
-          <template slot-scope="scope">{{ scope.row.表单号 }}</template>
+        <el-table-column label="外协单号" align="center" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.表单号 }}
+          </template>
         </el-table-column>
-        <el-table-column
-          label="外协日期"
-          align="center"
-          width="100">
-          <template slot-scope="scope">{{ scope.row.任务下达日期.substr(0,10) }}</template>
+        <el-table-column label="外协日期" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.任务下达日期.substr(0,10) }}
+          </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index e19386cd..d5329d35 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -79,13 +79,10 @@
     </el-card>
     <el-card>
       <el-col :span="8">
-        <!--<span>表单号:</span>-->
-        <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
-        <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
         <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
-        <el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
-        <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <el-checkbox v-model="isChecked" size="small" label="历史"/>
+        <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:1px" @click="handleAdd()">新增</el-button>
         <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
             <template slot-scope="scope">
@@ -115,31 +112,10 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
         </div>
-        <!--<span>下达任务日期:</span>-->
-        <!--<el-date-picker-->
-        <!--type="date"-->
-        <!--size="small"-->
-        <!--placeholder="选择日期"/>-->
-        <!--<span>单据状态:</span>-->
-        <!--<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>-->
-        <!--<el-option-->
-        <!--v-for="item in options"-->
-        <!--:key="item.value"-->
-        <!--:label="item.label"-->
-        <!--:value="item.value">-->
-        <!--<div style="float: left">{{ item.label }}</div>-->
-        <!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
-        <!--</el-option>-->
-        <!--</el-select>-->
       </el-col>
       <el-col :span="16">
         <div>
-          <!--<span>下调金额:（百分比）</span>-->
-          <!--<el-input v-model="money" size="small" clearable style="width: 90px"/>-->
-          <!--<el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">-->
-          <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
-          <!--</el-tooltip>-->
-          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">选入零件</el-button>
+          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
           <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
             <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 6e5b801c..22ae3d2b 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -2,16 +2,8 @@
   <div class="app-container">
     <el-col :span="10">
       <el-card>
-        <!--<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=20;pageList=1;fetchData()"/>
-        <!--<span>下达任务日期:</span>-->
-        <!--<el-date-picker-->
-        <!--v-model="time"-->
-        <!--type="date"-->
-        <!--size="small"-->
-        <!--placeholder="选择日期"/>-->
         <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
       </el-card>
       <el-card>
@@ -42,8 +34,8 @@
     </el-col>
     <el-col :span="14">
       <el-card>
-        <el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
-        <el-table v-loading="loading" :data="List3" border size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-button :disabled="loading" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
+        <el-table v-loading="loading" :data="List3" border size="mini" height="595" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column
             :selectable="selectable"
             type="selection"
@@ -70,11 +62,6 @@
               {{ 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>
@@ -214,8 +201,8 @@ export default {
       getTable(check, this.manufacturers, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
         this.List = response.data.rows
+        this.loading2 = false
       })
-      this.loading2 = false
     },
     // 控制某行是否可选
     selectable(row, index) {
@@ -223,8 +210,8 @@ export default {
     },
     // 查询
     searchProcess(row) {
-      this.Number = row.外协加工任务单流水号
       this.loading = true
+      this.Number = row.外协加工任务单流水号
       this.List3 = []
       getParts(row.外协加工任务单流水号).then(response => {
         this.List3 = response.data
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index d0808338..c77162c3 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -69,7 +69,7 @@
               <span v-if="parseInt(scope.row.工序状态)===5" size="small">停产</span>
             </template>
           </el-table-column>
-          <el-table-column label="是否外协" width="75" align="center">
+          <el-table-column label="是否外协" width="80" align="center">
             <template slot-scope="scope">
               <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
             </template>
@@ -84,7 +84,7 @@
               {{ scope.row.计划日期 }}
             </template>
           </el-table-column>
-          <el-table-column label="计划工时" align="center" width="85px">
+          <el-table-column label="计划工时" align="center" width="80px">
             <template slot-scope="scope">
               {{ scope.row.工序工时 }}
             </template>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 941f3912..d3e43f8b 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -71,8 +71,6 @@ export default {
       return false
     },
     isActive(route) {
-      console.log(this.contactList)
-      this.contactList = []
       if (!this.$route.meta.keepAlive) {
         this.$route.meta.keepAlive = true
       }