From ef36823208718a217c6655bc44e4229a49b4e979 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 4 Mar 2022 16:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=95=8C=E9=9D=A2=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 128 ++++++++++--------
 1 file changed, 69 insertions(+), 59 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 9a77ba8..f13b9a2 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1,62 +1,62 @@
 <template>
-  <div class="produce-report">
+  <div class="produce-report customer-css">
     <el-dialog v-drag
-               width="820px" class="customer-dialog"
+               width="900px" class="customer-dialog"
                :title="titleCon" v-bind="$attrs" v-on="$listeners">
-      <el-form :inline="true" label-position="top" style="height: 460px;"
+      <el-form :inline="true" label-position="top" style="height: 507px;"
                label-width="80px">
         <!-- 第一行信息 -->
         <el-form style="margin-top: -10px;">
-          <el-form-item label="订单号:">
+          <el-form-item label="订单号:" class="customer-item">
             <el-input v-model="scheduleData.orderNo" :readonly="true" style="width: 130px;"></el-input>
           </el-form-item>
-          <el-form-item label="物料编码:">
+          <el-form-item label="物料编码:" class="customer-item">
             <el-input v-model="scheduleData.partNo" :readonly="true" style="width: 130px;"></el-input>
           </el-form-item>
-          <el-form-item label="物料名称/规则:">
+          <el-form-item label="物料名称/规则:" class="customer-item">
             <el-input v-model="scheduleData.partDesc" :readonly="true" style="width: 200px;"></el-input>
           </el-form-item>
-          <el-form-item label="派工单号:">
+          <el-form-item label="派工单号:" class="customer-item">
             <el-input v-model="scheduleData.seqNo" :readonly="true" style="width: 80px;"></el-input>
           </el-form-item>
         </el-form>
         <!-- 第二行信息 -->
         <el-form>
-          <el-form-item label="要求完工日期">
+          <el-form-item label="要求完工日期" class="customer-item">
             <el-input v-model="scheduleData.planFinishTime" :readonly="true" style="width: 130px;"></el-input>
           </el-form-item>
-          <el-form-item label="要求开工日期">
+          <el-form-item label="要求开工日期" class="customer-item">
             <el-input v-model="scheduleData.planStartTime" :readonly="true" style="width: 130px;"></el-input>
           </el-form-item>
-          <el-form-item label="原始派工单需求数量">
+          <el-form-item label="原始派工单需求数量" class="customer-item">
             <el-input v-model="scheduleData.qtyRequiredOriginal" :readonly="true" style="width: 80px;"></el-input>
           </el-form-item>
-          <el-form-item label="排产日期">
+          <el-form-item label="排产日期" class="customer-item">
             <el-input v-model="scheduleData.scheduledDate" :readonly="true" style="width: 80px;"></el-input>
           </el-form-item>
-          <el-form-item label="班次">
+          <el-form-item label="班次" class="customer-item">
             <el-input v-model="scheduleData.shiftNo" :readonly="true" style="width: 80px;"></el-input>
           </el-form-item>
         </el-form>
         <!-- 第三行信息 -->
         <el-form>
-          <el-form-item label="前道工序">
+          <el-form-item label="前道工序" class="customer-item">
             <el-input v-model="scheduleData.preItemDesc" :readonly="true" style="width: 180px;"></el-input>
           </el-form-item>
-          <el-form-item label="后道工序" prop="languageDefault">
+          <el-form-item label="后道工序" prop="languageDefault" class="customer-item">
             <el-input v-model="scheduleData.nextItemDesc" :readonly="true" style="width: 180px;"></el-input>
           </el-form-item>
-          <el-form-item :label="''" style="margin-left: -5px;">
-            <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
+          <el-form-item :label="''" style="margin-left: -5px;" class="customer-item">
+            <el-checkbox style="margin-left: 30px; margin-top: 28px;" true-label="true" false-label="false"
                          v-model="scheduleData.currentRollFlag">仅显示当前卷信息
             </el-checkbox>
           </el-form-item>
         </el-form>
         <!-- 第四行菜单 -->
