From 7d76aff9395478e63f04181cbbc1314614ea3ad1 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Sun, 30 Jan 2022 13:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=20=20=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_finish_schedule.vue       | 65 +++++++++++++++----
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
index 9ceacf0..4cc7e35 100644
--- a/src/views/modules/yieldReport/com_finish_schedule.vue
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="920px" style="height: 770px;" class="customer-dialog">
+               width="875px" style="height: 770px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 635px;"
                label-width="80px">
         <!--  卷数量统计 班次信息  -->
@@ -19,9 +19,9 @@
           </el-form-item>
           </el-col>
         </fieldset>
-        <fieldset class="customer-fieldset" style="margin-left: 266px; margin-top: -57px; width: 450px;">
+        <fieldset class="customer-fieldset" style="margin-left: 266px; margin-top: -57px; width: 400px;">
           <legend>排程班次</legend>
-          <el-col :span="8" style="margin-left: 60px; margin-top: -18px;">
+          <el-col :span="8" style="margin-left: 55px; margin-top: -18px;">
             <el-form-item :label="'当前时间'">
               <el-date-picker disabled="disabled" style="width: 145px;"
                               v-model="pageData.reportedTime"
@@ -31,12 +31,12 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4" style="margin-left: 20px; margin-top: -8px;">
+          <el-col :span="5" style="margin-left: 20px; margin-top: -8px;">
             <el-form-item class="customer-item" label="排产日期:">
               <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" style="margin-left: 20px; margin-top: -8px;">
+          <el-col :span="5" style="margin-left: 5px; margin-top: -8px;">
             <el-form-item class="customer-item" label="班次:">
               <el-input v-model="pageData.shiftDesc" disabled="disabled" style="width: 80px;"></el-input>
             </el-form-item>
@@ -44,7 +44,7 @@
         </fieldset>
           <!-- 操作员信息和班次信息 -->
         <fieldset class="customer-fieldset"
-                  style="width: 714px;">
+                  style="width: 666px;">
           <legend>生产时间(只有结束的记录才会被统计)</legend>
           <!-- 调机时间 -->
           <el-row style="margin-top: -10px;">
@@ -89,8 +89,43 @@
             </el-col>
           </el-row>
         </fieldset>
+        <fieldset class="customer-fieldset" style="margin-left: 675px; margin-top: -209px; width: 180px;">
+          <legend class="customer-legend">功能</legend>
+          <el-form>
+            <el-row style="margin-top: 18px; height: 55px;">
+              <el-col style="text-align: center">
+                <el-form-item>
+                  <el-button type="primary" @click="createNewRollFun" :disabled="buttonTags.createNewRollFlag"
+                             style="margin-left: 10px; margin-bottom: 5px;">
+                    接单关闭
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="height: 55px;">
+              <el-col style="text-align: center">
+                <el-form-item>
+                  <el-button type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
+                             style="margin-left: 10px; margin-bottom: 5px;">
+                    关闭
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="height: 55px;">
+              <el-col style="text-align: center">
+                <el-form-item>
+                  <el-button type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag"
+                             style="margin-left: 10px; margin-bottom: 5px;">
+                    刷新数据
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </fieldset>
         <!--时间记录的数据-->
-        <fieldset class="customer-fieldset" style="width: 900px;">
+        <fieldset class="customer-fieldset" style="width: 846px;">
           <legend>时间记录</legend>
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
@@ -113,7 +148,7 @@
             :data="sfdcTimeList"
             border
             v-loading="dataListLoading"
-            style="width: 890px; margin-top: 20px;">
+            style="width: 846px; margin-top: 20px;">
             <el-table-column
               v-for="(item,index) in columnTimeArray" :key="index"
               :sortable="item.columnSortable"
@@ -133,7 +168,7 @@
           </el-table>
         </fieldset>
         <!--刀模的使用记录-->
-        <fieldset class="customer-fieldset" style="width: 100%;">
+        <fieldset class="customer-fieldset" style="width: 846px;">
           <legend>刀模使用</legend>
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
@@ -156,7 +191,7 @@
             :data="sfdcToolList"
             border
             v-loading="dataListLoading"
-            style="width: 890px; margin-top: 20px;">
+            style="width: 846px; margin-top: 20px;">
             <el-table-column
               v-for="(item,index) in columnToolArray" :key="index"
               :sortable="item.columnSortable"
@@ -176,7 +211,7 @@
           </el-table>
         </fieldset>
         <!--材料的使用记录-->
-        <fieldset class="customer-fieldset" style="width: 100%;">
+        <fieldset class="customer-fieldset" style="width: 846px;">
           <legend>材料使用</legend>
           <el-row style="margin-top: -35px; width: 280px;">
             <el-col :span="6">
@@ -199,7 +234,7 @@
             :data="sfdcMaterialList"
             border
             v-loading="dataListLoading"
-            style="width: 890px; margin-top: 20px;">
+            style="width: 846px; margin-top: 20px;">
             <el-table-column
               v-for="(item,index) in columnMaterialArray" :key="index"
               :sortable="item.columnSortable"
@@ -1218,6 +1253,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+/* 因为放不下  调整下上边距*/
+.customer-css /deep/ .el-dialog {
+  top: 5vh !important;
+  margin-top: 0px !important;
+  margin-bottom: 10px;
+}
 /*调节页面button和input的上下间距*/
 .customer-css .customer-button{
   margin-top: 25px;