From b74bf9492c446638dd96e8262ec1cac8a6c8137a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 21 Mar 2020 10:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=8A=A0=E5=B7=A5=E9=9B=B6=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ManufacturingCenter/MachiningParts/index.vue b/src/views/ManufacturingCenter/MachiningParts/index.vue
index 10858418..5db11fe5 100644
--- a/src/views/ManufacturingCenter/MachiningParts/index.vue
+++ b/src/views/ManufacturingCenter/MachiningParts/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col style="width: 610px">
-        <el-card style="width:610px">
+      <el-col style="width: 720px">
+        <el-card style="width:720px">
           <span style="margin-left: 45%;font-size: 25px;">正在加工零件</span>
           <div>加工日期：{{ dateTime }}</div>
-          <el-table :data="tableData" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
+          <el-table :data="tableData" border size="mini" highlight-current-row style="width: 720px" stripe height="640px">
             <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -68,10 +68,10 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 610px">
+      <el-col style="width: 620px">
         <el-card>
           <div style="margin-left: 45%;margin-bottom: 20px; font-size: 25px">待加工零件</div>
-          <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
+          <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 620px" stripe height="640px">
             <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -138,14 +138,7 @@
         <span>零件名称:</span>
         <el-input v-model="SparePartsName" style="width: 150px" size="small"/>
       </el-row>
-      <el-table
-        :data="tableData2"
-        style="width: 615px;margin-top: 20px"
-        size="mini"
-        height="320"
-        stripe
-        highlight-current-row
-        border>
+      <el-table :data="tableData2" style="width: 615px;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
         <el-table-column align="center" label="工序" width="70">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
@@ -163,7 +156,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作工" width="70">
           <template slot-scope="scope">
-            {{ scope.row.操作员 }}
+            {{ scope.row.工序间是否外协 === 2 ? '外协' : scope.row.操作员 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="工序完成" width="80">