-        <fieldset class="customer-fieldset" style="width: 588px;">
+        <fieldset class="customer-fieldset" style="width: 660px;">
           <legend class="customer-legend">卷操作</legend>
           <el-form>
-            <el-form-item class="customer-roll-css" style="width: 115px; font-size: 16px; color: #387877;">
+            <el-form-item class="customer-roll-css" style="width: 130px; font-size: 16px; color: #387877;">
               <span>{{ this.currentRollOps.rollNo }}</span>
             </el-form-item>
             <el-form-item>
@@ -67,31 +67,31 @@
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
-                         style="margin-left: 0px; margin-bottom: 5px;">
+                         style="margin-left: 10px; margin-bottom: 5px;">
                 切换卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag"
-                         style="margin-left: 0px; margin-bottom: 5px;">
+                         style="margin-left: 10px; margin-bottom: 5px;">
                 创建分卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishRollFlag"
-                         @click="finishRollModal" style="margin-left: 0px; margin-bottom: 5px;">
+                         @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
                 结束卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag"
-                         @click="mergeRollModal" style="margin-left: 0px; margin-bottom: 5px;">
+                         @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
                 合并卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary"
-                         @click="showFinishScheduleModal" style="margin-left: 0px; margin-bottom: 5px;">
+                         @click="showFinishScheduleModal" style="margin-left: 10px; margin-bottom: 5px;">
                 结单
               </el-button>
             </el-form-item>
@@ -99,13 +99,13 @@
         </fieldset>
 
         <!-- 列表展示区域 -->
-        <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 585px; height: 260px;">
+        <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 310px;">
           <legend class="customer-legend">列表信息</legend>
-          <el-tabs v-model="activeTable" style="margin-top: -3px; width: 580px; height: 238px;"
+          <el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 285px;"
                    type="border-card" @tab-click="tabClick" class="customer-tab">
             <el-tab-pane label="时间" name="sfdc_time">
               <el-table
-                height="210"
+                height="260"
                 :data="sfdcTimeList"
                 border
                 v-loading="dataListLoading"
@@ -130,7 +130,7 @@
             </el-tab-pane>
             <el-tab-pane label="刀模板记录" name="sfdc_tool">
               <el-table
-                height="95"
+                height="120"
                 :data="orderToolList"
                 border
                 v-loading="dataListLoading"
@@ -153,7 +153,7 @@
                 </el-table-column>
               </el-table>
               <el-table
-                height="115"
+                height="140"
                 :data="sfdcToolList"
                 border
                 v-loading="dataListLoading"
@@ -191,7 +191,7 @@
             </el-tab-pane>
             <el-tab-pane label="材料" name="sfdc_material">
               <el-table
-                height="95"
+                height="120"
                 :data="orderBomList"
                 border
                 v-loading="dataListLoading"
@@ -214,7 +214,7 @@
                 </el-table-column>
               </el-table>
               <el-table
-                height="115"
+                height="140"
                 :data="sfdcMaterialList"
                 border
                 v-loading="dataListLoading"
@@ -254,7 +254,7 @@
             </el-tab-pane>
             <el-tab-pane label="生产卷的操作信息" name="sfdc_rollOps">
               <el-table
-                height="210"
+                height="260"
                 :data="sfdcRollOpsList"
                 border
                 v-loading="dataListLoading"
@@ -279,7 +279,7 @@
             </el-tab-pane>
             <el-tab-pane label="不良记录" name="sfdc_defect">
               <el-table
-                height="210"
+                height="260"
                 :data="sfdcDefectList"
                 border
                 v-loading="dataListLoading"
@@ -305,7 +305,7 @@
             </el-tab-pane>
             <el-tab-pane label="机器下机卷" name="sfdc_roll">
               <el-table
-                height="210"
+                height="260"
                 :data="sfdcRollList"
                 border
                 v-loading="dataListLoading"
@@ -345,7 +345,7 @@
         </fieldset>
         <!-- 生产调机菜单 -->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 600px; margin-top: -460px; width: 200px; height: 120px;">
