From 206c693287c9a5885d9478e1f30f7f62797023e4 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 29 Mar 2022 09:51:51 +0800
Subject: [PATCH] =?UTF-8?q?Fqc=E6=8E=92=E4=BA=A7=E5=8F=B3=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/schedule/order_schedule.vue | 54 ++++++++++++++-----
 .../modules/schedule/order_schedule_fqc.vue   | 49 +++++++++++------
 2 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index fc0b45b..63e4735 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -167,7 +167,7 @@
       <el-form :inline="true"  label-position="top" label-width="100px">
         <el-form-item :label="'主记录'">
         </el-form-item>
-        <el-dropdown class="customer-dropdown" size="mini" @command="orderHandleCommand">
+        <el-dropdown trigger="click" class="customer-dropdown" size="small" @command="orderHandleCommand">
           <el-button type="primary" @click="controlPrimaryMenuBun">
             主菜单<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -176,12 +176,16 @@
                               :disabled="primaryMenuButton.shopOrderFlag">生产订单</el-dropdown-item>
             <el-dropdown-item class="customer-li" command="工作日历"
                               :disabled="primaryMenuButton.workCalendarOutFlag">工作日历</el-dropdown-item>
+            <hr width="95%" />
             <el-dropdown-item class="customer-li" command="批量维护工作日历"
                               :disabled="primaryMenuButton.batchWorkCalendarFlag">批量维护工作日历</el-dropdown-item>
+            <hr width="95%" />
             <el-dropdown-item class="customer-li" command="分批排产"
                               :disabled="primaryMenuButton.splitScheduleFlag">分批排产</el-dropdown-item>
+            <hr width="95%" />
             <el-dropdown-item class="customer-li"  command="重新排产"
                               :disabled="primaryMenuButton.reScheduleOrderFlag">重新排产</el-dropdown-item>
+            <hr width="95%" />
             <el-dropdown-item class="customer-li"  command="查看物料库存"
                               :disabled="primaryMenuButton.partStockFlag">查看物料库存</el-dropdown-item>
           </el-dropdown-menu>
@@ -192,6 +196,7 @@
         :data="shopOrderList"
         border
         ref="routingTable"
+        highlight-current-row
         @row-click="setCurrentRoutingRow"
         :row-class-name="routingRowClassName"
         @row-dblclick="startScheduleOperation"
@@ -220,7 +225,7 @@
       <el-form :inline="true"  label-position="top" label-width="100px">
         <el-form-item :label="'明细记录'">
         </el-form-item>
-        <el-dropdown class="customer-dropdown" size="mini" @command="scheduleHandleCommand">
+        <el-dropdown trigger="click" class="customer-dropdown" size="mini" @command="scheduleHandleCommand">
           <el-button type="primary" @click="controlDetailMenuBun">
             明细菜单<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -229,12 +234,15 @@
                               :disabled="detailMenuButton.shopOrderFlag">生产订单</el-dropdown-item>
             <el-dropdown-item class="customer-li" command="工作日历"
                               :disabled="detailMenuButton.workCalendarOutFlag">工作日历</el-dropdown-item>
+            <hr width="95%"/>
             <el-dropdown-item class="customer-li" command="更改等待时间"
                               :disabled="detailMenuButton.changeWaitTimeFlag">更改等待时间</el-dropdown-item>
             <el-dropdown-item class="customer-li" command="根据工艺路线调整"
                               :disabled="detailMenuButton.changeScheduleByRoutingFlag">根据工艺路线调整</el-dropdown-item>
+            <hr width="95%"/>
             <el-dropdown-item class="customer-li"  command="根据工作日历调整"
                               :disabled="detailMenuButton.changeScheduleByRoutingFlag">根据工作日历调整</el-dropdown-item>
+            <hr width="95%"/>
             <el-dropdown-item class="customer-li"  command="查看物料库存"
                               :disabled="detailMenuButton.partStockFlag">查看物料库存</el-dropdown-item>
           </el-dropdown-menu>
