From cb49f12609a8ed8e4e66c51d69dc26adfc82b84a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 18 May 2020 14:33:43 +0800
Subject: [PATCH] a

---
 .../ProcessingStatusNew/index.vue             | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 41e6643a..73bc01c8 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <el-card>
-      <!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
       <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
         <el-option
           v-for="item in Machines"
@@ -22,11 +21,9 @@
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
       <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
       <el-button v-positive="'loading'" :disabled="false" type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
-      <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
-      <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
     </el-card>
     <el-row>
-      <el-col style="width: 37%">
+      <el-col style="width: 49%">
         <el-card>
           <el-table v-loading="loading2" :data="tableData1" :row-class-name="tableRowClassName1" class="table" height="660" style="max-height: 830px" highlight-current-row empty-text="   " border @row-click="getRow">
             <el-table-column align="center" label="工序" show-overflow-tooltip width="50">
@@ -34,27 +31,27 @@
                 {{ scope.row.工序顺序 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
+            <el-table-column align="center" label="工艺名" show-overflow-tooltip width="70">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="投产数" width="80">
+            <el-table-column align="center" label="投产数" width="65">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="完成数" width="80">
+            <el-table-column align="center" label="完成数" width="65">
               <template slot-scope="scope">
                 {{ scope.row.完成数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="质检数" width="80">
+            <el-table-column align="center" label="质检数" width="65">
               <template slot-scope="scope">
                 {{ scope.row.检验数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="不良数" width="80">
+            <el-table-column align="center" label="不良数" width="65">
               <template slot-scope="scope">
                 {{ scope.row.不合格数量 }}
               </template>
@@ -77,7 +74,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 63%">
+      <el-col style="width: 49%">
         <el-card>
           <el-table v-loading="loading" ref="singleTable" :data="tableData" :row-class-name="tableRowClassName" class="table" highlight-current-row border height="630" @row-click="getCurrentRow">
             <el-table-column align="center" label="跟单号" show-overflow-tooltip width="160">
@@ -100,11 +97,6 @@
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="报废数" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.报废数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="质检数" width="70">
               <template slot-scope="scope">
                 {{ scope.row.检验数量 }}
@@ -115,14 +107,29 @@
                 {{ scope.row.不合格数量 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="报废数" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.报废数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="加工完成" width="100">
               <template slot-scope="scope">
                 {{ scope.row.机加工实际完成时间 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="计划完成" width="100">
+            <el-table-column align="center" label="加工完成" width="100">
               <template slot-scope="scope">
-                {{ scope.row.机加工结束时间 }}
+                {{ scope.row.机加工实际完成时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="机床图号" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="用户名称" show-overflow-tooltip min-width="110">