From 839bb64eefc6a4fa851ca53a09c5793d9a093847 Mon Sep 17 00:00:00 2001
From: bryan sun <hitsjt@gmail.com>
Date: Sat, 2 Nov 2019 12:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E5=B7=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 .../ActualTimeSupplement/index.vue            |  9 ++-
 .../MachiningParts/index.vue                  | 79 +++++++++----------
 .../ManHourStatistics/index.vue               |  2 +-
 .../PartAssignment/index.vue                  | 72 ++++++++---------
 .../PartWorkCraftSelect_rdlc/index.vue        | 22 +++---
 .../ProcessTaskAssignment/index.vue           |  5 +-
 .../ProcessingStatusNew/index.vue             | 28 +++----
 .../ScheduleCompletionDetails/index.vue       |  8 +-
 .../ShopScheduling/index.vue                  | 10 +--
 10 files changed, 118 insertions(+), 119 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 1da72057..f7dc2b40 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -25,7 +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.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
index 73e02633..3ca27de2 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -86,12 +86,12 @@
         </el-table-column>
         <el-table-column label="实际开始时间" align="center" min-width="160px">
           <template slot-scope="scope">
-            {{ scope.row.加工开始时间 || '—' }}
+            {{ scope.row.加工开始时间 === '1900/1/1 0:00:00' ? '-' : scope.row.加工开始时间 }}
           </template>
         </el-table-column>
         <el-table-column label="实际完成时间" align="center" min-width="160px">
           <template slot-scope="scope">
-            {{ scope.row.加工完成时间 || '—' }}
+            {{ scope.row.加工完成时间 === '1900/1/1 0:00:00' ? '-' : scope.row.加工完成时间 }}
           </template>
         </el-table-column>
         <el-table-column label="实际工时" align="center" min-width="70px">
