diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg
new file mode 100644
index 00000000..399e3967
--- /dev/null
+++ b/src/icons/svg/ShopScheduling.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
\ No newline at end of file
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index cc10a203..b6a6d57b 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -48,11 +48,12 @@
  .hover-row td{
    background: RGB(236 245 255)!important;
  }
- .el-table td, .is-leaf{
-   background-color: rgb(255, 255, 255);
-   color: black;
-   font-weight:400
- }
+ //表格行颜色9745
+ //.el-table td, .is-leaf{
+ //  background-color: rgb(255, 255, 255);
+ //  color: black;
+ //  font-weight:400
+ //}
  .el-table--striped .el-table__body tr.el-table__row--striped td{
    background-color: #d8dde6;/*修改斑马线表格背景*/
  }
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 72443dc2..3468285d 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -4,7 +4,7 @@
       <el-col style="width: 650px">
         <el-card style="height: 800px">
           <el-row style="margin-top: 5px">
-            <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px" @change="searchTableData2">
+            <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
               <el-option
                 v-for="item in Person"
                 :key="item.value"
@@ -14,13 +14,13 @@
             <!--<el-button size="small" type="danger" style="float: right;">移除</el-button>-->
             <!--<el-button size="small" type="success" style="float: right;margin-right: 5px">添加</el-button>-->
           </el-row>
-          <el-table v-loading="loading1" :data="tableData1" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
+          <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
             <el-table-column
               label="序号"
               type="index"
               align="center"
               width="50"/>
-            <el-table-column label="图号及规格" align="center" width="180px">
+            <el-table-column label="图号及规格" align="center" width="190px">
               <template slot-scope="scope">
                 {{ scope.row.图号及规格 }}
               </template>
@@ -30,7 +30,7 @@
                 {{ 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>
@@ -62,12 +62,7 @@
       <el-col style="width: 650px">
         <el-card style="height: 800px">
           <el-table v-loading="loading2" :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
-            <el-table-column label="操作者" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.姓名 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="零件图号" align="center">
+            <el-table-column label="零件图号" align="center" width="190px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
@@ -77,19 +72,24 @@
                 {{ 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="70px">
               <template slot-scope="scope">
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
+            <el-table-column label="操作者" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
           </el-table>
-          <el-table v-loading="loading3" :data="tableData3" :row-class-name="tableRowClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
-            <el-table-column label="序号" align="center">
+          <el-table v-loading="loading3" :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
+            <el-table-column label="序号" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}
               </template>
@@ -99,17 +99,17 @@
                 {{ 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="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>
@@ -169,7 +169,8 @@ export default {
             零件名称: v.零件名称,
             投产数量: v.投产数量,
             计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
-            计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : ''
+            计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
+            状态: v.状态
           })
         })
         this.total = response.data.total
@@ -196,11 +197,14 @@ export default {
         this.loading3 = false
       })
     },
-    // ??
-    tableRowClassName({ row, rowIndex }) {
+    tableData1ClassName({ row, rowIndex }) {
+      if (row.状态 === '1') {
+        return 'CJPClingjianjinxing'
+      }
+    },
+    tableData3ClassName({ row, rowIndex }) {
       if (row.工序状态 === 4) {
-        console.log(row.工序状态)
-        return 'successsss'
+        return 'CJPCgongxuwancheng'
       }
     },
     searchTableData2() {
@@ -212,29 +216,31 @@ export default {
       })
     },
     XuanRu(row) {
-      XuanRu(this.PersonValue, row.工序流水号).then(response => {
-        if (response.data[0].result === '1') {
-          this.getParts()
-          this.loading3 = true
-          this.tableData3 = []
-          getGongxu(this.工艺计划流水号).then(response => {
-            response.data.map(v => {
-              this.tableData3.push({
-                工序流水号: v.工序流水号,
-                工序状态: v.工序状态,
-                工序顺序: v.工序顺序,
-                工艺名称: v.工艺名称,
-                排产人员: v.排产人员,
-                姓名: v.姓名,
-                排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
-                完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : ''
+      if (row.工序状态 !== 4) {
+        XuanRu(this.PersonValue, row.工序流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.getParts()
+            this.loading3 = true
+            this.tableData3 = []
+            getGongxu(this.工艺计划流水号).then(response => {
+              response.data.map(v => {
+                this.tableData3.push({
+                  工序流水号: v.工序流水号,
+                  工序状态: v.工序状态,
+                  工序顺序: v.工序顺序,
+                  工艺名称: v.工艺名称,
+                  排产人员: v.排产人员,
+                  姓名: v.姓名,
+                  排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+                  完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : ''
+                })
               })
+              this.loading3 = false
             })
-            this.loading3 = false
-          })
-          this.searchTableData2()
-        }
-      })
+            this.searchTableData2()
+          }
+        })
+      }
     },
     XuanChu(row) {
       XuanChu(row.工序流水号).then(response => {
@@ -274,7 +280,10 @@ export default {
 </script>
 
 <style>
-  .successsss{
-    background: yellowgreen !important;
+  .CJPCgongxuwancheng{
+    background: #d8e5f6 !important;
+  }
+  .CJPClingjianjinxing{
+    background: #9bd7fc !important;
   }
 </style>