@@ -1884,7 +1892,14 @@ export default {
           this.$message.error('请选择工单!');
           return false;
         }
-        this.$router.push('/shopOrder-shopOrder/shopOrder', this.currentRoutingRow.orderNo)
+        this.$router.push({
+          path: '/shopOrder-shopOrder/shopOrder',
+          query: {
+            site: this.$store.state.user.site,
+            order: this.currentRoutingRow.orderNo,
+            user: this.$store.state.user.name
+          }
+        })
       }else if('工作日历' === menuName){
         //判断是否选择好了工单
         if(this.currentRoutingRow == null || this.currentRoutingRow == {}){
@@ -1969,7 +1984,14 @@ export default {
           this.$message.error('请选择派工单!');
           return false;
         }
-        this.$router.push('/shopOrder-shopOrder/shopOrder', this.currentSchedlingRow.orderNo)
+        this.$router.push({
+          path: '/shopOrder-shopOrder/shopOrder',
+          query: {
+            site: this.$store.state.user.site,
+            user: this.$store.state.user.name,
+            order: this.currentSchedlingRow.orderNo,
+          }
+        })
       }else if('工作日历' === menuName){
         //判断是否选择好了工单
         if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){
@@ -2271,7 +2293,7 @@ export default {
     /*重新排产的方法*/
     initReScheduleWorkOrders(){
       reScheduleWorkOrders(this.pageData).then(({data}) => {
-        if(data.code == 500){
+        if(data.code != 200){
           this.$message.error(data.msg);
         }else{
           this.$message.success(data.msg);
@@ -2301,7 +2323,7 @@ export default {
                          'scheduleSeqNo': scheduleRow.scheduledSeqNo};
       //请求处理当前的参数
       moveUpSchedule(requestData).then(({data}) => {
-        if(data.code == 500){
+        if(data.code != 200){
           this.$message.error(data.msg);
         }else{
           this.$message.success(data.msg);
@@ -2334,7 +2356,7 @@ export default {
         'scheduleSeqNo': scheduleRow.scheduledSeqNo};
       //请求处理当前的参数
       moveDownSchedule(requestData).then(({data}) => {
-        if(data.code == 500){
+        if(data.code != 200){
           this.$message.error(data.msg);
         }else{
           this.$message.success(data.msg);
@@ -2420,7 +2442,7 @@ export default {
         'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
         'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
       refreshScheduleByRouting(requestData).then(({data}) => {
-        if(data.code != 500){
+        if(data.code != 200){
           this.$message.error(data.msg);
         }else{
           this.$message.success(data.msg);
@@ -2450,7 +2472,7 @@ export default {
         'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
         'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
       refreshScheduleByCalendar(requestData).then(({data}) => {
-        if(data.code == 500){
+        if(data.code != 200){
           this.$message.error(data.msg);
         }else{
           this.$message.success(data.msg);
@@ -2544,12 +2566,17 @@ div.customer-el-card-blue {
 }
 
 /*灰色的表格行背景颜色*/
-.customer-css /deep/ tr.customer-row-gray{
+.customer-css /deep/ tr.customer-row-gray:hover {
+  background: #7e819e;
+}
+
+/*灰色的表格行背景颜色*/
+.customer-css /deep/ tr.customer-row-gray > td{
   background: #7e819e;
 }
 
 /*去掉悬浮的样式*/
-.customer-css /deep/ tr:hover > td{
+/*.customer-css /deep/ tr:hover > td{
   background-color: transparent !important;
 }
 
@@ -2559,7 +2586,7 @@ div.customer-el-card-blue {
 
 .customer-css /deep/ tr.hover-row > td{
   background-color: transparent !important;
-}
+}*/
 
 /*添加主菜单和明细菜单的样式*/
 .customer-css .customer-dropdown .el-button--primary{
@@ -2578,4 +2605,7 @@ div.customer-el-card-blue {
   display: none;
 }
 /*控制上下间距*/
+hr {
+  margin-top: 0px;
+}
 </style>
diff --git a/src/views/modules/schedule/order_schedule_fqc.vue b/src/views/modules/schedule/order_schedule_fqc.vue
index 3a108f1..2e3457d 100644
--- a/src/views/modules/schedule/order_schedule_fqc.vue
+++ b/src/views/modules/schedule/order_schedule_fqc.vue
@@ -115,15 +115,17 @@
             <legend>可用操作员</legend>
             <el-row>
               <el-col :span="6">
-                <el-dropdown class="customer-dropdown" size="small" @command="operatorHandleCommand">
+                <el-dropdown trigger="click" class="customer-dropdown" size="mini" @command="operatorHandleCommand">
                   <el-button type="primary" @click="controlOperatorMenuBun">
                     菜单<i class="el-icon-arrow-down el-icon--right"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item class="customer-li" command="工作日历"
                                       :disabled="operatorMenuButton.workCalendarOutFlag">工作日历</el-dropdown-item>
+                    <hr width="95%" />
                     <el-dropdown-item class="customer-li" command="批量维护工作日历"
                                       :disabled="operatorMenuButton.batchWorkCalendarFlag">批量维护工作日历</el-dropdown-item>
+                    <hr width="95%" />
                     <el-dropdown-item class="customer-li" command="重新排产"
                                       :disabled="operatorMenuButton.reScheduleOrderFlag">重新排产</el-dropdown-item>
                   </el-dropdown-menu>
@@ -1856,7 +1858,14 @@ export default {
         return false;
       }
       //跳转页面
-      this.$router.push('/shopOrder-shopOrder/shopOrder', this.currentScheduleRow.orderNo)
+      this.$router.push({
+        path: '/shopOrder-shopOrder/shopOrder',
+        query: {
+          site: this.$store.state.user.site,
+          user: this.$store.state.user.name,
+          order: this.currentScheduleRow.orderNo,
+        }
+      });
     },
 
     /*打开工单的页面*/
@@ -1868,7 +1877,14 @@ export default {
         return false;
       }
       //跳转页面
-      this.$router.push('/shopOrder-shopOrder/shopOrder', this.currentRoutingRow.orderNo)
+      this.$router.push({
+        path: '/shopOrder-shopOrder/shopOrder',
+        query: {
+          site: this.$store.state.user.site,
+          user: this.$store.state.user.name,
+          order: this.currentRoutingRow.orderNo,
+        }
+      });
     },
 
   },
@@ -1957,21 +1973,13 @@ div.customer-el-card-blue {
 }
 
 /*灰色的表格行背景颜色*/
-.customer-css /deep/ tr.customer-row-gray {
+.customer-css /deep/ tr.customer-row-gray:hover {
   background: #7e819e;
 }
 
-/*去掉悬浮的样式*/
-.customer-css /deep/ tr:hover > td {
-  background-color: transparent !important;
-}
-
-.customer-css /deep/ tr.hover-row.current-row > td {
-  background-color: transparent !important;
-}
-
-.customer-css /deep/ tr.hover-row > td {
-  background-color: transparent !important;
+/*灰色的表格行背景颜色*/
+.customer-css /deep/ tr.customer-row-gray > td{
+  background: #7e819e;
 }
 
 /*添加主菜单和明细菜单的样式*/
@@ -2040,4 +2048,15 @@ div.table-input /deep/ input.el-input__inner{
   text-align: right;
 }
 
+hr {
+  margin-top: 0px;
+  margin-bottom: 2px;
+}
+
+/*设置间距*/
+.el-dropdown-menu /deep/ li.customer-li{
+  font-size: 12px;
+  line-height: 16px;
+  padding: 4px 8px;
+}
 </style>