From 205008d3c872523c6ee218cfd38ea8c7ef725be0 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 31 Oct 2019 10:26:27 +0800
Subject: [PATCH 1/2] ip

---
 src/utils/request.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 031260e6..1da72057 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -25,8 +25,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

From c97874bbd5a0f0b073ce2cfcd38a6ac45c8b9dd3 Mon Sep 17 00:00:00 2001
From: bryan sun <hitsjt@gmail.com>
Date: Thu, 31 Oct 2019 17:13:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessingStatusNew.js                    |   4 +-
 .../MachiningParts/index.vue                  | 251 ++++++------
 .../PartAssignment/index.vue                  | 364 ++++++++++--------
 .../ProcessTaskAssignment/index.vue           |  45 ++-
 .../RepairTimeEntry/index.vue                 |  36 +-
 .../SparePartsForScrap/index.vue              | 347 +++++++++--------
 6 files changed, 556 insertions(+), 491 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js
index bd1818e1..00b9e3ad 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusNew.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js
@@ -105,8 +105,8 @@ export function submitEdit(Number1, completetime, processSerialNumber) {
     method: 'post',
     data: {
       type: 2,
-      name: '车间生产管理工艺_加工完成时间_补录',
-      param: '人员编号=' + Number1 + '=string&完成时间=' + completetime + '=string&工序流水号=' + processSerialNumber + '=string'
+      name: '车间生产管理工艺_零件工序_修改数据_工作者_根据人员编号和完成日期',
+      param: '人员编号=' + Number1 + '=string&完成日期=' + completetime + '=string&工序流水号=' + processSerialNumber + '=string'
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/MachiningParts/index.vue b/src/views/ManufacturingCenter/MachiningParts/index.vue
index 14226634..4edf476a 100644
--- a/src/views/ManufacturingCenter/MachiningParts/index.vue
+++ b/src/views/ManufacturingCenter/MachiningParts/index.vue
@@ -1,125 +1,132 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <span style="margin-left: 30%;font-size: 20px;">正在加工零件列表</span>
-      <el-table :data="tableData" border size="mini" highlight-current-row style="width: 1160px" stripe height="475px">
-        <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" prop="组号" align="center" width="50px">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件数量" align="center" width="80px">
-          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工序名称" prop="工艺名称" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.工艺名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工位" prop="终端编号" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.终端编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作工" prop="姓名" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="120px">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              plain
-              icon="el-icon-search"
-              @click="viewProcedures(scope.row)">查看工序</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card>
-      <span style="margin-left: 30%;font-size: 20px">待加工零件列表</span>
-      <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 1160px" stripe height="475px">
-        <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="50px">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件数量" align="center" width="80px">
-          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工序名称" prop="工艺名称" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.工艺名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工位" prop="mes终端编号" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.mes终端编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作工" prop="姓名" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="120">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              plain
-              icon="el-icon-search"
-              @click="viewProcedures(scope.row)">查看工序</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <el-row>
+      <el-col style="width: 850px">
+        <el-card style="width: 800px">
+          <span>加工日期：{{ dateTime }}</span>
+          <span style="margin-left: 20%;font-size: 20px;">正在加工零件</span>
+          <el-table :data="tableData" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
+            <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            {{ scope.row.机床名称 }}-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <el-table-column label="组号" prop="组号" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" width="100px">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            {{ scope.row.零件名称 }}-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <el-table-column label="零件数" align="center" width="60px">
+              <template slot-scope="scope">
+                {{ scope.row.批次数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名称" show-overflow-tooltip prop="工艺名" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工位" prop="终端编号" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.终端编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作工" prop="姓名" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="105px">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  plain
+                  icon="el-icon-search"
+                  @click="viewProcedures(scope.row)">查看工序</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+      <el-col style="width: 800px">
+        <el-card>
+          <span style="margin-left: 45%;font-size: 20px">待加工零件</span>
+          <el-table :data="tableData3" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
+            <el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            {{ scope.row.机床名称 }}-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" min-width="100px">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            {{ scope.row.零件名称 }}-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <el-table-column label="零件数" align="center" width="60px">
+              <template slot-scope="scope">
+                {{ scope.row.批次数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名称" prop="工艺名称" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工位" prop="mes终端编号" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.mes终端编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作工" prop="姓名" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="105">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  plain
+                  icon="el-icon-search"
+                  @click="viewProcedures(scope.row)">查看工序</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center style="min-height: 300px">
       <el-row>
@@ -177,6 +184,7 @@
 
 <script>
 import { searchData, processingStatus, searchData1 } from '@/api/ManufacturingCenter/MachiningParts'
+import { getNowShotTime } from '@/utils/tool'
 export default {
   data() {
     return {
@@ -185,7 +193,8 @@ export default {
       SparePartsNumber: '',
       SparePartsName: '',
       tableData2: [],
-      tableData3: []
+      tableData3: [],
+      dateTime: getNowShotTime()
     }
   },
   mounted() {
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 442fb7c0..0447af29 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -14,14 +14,15 @@
           </el-option>
         </el-select>
         <!--        <span>组号:</span>-->
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable @change="searchTable">
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
         <el-badge :value="value1" :max="99" class="item">
           <el-button size="small" type="text" @click="PartCallbackInformation1">外购件和标准件打回信息</el-button>
         </el-badge>
@@ -30,76 +31,76 @@
         </el-badge>
       </el-row>
     </el-card>
-    <el-card>
-      <el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">
-        <el-table-column label="项目名称" prop="项目名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床编号" prop="机床图号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床名称" prop="机床名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" prop="组号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组件名称" prop="组件名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.组件名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <!--    <el-card>-->
+    <!--      <el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">-->
+    <!--        <el-table-column label="项目名称" prop="项目名称" align="center">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.项目名称 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="机床编号" prop="机床图号" align="center">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.机床图号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="机床名称" prop="机床名称" align="center">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.机床名称 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="组号" prop="组号" align="center">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.组号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="组件名称" prop="组件名称" align="center">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.组件名称 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+    <!--    </el-card>-->
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
           <el-table :data="tableData1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="零件名称" align="center">
+            <el-table-column label="零件名称" align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件图号" align="center">
+            <el-table-column label="零件图号" align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="前零件图号" align="center">
+            <el-table-column label="前零件图号" align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.前零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="材料" align="center">
+            <el-table-column label="材料" align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件数量" align="center">
+            <el-table-column label="零件数量" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="机床数量" align="center">
+            <el-table-column label="机床数量" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center">
+            <el-table-column label="备注" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.零件备注 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="100px" fixed="right">
+            <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
                 <el-button type="danger" size="mini" icon="el-icon-delete" plain @click="OutParts(scope.row)">移出</el-button>
               </template>
@@ -202,115 +203,122 @@
         <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
       </el-tooltip>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-        <el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="Production()">车间生产</el-button>
+        <el-button type="warning" size="small" icon="el-icon-star-off" style="margin: 3px 15px 10px 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
       </el-tooltip>
     </el-card>
     <el-card>
       <el-row>
-        <span>请购单号：</span>
-        <el-input v-model="PurchaseOrder" size="small" style="width: 200px" placeholder="请购单号" clearable/>
+        <!--        <span>请购单号：</span>-->
+        <el-input v-model="PurchaseOrder" size="small" style="width: 150px" placeholder="请购单号" clearable/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">新增</el-button>
+        <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete()">删除</el-button>
       </el-row>
     </el-card>
-    <el-card>
-      <el-table :data="tableData4" border size="mini" style="width: 100%" height="200px" highlight-current-row @row-click="searchDetailed">
-        <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-column label="操作" align="center" width="250px" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card>
-      <el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
-        <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-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" min-width="150px">
-          <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-column label="操作" align="center" width="150px" fixed="right">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
-              <div style="display: inline-block;margin-right: 10px">
-                <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
-              <div style="display: inline-block">
-                <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <el-row>
+      <el-col style="width: 490px">
+        <el-card>
+          <el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
+            <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="100px">
+              <template slot-scope="scope">
+                {{ scope.row.请购车间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请购人" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.请购人 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请购时间" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.请购时间 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="操作" align="center" width="250px" fixed="right">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>-->
+            <!--            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete(scope.row)">删除</el-button>-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+          </el-table>
+        </el-card>
+      </el-col>
+      <el-col style="width: 1200px">
+        <el-card>
+          <el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
+            <el-table-column label="零件名称" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <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="90px">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件数量" align="center" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件类型" align="center" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件类型 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="交货期" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.物料计划到货时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称" align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.项目名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="机床编号" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="组号" align="center" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="120px">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block;margin-right: 10px">
+                    <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
     <el-card>
       <el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
         <el-table-column label="物料代码" align="center">
@@ -879,7 +887,7 @@ export default {
       searchgroup(this.machineNumberValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.groupNumber.push({
-            label: response.data[i].组号,
+            label: response.data[i].组号 + '    ' + response.data[i].组件名称,
             value: response.data[i].组件流水号
           })
         }
@@ -894,11 +902,18 @@ export default {
         this.check3 = 1
       } else { this.check3 = 0 }
       searchTable(this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
-        this.tableData = response.data
+        // this.tableData = response.data
+        this.projectName = response.data[0].项目名称
+        this.projectFloatValue = response.data[0].项目流水号
+        this.MachineToolNumber = response.data[0].机床图号
+        this.machineFloatValue = response.data[0].机床流水号
+        this.groupName = response.data[0].组号
+        this.groupFloatValue = response.data[0].组件流水号
         this.tableData1 = []
         this.tableData2 = []
         this.tableData3 = []
         this.loading = false
+        this.searchPart()
       })
     },
     selectPart(val) {
@@ -917,26 +932,26 @@ export default {
         })
       }
     },
-    searchPart(row) {
+    searchPart() {
       this.tableData1 = []
       this.tableData2 = []
       this.tableData3 = []
-      this.projectName = row.项目名称
-      this.projectFloatValue = row.项目流水号
-      this.MachineToolNumber = row.机床图号
-      this.machineFloatValue = row.机床流水号
-      this.groupName = row.组号
-      this.groupFloatValue = row.组件流水号
+      // this.projectName = row.项目名称
+      // this.projectFloatValue = row.项目流水号
+      // this.MachineToolNumber = row.机床图号
+      // this.machineFloatValue = row.机床流水号
+      // this.groupName = row.组号
+      // this.groupFloatValue = row.组件流水号
       if (this.PartType === '基本件') {
-        searchPart(row.组件流水号).then(response => {
+        searchPart(this.groupFloatValue).then(response => {
           this.tableData1 = response.data
         })
       } else if (this.PartType === '外购件') {
-        searchPart1(row.组件流水号, 2).then(response => {
+        searchPart1(this.groupFloatValue, 2).then(response => {
           this.tableData2 = response.data
         })
       } else if (this.PartType === '标准件') {
-        searchPart1(row.组件流水号, 1).then(response => {
+        searchPart1(this.groupFloatValue, 1).then(response => {
           this.tableData3 = response.data
         })
       }
@@ -1006,26 +1021,33 @@ export default {
         }
       })
     },
-    handleDelete(row) { // 删除单据
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteData(row.请购单流水号).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('删除成功')
-            this.tableData5 = []
-            this.tableData6 = []
-            this.searchTable1()
-          } else { this.$message.error('删除失败') }
+    handleDelete() { // 删除单据
+      console.log(this.RequisitionList)
+      if (this.RequisitionList === '') {
+        this.$message.error('请先选择请购单')
+      } else {
+        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteData(this.RequisitionList).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.tableData5 = []
+              this.tableData6 = []
+              this.searchTable1()
+            } else {
+              this.$message.error('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
+      }
     },
     OutParts(row) { // 移出数据
       this.$confirm('移出后，该零件将不再参与考核', '提示', {
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index b2166e5e..0f566d9b 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -5,8 +5,7 @@
         <el-radio :label="1">当天</el-radio>
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
-      <span>机床图号:</span>
-      <el-select v-model="graphNumValue" filterable size="small" style="margin:3px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
+      <el-select v-model="graphNumValue" filterable size="small" style="margin:3px 10px;width: 180px" placeholder="机床图号" @change="getGroupNum()">
         <el-option
           v-for="item in graphNum"
           :key="item.value"
@@ -16,8 +15,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <span style="margin-left: 10px">组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=20;getTable()">
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="margin:3px 10px;width: 150px" @change="total=0;PageCurrent=1;PageSize=20;getTable()">
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
@@ -27,42 +25,48 @@
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
     </el-card>
-
     <el-card>
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;"
+        style="width: 1000px;"
         size="mini"
-        height="500"
+        height="750"
         highlight-current-row
         border
         stripe
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
-        <el-table-column align="center" label="零件号" prop="零件号" min-width="160">
+        <el-table-column align="center" label="零件号" prop="零件号" width="160">
           <template slot-scope="scope">
             {{ scope.row.零件号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="零件名称" label="零件名称">
+        <el-table-column align="center" prop="零件名称" label="零件名称" width="130">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺开始时间" width="160">
+        <el-table-column align="center" label="工艺开始时间" width="130">
           <template slot-scope="scope">
             {{ scope.row.工艺开始时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺结束时间" width="160">
+        <el-table-column align="center" label="工艺结束时间" width="130">
           <template slot-scope="scope">
             {{ scope.row.工艺结束时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺员" width="230px">
+        <el-table-column align="center" label="工艺员" width="180px">
           <template slot-scope="scope">
-            <el-input v-model="tableData[scope.$index].工艺员" size="mini" style="width:150px" placeholder="工艺员" @click.native="selectPerson(scope.$index)"/>
+            <!--            <el-input v-model="tableData[scope.$index].工艺员" size="mini" style="width:150px" placeholder="工艺员" @click.native="selectPerson(scope.$index)"/>-->
+            <el-select v-model="tableData[scope.$index].工艺员" filterable clearable size="small" placeholder="工艺员" style="margin:3px 10px;width: 150px">
+              <el-option
+                v-for="item in Craftsmens"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column align="center" label="数量" width="80">
@@ -70,7 +74,7 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投产时间" width="160">
+        <el-table-column align="center" label="投产时间" width="130">
           <template slot-scope="scope">
             {{ scope.row.投产时间 }}
           </template>
@@ -80,7 +84,7 @@
         <el-pagination
           v-show="!loading0"
           :current-page="PageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 50]"
           :page-size="PageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -153,8 +157,9 @@ export default {
       multipleSelection: [],
       result: 0,
       PageCurrent: 1,
-      PageSize: 20,
-      total: 0
+      PageSize: 50,
+      total: 0,
+      Craftsmens: [] // 工艺员
     }
   },
   created() {
@@ -175,6 +180,12 @@ export default {
     initPerson() { // 初始化工艺员
       initPerson().then(response => {
         this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.Craftsmens.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
       })
     },
     radioChange() { // radio改变
diff --git a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
index 7b3c8b86..a2bb1023 100644
--- a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
+++ b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
@@ -1,49 +1,48 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>人员姓名:</span>
-      <el-input v-model="personnelNumber" placeholder="请双击选择人员姓名" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
-      <el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
+      <el-input v-model="personnelNumber" placeholder="请双击选择人员姓名" class="input-with-select" clearable size="small" style="width:170px;margin:3px;" @dblclick.native="dialogTableVisible"/>
+      <el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
+      <el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增修补工时</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="loading0" :data="tableData" height="500" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
+      <el-table v-loading="loading0" :data="tableData" height="750" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
         <el-table-column
           label="序号"
           type="index"
           align="center"
           width="50"/>
-        <el-table-column label="零件图号" align="center">
+        <el-table-column label="零件图号" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.零件图号_零件工艺计划 }}
           </template>
         </el-table-column>
-        <el-table-column label="修补工时" align="center">
+        <el-table-column label="修补工时" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="年" align="center">
+        <el-table-column label="年" align="center" width="50px">
           <template slot-scope="scope">
             {{ scope.row.年 }}
           </template>
         </el-table-column>
-        <el-table-column label="月" align="center">
+        <el-table-column label="月" align="center" width="50px">
           <template slot-scope="scope">
             {{ scope.row.月 }}
           </template>
         </el-table-column>
-        <el-table-column label="人员" align="center">
+        <el-table-column label="人员" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="修补工艺" align="center">
+        <el-table-column label="修补工艺" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.修补工艺 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
+        <el-table-column label="操作" align="center" width="100px">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -71,7 +70,7 @@
         <el-pagination
           v-if="!loading0"
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 50]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -258,10 +257,11 @@ export default {
       count1: 0, // 清表单验证计数器
       count2: 0, // 清表单验证计数器
       tableData: [], // 表格数据
-      pageSize: 20,
+      pageSize: 50,
       pageCurrent: 1,
       total: 0,
       dialogFormVisible: false,
+      bmbh: 12,
       title1: '',
       rules: {
         零件: [{ required: true, message: '请选择零件', trigger: 'change' }],
@@ -278,6 +278,7 @@ export default {
     this.searchTable()
     this.fetchData2()
     this.getParts()
+    this.handleNodeClick1()
   },
   methods: {
     fetchData2() {
@@ -369,6 +370,11 @@ export default {
         this.List1 = response.data
       })
     },
+    handleNodeClick1() { // 树节点点击
+      getTable8(this.bmbh).then(response => {
+        this.List1 = response.data
+      })
+    },
     fetchData3() {
       getTree().then(response => { // 获取人员信息树
         const data = response.data
@@ -476,7 +482,7 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.pageCurrent = 1
-              this.pageSize = 20
+              this.pageSize = 50
               this.searchTable()
               this.dialogFormVisible = false
             } else {
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index 765ff781..76ba3a40 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -3,199 +3,216 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px;margin-bottom: 10px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
+        <el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:150px;margin-bottom: 3px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
           <el-option
             v-for="item in ProjectName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 15px">机床号:</span>
-        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:200px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
+        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px;margin: 0px 10px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 15px">组号:</span>
-        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:200px" clearable size="small">
+        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:150px; margin: 0px 10px" clearable size="small">
           <el-option
             v-for="item in Team"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row>
-        <span>零件图号:</span>
-        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 200px" clearable/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 20px" @click="currentPage1=1; fetchTableData()">查询</el-button>
+        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="currentPage1=1; fetchTableData()">查询</el-button>
       </el-row>
     </el-card>
+    <el-row>
+      <el-col style="width: 850px">
+        <el-card style="width: 830px">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            element-loading-text="拼命加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(226,223,223,1)"
+            height="600"
+            highlight-current-row
+            border
+            stripe
+            style="width: 810px; text-align: center"
+            @current-change="fetchTableData2">
+            <el-table-column
+              align="center"
+              prop="零件图号"
+              label="零件号"
+              width="180px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="零件名称"
+              label="零件名称"
+              width="160px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province4"
+              label="批次数量"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province5"
+              label="开始时间"
+              width="100px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province6"
+              label="结束时间"
+              width="100px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province7"
+              label="零件状态"
+              width="80px"
+            >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
+                <el-tag v-else type="success" size="small">生产</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="100px"
+            >
+              <template slot-scope="scope" >
+                <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="small" @click="handleEdit(scope.row)">停产</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="currentPage1"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize1"
+              :total="total1"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 690px">
+        <el-card>
+          <el-table
+            v-loading="loading2"
+            :data="tableData2"
+            element-loading-text="拼命加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(226,223,223,1)"
+            height="600"
+            border
+            stripe
+            style="width: 830px">
+            <el-table-column
+              width="80px"
+              prop="province1"
+              label="工序顺序"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="100px"
+              prop="province2"
+              label="工艺名称"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
+            </el-table-column>
+            <el-table-column
+              prop="province4"
+              label="工艺要求"
+              align="center"
+              width="150px"
+            >
+              <template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              prop="province5"
+              label="单件定额工时"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              prop="province6"
+              label="准结定额工时"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
+            </el-table-column>
+            <el-table-column
+              width="110px"
+              prop="province7"
+              label="工艺是否完成"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <div v-if="scope.row.工序状态 === '4'"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
+                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完成</div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="currentPage2"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize2"
+              :total="total2"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange2"
+              @current-change="handleCurrentChange2"/>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
     <el-card>
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(226,223,223,1)"
-        height="250"
-        highlight-current-row
-        border
-        stripe
-        style="width: 100%; text-align: center"
-        @current-change="fetchTableData2">
-        <el-table-column
-          align="center"
-          prop="零件图号"
-          label="零件号"
-        >
-          <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="零件名称"
-          label="零件名称"
-        >
-          <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="province4"
-          label="批次数量"
-        >
-          <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="province5"
-          label="开始时间"
-        >
-          <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="province6"
-          label="结束时间"
-        >
-          <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="province7"
-          label="零件状态"
-        >
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
-            <el-tag v-else type="success" size="small">生产</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          fixed="right"
-          label="操作"
-          width="100px"
-        >
-          <template slot-scope="scope" >
-            <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="small" @click="handleEdit(scope.row)">停产</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="currentPage1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
-    </el-card>
-    <el-card>
-      <el-table
-        v-loading="loading2"
-        :data="tableData2"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(226,223,223,1)"
-        height="250"
-        border
-        stripe
-        style="width: 100%">
-        <el-table-column
-          width="80px"
-          prop="province1"
-          label="工序顺序"
-        >
-          <template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
-        </el-table-column>
-        <el-table-column
-          width="200px"
-          prop="province2"
-          label="工艺名称"
-        >
-          <template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
-        </el-table-column>
-        <el-table-column
-          prop="province4"
-          label="工艺要求"
-        >
-          <template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
-        </el-table-column>
-        <el-table-column
-          width="110px"
-          prop="province5"
-          label="单件定额工时"
-        >
-          <template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
-        </el-table-column>
-        <el-table-column
-          width="110px"
-          prop="province6"
-          label="准结定额工时"
-        >
-          <template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
-        </el-table-column>
-        <el-table-column
-          width="110px"
-          prop="province7"
-          label="工艺是否完成"
-        >
-          <template slot-scope="scope">
-            <div v-if="scope.row.工序状态 === '4'"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
-            <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完成</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="currentPage2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <el-card>
-      <div>停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
+      <div style="margin-top: 10px">停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
       <div style="margin-top: 20px; display: block">
         <span>补投接着加工零件数量</span>
-        <el-input v-model="inputA" auto-complete="off" style="width: 200px" size="small"/>
+        <el-input v-model="inputA" auto-complete="off" style="width: 100px" size="small"/>
         <span>开始工序</span>
-        <el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
-        <el-button type="success" size="small" @click="editA">补投接着生产零件</el-button>
+        <el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
+        <el-button type="primary" plain size="small" @click="editA">补投接着生产零件</el-button>
       </div>
       <!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
       <div style="margin-top: 20px; display: block">
         <span>补投重新加工零件数量</span>
-        <el-input v-model="inputC" auto-complete="off" style="width: 200px" size="small" />
+        <el-input v-model="inputC" auto-complete="off" style="width: 100px" size="small" />
         <span>开始工序</span>
-        <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
+        <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
         <el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
@@ -318,7 +335,7 @@ export default {
       Team: [], // 组号下拉框
       title: '',
       currentPage1: 1,
-      pageSize1: 10,
+      pageSize1: 40,
       total1: null,
       currentPage2: 1,
       pageSize2: 10,