+                  style="margin-left: 680px; margin-top: -510px; width: 200px; height: 130px;">
           <legend class="customer-legend">生产调机</legend>
           <el-form>
             <el-form-item>
@@ -359,13 +359,13 @@
                 切换用户
               </el-button>
             </el-form-item>
-            <el-form-item style="margin-top: 30px;">
+            <el-form-item style="margin-top: 35px;">
               <el-button class="customer-bun-mid" type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag"
                          style="margin-left: 15px; margin-bottom: 5px;">
                 开始调机
               </el-button>
             </el-form-item>
-            <el-form-item style="margin-top: 30px;">
+            <el-form-item style="margin-top: 35px;">
               <el-button class="customer-bun-mid" type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag"
                          style="margin-left: 20px; margin-bottom: 5px;">
                 开始生产
@@ -374,10 +374,10 @@
           </el-form>
         </fieldset>
         <!-- 不良 -->
-        <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 60px;">
+        <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
           <legend class="customer-legend">不良</legend>
           <el-form style="text-align: center;">
-            <el-form-item style="margin-top: -5px;">
+            <el-form-item style="margin-top: 5px;">
               <el-button class="customer-bun-mid" @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag"
                          style="margin-left: 0px; margin-top: 10px;">
                 报告不良
@@ -387,7 +387,7 @@
         </fieldset>
 
         <!-- 扫描 -->
-        <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 80px;">
+        <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
           <legend class="customer-legend">扫描</legend>
           <el-form>
             <el-form-item style="margin-top: -5px;">
@@ -407,7 +407,7 @@
 
         <!-- 停机 -->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 600px; margin-bottom: 0px; width: 200px; height: 100px;">
+                  style="margin-left: 680px; width: 200px; height: 105px;">
           <legend class="customer-legend">停机</legend>
           <el-form style="text-align: center;">
             <el-form-item>
@@ -420,12 +420,12 @@
         </fieldset>
         <!--其他操作-->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 600px; margin-bottom: 10px; width: 200px; height: 90px;">
+                  style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
           <legend class="customer-legend">其他操作</legend>
-          <el-form>
+          <el-form style="text-align: center;">
             <el-form-item>
               <el-button class="customer-bun-mid" type="primary" @click="finishPartRollModal"
-                         style="margin-left: 50px; margin-top: 10px;">
+                         style="margin-left: 0px; margin-top: 20px;">
                 产量报告
               </el-button>
             </el-form-item>
@@ -659,7 +659,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "卷号",
-          columnWidth: 85,
+          columnWidth: 90,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -677,7 +677,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "事件",
-          columnWidth: 60,
+          columnWidth: 75,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -823,7 +823,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "工具编号",
-          columnWidth: 60,
+          columnWidth: 70,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -841,7 +841,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "工具名称",
-          columnWidth: 80,
+          columnWidth: 85,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1023,7 +1023,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "卷号",
-          columnWidth: 60,
+          columnWidth: 90,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1077,7 +1077,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "工具实例编号",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1223,7 +1223,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "零部件编码",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1241,7 +1241,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "零部件名称",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1531,7 +1531,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "卷号",
-          columnWidth: 90,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1567,7 +1567,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "零部件编码",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2345,7 +2345,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "卷号",
-          columnWidth: 100,
+          columnWidth: 110,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2363,7 +2363,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "不良代码",
-          columnWidth: 80,
+          columnWidth: 90,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2381,7 +2381,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "不良描述",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2417,7 +2417,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "报告日期",
-          columnWidth: 80,
+          columnWidth: 90,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2435,7 +2435,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "报告人",
-          columnWidth: 80,
+          columnWidth: 85,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -2671,7 +2671,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "卷类型",
-          columnWidth: 55,
+          columnWidth: 75,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -3515,5 +3515,15 @@ export default {
   color: #387877;
 }
 
+/*定制组件的样式*/
+.customer-css /deep/ .el-dialog{
+  top: 6vh !important;
+  margin-top: 0px !important;
+  margin-bottom: 10px;
+}
 
+/*自定义当前el-input的样式 */
+.customer-item .el-input{
+  margin-right: 25px;
+}
 </style>