样式BUG 修改

src/api/yieldReport/produce_report_normal.js

@@ -50,7 +50,8 @@ export const deleteSfdcRolls = data => createAPI('schedule/deleteSfdcRolls', 'PO
 export const processFinishTool = data => createAPI('schedule/processFinishTool', 'POST', data)
 
 //执行材料结束使用 且未剩余的方法
-export const processFinishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data)
+export const finishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data)
+
 
 
 

src/views/modules/yieldReport/com_finish_roll.vue

@@ -16,19 +16,19 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button class="customer-bun-min" type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
                 列表</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
               刷新</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button  class="customer-bun-min" type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
               结束卷</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button  class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
               关闭</el-button>
             </el-form-item>
           </el-col>
@@ -868,4 +868,24 @@ div.table-input /deep/ input.el-input__inner{
   text-align: right;
 }
 
+/*当前按钮的通用样式*/
+.customer-css .customer-bun-mid{
+  width: 65px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-min{
+  width: 50px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-max{
+  width: 80px;
+  text-align: center;
+}
+/*当前按钮的通用样式*/
+.customer-css .el-button--medium {
+  padding: 5px 5px;
+}
+
 </style>

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -53,15 +53,15 @@
           </el-form-item>
         </el-form>
         <!-- 第四行菜单 -->
-        <fieldset class="customer-fieldset" style="width: 585px;">
+        <fieldset class="customer-fieldset" style="width: 588px;">
           <legend class="customer-legend">卷操作</legend>
           <el-form>
-            <el-form-item style="width: 90px;">
+            <el-form-item class="customer-roll-css" style="width: 115px; font-size: 16px; color: #387877;">
               <span>{{ this.currentRollOps.rollNo }}</span>
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" @click="createNewRollFun" :disabled="buttonTags.createNewRollFlag"
-                         style="margin-left: 0px; margin-bottom: 5px;">
+                         style="margin-left: 5px; margin-bottom: 5px;">
                 创建新卷
               </el-button>
             </el-form-item>
@@ -2982,6 +2982,15 @@ export default {
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
       this.operatorData = operatorData;
+      //清空当前的页面列表参数
+      this.sfdcTimeList = [];
+      this.sfdcToolList = [];
+      this.sfdcMaterialList = [];
+      this.sfdcRollOpsList = [];
+      this.sfdcDefectList = [];
+      this.sfdcRollList = [];
+      //设置table页签
+      this.activeTable = 'sfdc_time';
       //刷新当前派工单的信息
       this.refreshPageData();
     },
@@ -3013,7 +3022,7 @@ export default {
       await  this.getCurrentRollOpsBySeqNoFun();
 
         //设置table页签
-        this.activeTable = 'sfdc_time';
+        //this.activeTable = 'sfdc_time';
         //刷新当前页签的table的内容
         await this.refreshCurrentTabTable();
 
@@ -3467,12 +3476,12 @@ export default {
 
 /*当前按钮的通用样式*/
 .customer-css .customer-bun-mid{
-  width: 65px;
+  width: 60px;
   text-align: center;
 }
 
 .customer-css .customer-bun-min{
-  width: 45px;
+  width: 50px;
   text-align: center;
 }
 
@@ -3485,5 +3494,10 @@ export default {
   padding: 5px 5px;
 }
 
+.customer-css .customer-roll-css span{
+  font-size: 16px;
+  color: #387877;
+}
+
 
 </style>

src/views/modules/yieldReport/com_produce_tool.vue

@@ -200,11 +200,7 @@ export default {
 
     /*添加刀模记录*/
     addToolInstanceIdFun(){
-      //判断是否校验通过
-      if(!this.pageData.checkFlag){
-        this.$message.error('校验失败,请重试!')
-        return false;
-      }
+      /*添加工具的实例*/
       addToolInstanceId(this.pageData).then(({data}) => {
         if(data.code == 500){
           this.$message.error(data.msg);