@@ -150,7 +150,7 @@
       <div class="block">
         <el-pagination
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 50]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -271,7 +271,7 @@ export default {
       startTime2: '',
       endTime2: '',
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 50,
       total: 0,
       tableData: [],
       dialogFormVisible: false,
@@ -507,6 +507,7 @@ export default {
       this.partNumber ? check4 = 1 : check4 = 0
       this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0
       searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => {
+        console.log(res.data.rows, 898989)
         this.tableData = res.data.rows
         this.total = res.data.total
         this.tableData.map(v => {
diff --git a/src/views/ManufacturingCenter/MachiningParts/index.vue b/src/views/ManufacturingCenter/MachiningParts/index.vue
index 4edf476a..95c0a40b 100644
--- a/src/views/ManufacturingCenter/MachiningParts/index.vue
+++ b/src/views/ManufacturingCenter/MachiningParts/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <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">
+      <el-col style="width: 610px">
+        <el-card style="width:610px">
+          <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-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
@@ -16,12 +16,12 @@
             <!--            {{ scope.row.机床名称 }}-->
             <!--          </template>-->
             <!--        </el-table-column>-->
-            <el-table-column label="组号" prop="组号" align="center" width="70px">
+            <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="180px">
+            <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="140px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
@@ -31,12 +31,12 @@
             <!--            {{ scope.row.零件名称 }}-->
             <!--          </template>-->
             <!--        </el-table-column>-->
-            <el-table-column label="零件数" align="center" width="60px">
+            <el-table-column label="数量" 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="70px">
+            <el-table-column label="工序" show-overflow-tooltip prop="工艺名" align="center" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}
               </template>
@@ -46,29 +46,28 @@
                 {{ scope.row.终端编号 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作工" prop="姓名" align="center" width="90px">
+            <el-table-column label="操作者" prop="姓名" show-overflow-tooltip align="center" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="105px">
+            <el-table-column label="操作" align="center" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="primary"
-                  plain
+                  type="text"
                   icon="el-icon-search"
-                  @click="viewProcedures(scope.row)">查看工序</el-button>
+                  @click="viewProcedures(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 800px">
+      <el-col style="width: 610px">
         <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">
+          <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-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
@@ -78,12 +77,12 @@
             <!--            {{ scope.row.机床名称 }}-->
             <!--          </template>-->
             <!--        </el-table-column>-->
-            <el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="70px">
+            <el-table-column label="组号" prop="组号" show-overflow-tooltip 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="180px">
+            <el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="130px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
@@ -93,34 +92,33 @@
             <!--            {{ scope.row.零件名称 }}-->
             <!--          </template>-->
             <!--        </el-table-column>-->
-            <el-table-column label="零件数" align="center" width="60px">
+            <el-table-column label="数量" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="工序名称" prop="工艺名称" align="center" width="70px">
+            <el-table-column label="工序" prop="工艺名称" align="center" width="60px">
               <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终端编号 }}
+                {{ scope.row.MES终端编号 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作工" prop="姓名" align="center" width="90px">
+            <el-table-column label="操作者" show-overflow-tooltip prop="姓名" align="center" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="105">
+            <el-table-column label="操作" align="center" width="70">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="primary"
-                  plain
+                  type="text"
                   icon="el-icon-search"
-                  @click="viewProcedures(scope.row)">查看工序</el-button>
+                  @click="viewProcedures(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -128,18 +126,18 @@
       </el-col>
     </el-row>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center width="550px">
       <el-row>
         <span>零件图号:</span>
-        <el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
+        <el-input v-model="SparePartsNumber" style="width: 150px" size="small"/>
         <span>零件名称:</span>
-        <el-input v-model="SparePartsName" style="width: 200px" size="small"/>
+        <el-input v-model="SparePartsName" style="width: 150px" size="small"/>
       </el-row>
       <el-table
         :data="tableData2"
-        style="width: 100%;margin-top: 20px"
+        style="width: 515px;margin-top: 20px"
         size="mini"
-        height="300"
+        height="320"
         stripe
         highlight-current-row
         border>
@@ -148,29 +146,29 @@
             {{ scope.row.工序顺序 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="120">
+        <el-table-column align="center" label="工艺名称" width="90">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺要求">
+        <el-table-column align="center" label="工艺要求" width="100">
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作工">
+        <el-table-column align="center" label="操作工" width="70">
           <template slot-scope="scope">
-            {{ scope.row.员工姓名 }}
+            {{ scope.row.操作员 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="120">
+        <el-table-column align="center" label="工序完成" width="80">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否质检" width="120">
+        <el-table-column align="center" label="工序质检" width="80">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
             <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
@@ -209,6 +207,7 @@ export default {
     },
     fetchData1() {
       searchData1().then(response => {
+        console.log(response, 121212)
         this.tableData3 = response.data
       })
     },
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index 33b6167d..b7384daa 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -22,7 +22,7 @@
       </el-tooltip>
     </el-card>
     <el-card style="width: 585px">
-      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 585px" border element-loading-text="拼命加载中">
+      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 585px" height="650px" border element-loading-text="拼命加载中">
         <el-table-column label="操作者" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 0447af29..02a55269 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -110,37 +110,37 @@
         <el-tab-pane label="外购件">
           <el-table :data="tableData2" 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="120">
               <template slot-scope="scope">
                 {{ scope.row.物料代码 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料名称" align="center">
+            <el-table-column label="物料名称" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料规格" align="center">
+            <el-table-column label="物料规格" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料型号" align="center">
+            <el-table-column label="物料型号" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件数量" align="center">
+            <el-table-column label="零件数量" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="机床数量" align="center">
+            <el-table-column label="机床数量" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center">
+            <el-table-column label="备注" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
@@ -150,37 +150,37 @@
         <el-tab-pane label="标准件">
           <el-table :data="tableData3" 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="120">
               <template slot-scope="scope">
                 {{ scope.row.物料代码 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料名称" align="center">
+            <el-table-column label="物料名称" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料规格" align="center">
+            <el-table-column label="物料规格" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料型号" align="center">
+            <el-table-column label="物料型号" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件数量" align="center">
+            <el-table-column label="零件数量" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="机床数量" align="center">
+            <el-table-column label="机床数量" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center">
+            <el-table-column label="备注" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
@@ -216,25 +216,25 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 490px">
+      <el-col style="width: 300px">
         <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">
+            <el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
               <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">
+            <!--            <el-table-column label="请购车间" align="center" width="100px">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                {{ scope.row.请购车间 }}-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
+            <el-table-column label="请购人" align="center" show-overflow-tooltip width="60px">
               <template slot-scope="scope">
                 {{ scope.row.请购人 }}
               </template>
             </el-table-column>
-            <el-table-column label="请购时间" align="center" width="100px">
+            <el-table-column label="请购时间" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.请购时间 }}
               </template>
@@ -248,30 +248,30 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 1200px">
+      <el-col style="width: 900px">
         <el-card>
           <el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
-            <el-table-column label="零件名称" align="center" width="90px">
+            <el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件图号" align="center" width="140px">
+            <el-table-column label="零件图号" show-overflow-tooltip align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="材料" align="center" width="90px">
+            <el-table-column label="材料" show-overflow-tooltip align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件数量" align="center" width="80px">
+            <el-table-column label="数量" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件类型" align="center" width="80px">
+            <el-table-column label="零件类型" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.零件类型 }}
               </template>
@@ -281,22 +281,22 @@
                 {{ 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="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">
+            <el-table-column label="组号" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" width="150px">
+            <el-table-column label="备注" align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 8df6ee89..5651e75f 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -3,8 +3,8 @@
     <el-card>
       <div>
         <el-row>
-          <span style="margin-left: 10px">机床号：</span>
-          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-bottom: 10px" clearable @change="machineChange">
+          <!--          <span style="margin-left: 10px">机床号：</span>-->
+          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
             <el-option
               v-for="item in machineNumber"
               :key="item.value"
@@ -14,27 +14,25 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
             </el-option>
           </el-select>
-          <span style="margin-left: 10px">组号：</span>
-          <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
+          <!--          <span style="margin-left: 10px">组号：</span>-->
+          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px" size="small" clearable>
             <el-option
               v-for="item in groupNumber"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <span style="margin-left: 10px">零件号：</span>
-          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
-        </el-row>
-        <el-row>
-          <span style="margin-left: 10px">工艺员：</span>
-          <el-select v-model="personValue" placeholder="工艺员" size="small" clearable >
+          <!--          <span style="margin-left: 10px">零件号：</span>-->
+          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px"/>
+          <!--          <span style="margin-left: 10px">工艺员：</span>-->
+          <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px" clearable >
             <el-option
               v-for="item in person"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
+          <el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
         </el-row>
       </div>
     </el-card>
@@ -53,7 +51,7 @@
           type="selection"
           align="center"
           width="55"/>
-        <el-table-column label="机床号" prop="机床图号" align="center">
+        <el-table-column label="机床号" prop="机床图号" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 0f566d9b..accec227 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -352,14 +352,15 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
+      console.log(val)
     },
     save() {
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        if (this.multipleSelection[i].人员编号 === '') {
+        if (this.multipleSelection[i].工艺员 === '') {
           this.$message.error('请选择工艺员')
         } else {
           this.result = 0
-          save(this.multipleSelection[i].工艺计划流水号, this.multipleSelection[i].人员编号, this.multipleSelection[i].零件号).then(response => {
+          save(this.multipleSelection[i].工艺计划流水号, this.multipleSelection[i].工艺员, this.multipleSelection[i].零件号).then(response => {
             this.result += parseInt(response.data[0].result)
             if (this.result === this.multipleSelection.length) {
               this.$message.success('保存成功')
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 7341a208..d520e241 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -23,7 +23,7 @@
       <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
     </el-card>
     <el-row>
-      <el-col style="width: 630px">
+      <el-col style="width: 550px">
         <el-card>
           <el-table
             :data="tableData1"
@@ -36,22 +36,22 @@
             border
             @current-change="getRow">
             <el-table-column type="index" label="序号" width="50"/>
-            <el-table-column align="center" label="工艺名" width="90">
+            <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="90">
+            <el-table-column align="center" label="质检" width="60">
               <template slot-scope="scope">
                 {{ scope.row.序间质检 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="不合格数" width="90">
+            <el-table-column align="center" label="不合格数" width="80">
               <template slot-scope="scope">
                 {{ scope.row.不合格数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="操作者" show-overflow-tooltip width="90">
+            <el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
               <template slot-scope="scope">
                 {{ scope.row.操作者 }}
               </template>
@@ -61,7 +61,7 @@
                 {{ scope.row.排产日期 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="完成日期" width="100">
+            <el-table-column align="center" label="完成日期" width="95">
               <template slot-scope="scope">
                 {{ scope.row.完成日期 }}
               </template>
@@ -69,7 +69,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 930px">
+      <el-col style="width: 670px">
         <el-card>
           <el-table
             :data="tableData"
@@ -78,39 +78,39 @@
             class="table"
             highlight-current-row
             border
-            height="800"
+            height="630"
             @current-change="getCurrentRow">
             <el-table-column type="index" label="序号" width="80">
               <template slot-scope="scope">
                 <el-radio :label="scope.row.序号" v-model="radio"/>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="130">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
+            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="80">
               <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="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="70">
               <template slot-scope="scope">
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="加工完成" width="110">
+            <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="110">
+            <el-table-column align="center" label="计划完成" width="100">
               <template slot-scope="scope">
                 {{ scope.row.计划结束时间 }}
               </template>
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 225aa1ca..80af3cc6 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -31,7 +31,7 @@
             size="mini"
             stripe
             style="width: 100%;"
-            height="800px"
+            height="700px"
             border
             element-loading-text="拼命加载中"
             @row-click="searchTable2">
@@ -66,15 +66,15 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="margin-left: 0px;width: 850px">
+      <el-col style="margin-left: 0px;width: 810px">
         <el-card>
-          <el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="800px" border element-loading-text="拼命加载中">
+          <el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
             <el-table-column label="零件图号" align="center" width="170px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件名称" align="center" width="130px" show-overflow-tooltip>
+            <el-table-column label="零件名称" align="center" width="90px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 309e48c0..7d221ad8 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col style="width: 650px">
-        <el-card style="height: 800px">
+      <el-col style="width: 610px">
+        <el-card style="height: 680px">
           <el-row style="margin-top: 5px">
             <el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 150px" @keyup.enter.native="getParts"/>
             <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
@@ -19,7 +19,7 @@
               type="index"
               align="center"
               width="50"/>
-            <el-table-column label="图号及规格" align="center" width="190px">
+            <el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.图号及规格 }}
               </template>
@@ -58,8 +58,8 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 650px">
-        <el-card style="height: 800px">
+      <el-col style="width: 600px">
+        <el-card style="height: 680px">
           <el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
             <el-table-column label="零件图号" align="center" width="190px">
               <template slot-scope="scope">