全局样式修改

src/api/yieldReport/produce_report_normal.js

@@ -30,6 +30,11 @@ export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon
 // 获取当前上机卷信息
 export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
 
+// 获取当前页面的按钮
+export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWorkPlatformButtons', 'POST', data)
+
+
+
 
 
 

src/assets/scss/global.scss

@@ -224,8 +224,8 @@
 
 /* 全局缩小行间距 LR*/
 /* 针对普通的input*/
-.customer-css .el-form-item__content{
-  margin-top: -10px;
+.el-form-item__content{
+  margin-top: -3px;
 }
 
 
@@ -234,7 +234,7 @@ div.el-time-width{
   width: 120px !important;
 }
 /* 全局时间右边框*/
-.customer-css input.el-input__inner{
+input.el-input__inner{
   height: 22px !important;
   padding-right: 0px !important;
 }

src/views/modules/yieldReport/com_finish_roll.vue

@@ -453,7 +453,7 @@ export default {
         }
       ],
       buttonTags:{
-        createRollFlag: true,
+        createNewRollFlag: true,
         switchRollFlag: true,
         separatorRollFlag: true,
         finishRollFlag: true,

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -59,7 +59,7 @@
             <span>{{this.currentRollOps.rollNo}}</span>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.createNewRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               创建新卷</el-button>
           </el-form-item>
           <el-form-item>
@@ -324,7 +324,7 @@
         <el-form>
           <el-form-item>
             <el-button type="primary" @click="produceToolModal"
-                       :disabled="buttonTags.produceToolFlag" style="margin-left: 30px; margin-top: 20px;">
+                       :disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
               刀模板</el-button>
           </el-form-item>
           <el-form-item>
@@ -431,6 +431,7 @@ import {
   getSfdcRollOpsByCon,
   getSfdcDefectByCon,
   getSfdcRollByCon,
+  refreshWorkPlatformButtons,
 } from "@/api/yieldReport/produce_report_normal.js";
 /*引入组件*/
 import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@@ -2644,7 +2645,7 @@ export default {
         showFlag: false
       },
       buttonTags:{
-        createRollFlag: true,
+        createNewRollFlag: true,
         switchRollFlag: false,
         separateRollFlag: false,
         finishRollFlag: false,
@@ -2673,7 +2674,7 @@ export default {
     comProduceDown,/*生产过程的停机组件*/
   },
   methods: {
-    // 获取多语言列表
+    // 获取派工单的信息
     getScheduleDataBySeqNo(){
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
         this.scheduleData.seqNo = data.row.seqNo;
@@ -2828,7 +2829,63 @@ export default {
         this.refreshCurrentTabTable();
       }).then(() => {
         //刷新当前的菜单
-        //this.refreshCurrentButtons();
+        this.refreshPageButtons();
+      });
+    },
+
+    //刷新当前页面的菜单
+    refreshPageButtons(){
+      refreshWorkPlatformButtons(this.searchData).then(({data}) => {
+        if(data.resultMap.createNewRollFlag = 'Y'){
+          this.buttonTags.createNewRollFlag = true;
+        }else{
+          this.buttonTags.createNewRollFlag = false;
+        }
+        if(data.resultMap.switchRollFlag = 'Y'){
+          this.buttonTags.switchRollFlag = true;
+        }else{
+          this.buttonTags.switchRollFlag = false;
+        }
+        if(data.resultMap.separateRollFlag = 'Y'){
+          this.buttonTags.separateRollFlag = true;
+        }else{
+          this.buttonTags.separateRollFlag = false;
+        }
+        if(data.resultMap.finishRollFlag = 'Y'){
+          this.buttonTags.finishRollFlag = true;
+        }else{
+          this.buttonTags.finishRollFlag = false;
+        }
+        if(data.resultMap.tuningFlag = 'Y'){
+          this.buttonTags.tuningFlag = true;
+        }else{
+          this.buttonTags.tuningFlag = false;
+        }
+        if(data.resultMap.produceFlag = 'Y'){
+          this.buttonTags.produceFlag = true;
+        }else{
+          this.buttonTags.produceFlag = false;
+        }
+        if(data.resultMap.defectFlag = 'Y'){
+          this.buttonTags.defectFlag = true;
+        }else{
+          this.buttonTags.defectFlag = false;
+        }
+        if(data.resultMap.toolFlag = 'Y'){
+          this.buttonTags.toolFlag = true;
+        }else{
+          this.buttonTags.toolFlag = false;
+        }
+        if(data.resultMap.materialFlag = 'Y'){
+          this.buttonTags.materialFlag = true;
+        }else{
+          this.buttonTags.materialFlag = false;
+        }
+        if(data.resultMap.downTimeFlag = 'Y'){
+          this.buttonTags.downTimeFlag = true;
+        }else{
+          this.buttonTags.downTimeFlag = false;
+        }
       });
     },
 
@@ -2863,6 +2920,11 @@ export default {
       });
     },
 
+    //创建新卷的功能
+    createNewRollFunction(){
+      checkProduceButton('createNewRollFlag');
+    },
+
     /*切换卷操作*/
     switchRollModal(){
       //1.首先调用菜单判断方式 看看是否可以结束卷
@@ -2878,7 +2940,7 @@ export default {
     separateRollModal(){
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('separateRollFlag');
-      //打开创建分卷的页面
+      //打开创建分卷的页面         76一会还把
       this.$nextTick(() => {
         this.showSeparateFlag = true;
         this.$refs.comSeparateRoll.init(this.scheduleData.seqNo, this.operatorData)
@@ -2977,6 +3039,7 @@ export default {
       });
     },
 
+
   },
   created() {
     // this.factoryList()

src/views/modules/yieldReport/produce_order.vue

@@ -1,43 +1,43 @@
 <template>
-  <div class="customer-css">
+  <div class="">
     <!--  菜单按钮区域  -->
     <fieldset class="customer-field" style="width: 675px; padding: 0.35em 0.75em 0.425em;">
       <legend>菜单</legend>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+      <el-form :inline="true" label-position="top" label-width="100px" style="">
         <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button>
+          <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">列表</el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button>
+          <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">关闭</el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询
+                     style="margin-left: 10px;  margin-bottom: 5px;">查询
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="switchOperatorModal()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">报工
+                     style="margin-left: 10px;  margin-bottom: 5px;">报工
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC报工
+                     style="margin-left: 10px;  margin-bottom: 5px;">FQC报工
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">返工重检
+                     style="margin-left: 10px;  margin-bottom: 5px;">返工重检
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">换包装
+                     style="margin-left: 10px;  margin-bottom: 5px;">换包装
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
-                     style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC分卷
+                     style="margin-left: 10px; margin-bottom: 5px;">FQC分卷
           </el-button>
         </el-form-item>
       </el-form>