From 670b7d06fcf8f445a3044bd354ae2da19232dc40 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 22 Dec 2021 11:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A8=A1=E6=80=81=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/com_defect_roll.vue   |   2 +-
 .../modules/yieldReport/com_finish_roll.vue   |   2 +-
 .../modules/yieldReport/com_merge_roll.vue    |   2 +-
 .../yieldReport/com_produce_material.vue      |   2 +-
 .../yieldReport/com_produce_report_normal.vue | 800 +++++++++---------
 .../modules/yieldReport/com_produce_tool.vue  |   2 +-
 .../modules/yieldReport/com_separate_roll.vue |   6 +-
 .../yieldReport/com_switch_operator.vue       |   2 +-
 .../modules/yieldReport/com_switch_roll.vue   |   2 +-
 9 files changed, 421 insertions(+), 399 deletions(-)

diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue
index 91a0264..d586c24 100644
--- a/src/views/modules/yieldReport/com_defect_roll.vue
+++ b/src/views/modules/yieldReport/com_defect_roll.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="630px" style="height: 680px;" class="customer-dialog">
+               width="610px" style="height: 680px;" class="customer-dialog">
       <el-container>
         <el-container style="height: 140px;">
           <el-form :inline="true" label-position="top" label-width="80px">
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index c39a0d4..46a11cb 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="940px" style="height: 680px;" class="customer-dialog">
+               width="920px" style="height: 680px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 495px;"
                label-width="80px">
         <!-- 菜单信息 -->
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index 63ae87b..d1148ac 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="360px" style="height: 680px;" class="customer-dialog">
+               width="300px" style="height: 680px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 100px;"
                label-width="80px">
         <!-- 当前卷 -->
diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index a9b2689..d796ff2 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="205px" style="height: 580px;" class="customer-dialog">
+               width="200px" style="height: 580px;" class="customer-dialog">
       <el-container style="height: 105px;">
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 材料卷号和BOM序号 -->
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index ddf88bf..cf1e289 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1,20 +1,19 @@
 <template>
   <div class="produce-report">
     <el-dialog v-drag
-      width="830px" class="customer-dialog"
-      :title="titleCon" v-bind="$attrs" v-on="$listeners"
-      >
-      <el-form :inline="true" label-position="top" style="height: 480px;"
+               width="820px" class="customer-dialog"
+               :title="titleCon" v-bind="$attrs" v-on="$listeners">
+      <el-form :inline="true" label-position="top" style="height: 460px;"
                label-width="80px">
         <!-- 第一行信息 -->
         <el-form style="margin-top: -10px;">
           <el-form-item label="订单号:">
-            <el-input v-model="scheduleData.orderNo" readonly style="width: 130px;" ></el-input>
+            <el-input v-model="scheduleData.orderNo" readonly style="width: 130px;"></el-input>
           </el-form-item>
           <el-form-item label="物料编码:">
             <el-input v-model="scheduleData.partNo" readonly style="width: 130px;"></el-input>
           </el-form-item>
-          <el-form-item label="物料名称/规则:"  >
+          <el-form-item label="物料名称/规则:">
             <el-input v-model="scheduleData.partDesc" readonly style="width: 200px;"></el-input>
           </el-form-item>
           <el-form-item label="派工单号:">
@@ -40,313 +39,336 @@
           </el-form-item>
         </el-form>
         <!-- 第三行信息 -->
-       <el-form>
-          <el-form-item label="前道工序" >
+        <el-form>
+          <el-form-item label="前道工序">
             <el-input v-model="scheduleData.preItemDesc" readonly style="width: 180px;"></el-input>
           </el-form-item>
           <el-form-item label="后道工序" prop="languageDefault">
             <el-input v-model="scheduleData.nextItemDesc" readonly 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"  v-model="scheduleData.currentRollFlag">仅显示当前卷信息</el-checkbox>
+            <el-checkbox style="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: 585px;">
-       <legend class="customer-legend">卷操作</legend>
-       <el-form>
-          <el-form-item style="width: 90px;">
-            <span>{{this.currentRollOps.rollNo}}</span>
-          </el-form-item>
-          <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-form-item>
-            <el-button type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
-              切换卷</el-button>
-          </el-form-item>
-          <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-form-item>
-            <el-button type="primary" :disabled="buttonTags.finishRollFlag"
-              @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
-              结束卷</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" :disabled="buttonTags.mergeRollFlag"
-                      @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
-              合并卷</el-button>
-          </el-form-item>
-        </el-form>
-     </fieldset>
-      <!-- 列表展示区域 -->
-      <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 585px; height: 260px;">
-        <legend class="customer-legend">列表信息</legend>
-        <el-tabs v-model="activeTable" style="margin-top: -3px; width: 580px; height: 238px;"
-                 type="border-card" @tab-click="tabClick" class="customer-tab">
-          <el-tab-pane label="时间" name="sfdc_time">
-            <el-table
-              height="210"
-              :data="sfdcTimeList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnTimeArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="刀模板记录" name="sfdc_tool">
-            <el-table
-              height="95"
-              :data="orderToolList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnOrderToolArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-table
-              height="115"
-              :data="sfdcToolList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnToolArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="材料" name="sfdc_material">
-            <el-table
-              height="95"
-              :data="orderBomList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnBomArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-table
-              height="115"
-              :data="sfdcMaterialList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnMaterialArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="生产卷的操作信息" name="sfdc_rollOps">
-            <el-table
-              height="210"
-              :data="sfdcRollOpsList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnRollOpsArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="不良记录" name="sfdc_defect">
-            <el-table
-              height="210"
-              :data="sfdcDefectList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnDefectArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="机器下机卷" name="sfdc_roll">
-            <el-table
-              height="210"
-              :data="sfdcRollList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%;">
-              <el-table-column
-                v-for="(item,index) in columnRollArray" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed"
-                :width="item.columnWidth"
-                :label="item.columnLabel">
-                <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                     style="width: 100px; height: 80px"/></span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-        </el-tabs>
-      </fieldset>
-      <!-- 生产调机菜单 -->
-      <fieldset class="customer-fieldset" style="margin-left: 600px; margin-top: -460px; width: 200px; height: 120px;">
-        <legend class="customer-legend">生产调机</legend>
-        <el-form>
-          <el-form-item>
-            <el-button type="primary" @click="refreshPageData"  style="margin-left: 20px; margin-top: 20px; margin-bottom: 25px;">
-              刷新</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="switchOperatorModal" style="margin-left: 25px; margin-top: 20px;">
-              切换用户</el-button>
-          </el-form-item>
-          <el-form-item style="margin-top: 30px;">
-            <el-button type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag" style="margin-left: 10px; margin-bottom: 5px;">
-              开始调机</el-button>
-          </el-form-item>
-          <el-form-item style="margin-top: 30px;">
-            <el-button type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag" style="margin-left: 10px; margin-bottom: 5px;">
-              开始生产</el-button>
-          </el-form-item>
-        </el-form>
-      </fieldset>
-      <!-- 不良 -->
-      <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 60px;">
-        <legend class="customer-legend">不良</legend>
-        <el-form>
-          <el-form-item style="margin-top: -5px;">
-            <el-button @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag" style="margin-left: 50px; margin-top: 10px;">
-              报告不良</el-button>
-          </el-form-item>
-        </el-form>
-      </fieldset>
+        <fieldset class="customer-fieldset" style="width: 585px;">
+          <legend class="customer-legend">卷操作</legend>
+          <el-form>
+            <el-form-item style="width: 90px;">
+              <span>{{ this.currentRollOps.rollNo }}</span>
+            </el-form-item>
+            <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-form-item>
+              <el-button type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                切换卷
+              </el-button>
+            </el-form-item>
+            <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-form-item>
+              <el-button type="primary" :disabled="buttonTags.finishRollFlag"
+                         @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                结束卷
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :disabled="buttonTags.mergeRollFlag"
+                         @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                合并卷
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
+        <!-- 列表展示区域 -->
+        <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 585px; height: 260px;">
+          <legend class="customer-legend">列表信息</legend>
+          <el-tabs v-model="activeTable" style="margin-top: -3px; width: 580px; height: 238px;"
+                   type="border-card" @tab-click="tabClick" class="customer-tab">
+            <el-tab-pane label="时间" name="sfdc_time">
+              <el-table
+                height="210"
+                :data="sfdcTimeList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnTimeArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="刀模板记录" name="sfdc_tool">
+              <el-table
+                height="95"
+                :data="orderToolList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnOrderToolArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-table
+                height="115"
+                :data="sfdcToolList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnToolArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="材料" name="sfdc_material">
+              <el-table
+                height="95"
+                :data="orderBomList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnBomArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-table
+                height="115"
+                :data="sfdcMaterialList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnMaterialArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="生产卷的操作信息" name="sfdc_rollOps">
+              <el-table
+                height="210"
+                :data="sfdcRollOpsList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnRollOpsArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="不良记录" name="sfdc_defect">
+              <el-table
+                height="210"
+                :data="sfdcDefectList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnDefectArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="机器下机卷" name="sfdc_roll">
+              <el-table
+                height="210"
+                :data="sfdcRollList"
+                border
+                v-loading="dataListLoading"
+                style="width: 100%;">
+                <el-table-column
+                  v-for="(item,index) in columnRollArray" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed"
+                  :width="item.columnWidth"
+                  :label="item.columnLabel">
+                  <template slot-scope="scope">
+                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                       style="width: 100px; height: 80px"/></span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </fieldset>
+        <!-- 生产调机菜单 -->
+        <fieldset class="customer-fieldset"
+                  style="margin-left: 600px; margin-top: -460px; width: 200px; height: 120px;">
+          <legend class="customer-legend">生产调机</legend>
+          <el-form>
+            <el-form-item>
+              <el-button type="primary" @click="refreshPageData"
+                         style="margin-left: 20px; margin-top: 20px; margin-bottom: 25px;">
+                刷新
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="switchOperatorModal" style="margin-left: 25px; margin-top: 20px;">
+                切换用户
+              </el-button>
+            </el-form-item>
+            <el-form-item style="margin-top: 30px;">
+              <el-button type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                开始调机
+              </el-button>
+            </el-form-item>
+            <el-form-item style="margin-top: 30px;">
+              <el-button type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                开始生产
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
+        <!-- 不良 -->
+        <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 60px;">
+          <legend class="customer-legend">不良</legend>
+          <el-form>
+            <el-form-item style="margin-top: -5px;">
+              <el-button @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag"
+                         style="margin-left: 50px; margin-top: 10px;">
+                报告不良
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
 
-      <!-- 扫描 -->
-      <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 80px;">
-        <legend class="customer-legend">扫描</legend>
-        <el-form>
-          <el-form-item style="margin-top: -5px;">
-            <el-button type="primary" @click="produceToolModal"
-                       :disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
-              刀模板</el-button>
-          </el-form-item>
-          <el-form-item style="margin-top: -5px;">
-            <el-button type="primary"  @click="produceMaterialModal"
-                       :disabled="buttonTags.materialFlag" style="margin-left: 10px; margin-top: 20px;">
-              材料</el-button>
-          </el-form-item>
-        </el-form>
-      </fieldset>
+        <!-- 扫描 -->
+        <fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 80px;">
+          <legend class="customer-legend">扫描</legend>
+          <el-form>
+            <el-form-item style="margin-top: -5px;">
+              <el-button type="primary" @click="produceToolModal"
+                         :disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
+                刀模板
+              </el-button>
+            </el-form-item>
+            <el-form-item style="margin-top: -5px;">
+              <el-button type="primary" @click="produceMaterialModal"
+                         :disabled="buttonTags.materialFlag" style="margin-left: 10px; margin-top: 20px;">
+                材料
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
 
-      <!-- 停机 -->
-      <fieldset class="customer-fieldset" style="margin-left: 600px; margin-bottom: 10px; width: 200px; height: 190px;">
-        <legend class="customer-legend">停机</legend>
-        <el-form>
-          <el-form-item>
-            <el-button type="primary" @click="produceDownModal"
-                       :disabled="buttonTags.downTimeFlag" style="margin-left: 30px; margin-top: 10px;">
-              报告其他停机</el-button>
-          </el-form-item>
-        </el-form>
-      </fieldset>
+        <!-- 停机 -->
+        <fieldset class="customer-fieldset"
+                  style="margin-left: 600px; margin-bottom: 10px; width: 200px; height: 190px;">
+          <legend class="customer-legend">停机</legend>
+          <el-form>
+            <el-form-item>
+              <el-button type="primary" @click="produceDownModal"
+                         :disabled="buttonTags.downTimeFlag" style="margin-left: 30px; margin-top: 10px;">
+                报告其他停机
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
       </el-form>
     </el-dialog>
 
@@ -359,7 +381,7 @@
 
     <!-- 开始生产组件 -->
     <comSwitchRoll ref="comSwitchRoll" :close-on-click-modal="false"
-                     :visible.sync="showSwitchFlag">
+                   :visible.sync="showSwitchFlag">
 
     </comSwitchRoll>
 
@@ -370,7 +392,7 @@
     </comSeparateRoll>
     <!--  结束卷的modal -->
     <comFinishRoll ref="comFinishRoll" :close-on-click-modal="false"
-                   :visible.sync="showFinishFlag" >
+                   :visible.sync="showFinishFlag">
 
     </comFinishRoll>
 
@@ -382,19 +404,19 @@
 
     <!-- 开始调机组件 -->
     <comStartTuning ref="comStartTuning" :close-on-click-modal="false"
-                  :visible.sync="showTuningFlag">
+                    :visible.sync="showTuningFlag">
 
     </comStartTuning>
 
     <!-- 开始生产组件 -->
     <comStartProduce ref="comStartProduce" :close-on-click-modal="false"
-                  :visible.sync="showProduceFlag">
+                     :visible.sync="showProduceFlag">
 
     </comStartProduce>
 
     <!-- 报告不良组件 -->
     <comDefectRoll ref="comDefectRoll" :close-on-click-modal="false"
-                     :visible.sync="showDefectFlag">
+                   :visible.sync="showDefectFlag">
 
     </comDefectRoll>
 
@@ -406,13 +428,13 @@
 
     <!-- 生产过程的材料组件 -->
     <comProduceMaterial ref="comProduceMaterial" :close-on-click-modal="false"
-                    :visible.sync="showMaterialFlag">
+                        :visible.sync="showMaterialFlag">
 
     </comProduceMaterial>
 
     <!-- 生产过程的停机组件 -->
     <comProduceDown ref="comProduceDown" :close-on-click-modal="false"
-                        :visible.sync="showDownFlag">
+                    :visible.sync="showDownFlag">
 
     </comProduceDown>
 
@@ -452,7 +474,7 @@ export default {
   name: "com_produce_report_normal",
   data() {
     return {
-      titleCon:'',
+      titleCon: '',
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2651,7 +2673,7 @@ export default {
         status: '',
         showFlag: false
       },
-      buttonTags:{
+      buttonTags: {
         createNewRollFlag: false,
         switchRollFlag: false,
         separateRollFlag: false,
@@ -2682,7 +2704,7 @@ export default {
   },
   methods: {
     // 获取派工单的信息
-    getScheduleDataBySeqNo(){
+    getScheduleDataBySeqNo() {
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
         this.scheduleData.seqNo = data.row.seqNo;
         this.scheduleData.orderNo = data.row.orderNo;
@@ -2702,7 +2724,7 @@ export default {
       });
     },
     // 获取当前卷的信息
-    getCurrentRollOpsBySeqNo(){
+    getCurrentRollOpsBySeqNo() {
       getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => {
         this.currentRollOps.rollNo = data.row.rollNo;
         this.scheduleData.rollNo = data.row.rollNo;
@@ -2711,90 +2733,90 @@ export default {
     },
 
     //列表表格选择替换
-    tabClick(tab, event){
+    tabClick(tab, event) {
       //刷新列表数据
       this.refreshCurrentTabTable();
     },
 
     //刷新派工单的时间的记录
-    getSfdcTimeList(){
+    getSfdcTimeList() {
       getSfdcTimeByCon(this.scheduleData).then(({data}) => {
         this.sfdcTimeList = data.rows;
       });
     },
 
     //刷新工单的工具信息
-    getOrderToolList(){
+    getOrderToolList() {
       getOrderToolByCon(this.scheduleData).then(({data}) => {
         this.orderToolList = data.rows;
       });
     },
 
     //刷新派工单的刀模板的记录
-    getSfdcToolList(){
+    getSfdcToolList() {
       getSfdcToolByCon(this.scheduleData).then(({data}) => {
         this.sfdcToolList = data.rows;
       });
     },
 
     //刷新工单的bom信息
-    getOrderBomList(){
+    getOrderBomList() {
       getOrderBomByCon(this.scheduleData).then(({data}) => {
-          this.orderBomList = data.rows;
+        this.orderBomList = data.rows;
       });
     },
 
     //刷新派工单的材料表的记录
-    getSfdcMaterialList(){
+    getSfdcMaterialList() {
       getSfdcMaterialByCon(this.scheduleData).then(({data}) => {
         this.sfdcMaterialList = data.rows;
       });
     },
 
     //刷新派工单的下机卷的记录
-    getSfdcRollOpsList(){
+    getSfdcRollOpsList() {
       getSfdcRollOpsByCon(this.scheduleData).then(({data}) => {
         this.sfdcRollOpsList = data.rows;
       });
     },
 
     //刷新派工单的不良标的记录
-    getSfdcDefectList(){
+    getSfdcDefectList() {
       getSfdcDefectByCon(this.scheduleData).then(({data}) => {
         this.sfdcDefectList = data.rows;
       });
     },
 
     //刷新派工单的下机卷的记录
-    getSfdcRollList(){
+    getSfdcRollList() {
       getSfdcRollByCon(this.scheduleData).then(({data}) => {
         this.sfdcRollList = data.rows;
       });
     },
 
     //刷新页签的table数据
-    refreshCurrentTabTable(){
+    refreshCurrentTabTable() {
       //判断是否按照当前卷来查询
-      if(this.scheduleData.currentRollFlag){
+      if (this.scheduleData.currentRollFlag) {
         //设置相关的卷号 判断是否存在卷
         this.scheduleData.rollNo = this.currentRollOps.rollNo;
-      }else{
+      } else {
         this.scheduleData.rollNo = '';
       }
       //区分不同的页签刷新不同的列表数据
-      if(this.activeTable == 'sfdc_time'){
+      if (this.activeTable == 'sfdc_time') {
         this.getSfdcTimeList();
-      }else if(this.activeTable == 'sfdc_tool'){
+      } else if (this.activeTable == 'sfdc_tool') {
         this.getOrderToolList();
         this.getSfdcToolList();
-      }else if(this.activeTable == 'sfdc_material'){
+      } else if (this.activeTable == 'sfdc_material') {
         this.getOrderBomList();
         this.getSfdcMaterialList();
-      }else if(this.activeTable == 'sfdc_rollOps'){
+      } else if (this.activeTable == 'sfdc_rollOps') {
         this.getSfdcRollOpsList();
-      }else if(this.activeTable == 'sfdc_defect'){
+      } else if (this.activeTable == 'sfdc_defect') {
         this.getSfdcDefectList();
-      }else if(this.activeTable == 'sfdc_roll'){
+      } else if (this.activeTable == 'sfdc_roll') {
         this.getSfdcRollList();
       }
     },
@@ -2808,26 +2830,26 @@ export default {
     },
 
     //刷新页面的数据
-    refreshPageData(){
+    refreshPageData() {
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
-        this.scheduleData.seqNo= data.row.seqNo;
-        this.scheduleData.orderNo= data.row.orderNo;
+        this.scheduleData.seqNo = data.row.seqNo;
+        this.scheduleData.orderNo = data.row.orderNo;
         this.scheduleData.itemNo = data.row.itemNo;
-        this.scheduleData.partNo= data.row.partNo;
-        this.scheduleData.partDesc= data.row.partDesc;
-        this.scheduleData.planStartTime= data.row.planStartTime;
-        this.scheduleData.planFinishTime= data.row.planFinishTime;
-        this.scheduleData.qtyRequiredOriginal= data.row.qtyRequiredOriginal;
-        this.scheduleData.scheduledDate= data.row.scheduledDate;
-        this.scheduleData.shiftNo= data.row.shiftNo;
-        this.scheduleData.preItemDesc= data.row.preItemDesc;
-        this.scheduleData.nextItemDesc= data.row.nextItemDesc;
+        this.scheduleData.partNo = data.row.partNo;
+        this.scheduleData.partDesc = data.row.partDesc;
+        this.scheduleData.planStartTime = data.row.planStartTime;
+        this.scheduleData.planFinishTime = data.row.planFinishTime;
+        this.scheduleData.qtyRequiredOriginal = data.row.qtyRequiredOriginal;
+        this.scheduleData.scheduledDate = data.row.scheduledDate;
+        this.scheduleData.shiftNo = data.row.shiftNo;
+        this.scheduleData.preItemDesc = data.row.preItemDesc;
+        this.scheduleData.nextItemDesc = data.row.nextItemDesc;
         this.scheduleData.workCenterNo = data.row.workCenterNo;
         this.scheduleData.workCenterDesc = data.row.workCenterDesc;
         this.scheduleData.resourceDesc = data.row.resourceDesc;
         //设置弹窗的标题
         this.titleCon = '机台工作台' + ' - ' + data.row.workCenterDesc + ' '
-          + data.row.resourceDesc + ' （' + this.operatorData.operatorName+ '）';
+          + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';
       }).then(() => {
         //打开模态框
         this.visibleFlag = true;
@@ -2840,14 +2862,14 @@ export default {
         this.refreshCurrentTabTable();
       }).then(() => {
         //刷新当前的菜单
-        this.refreshPageButtons();
+        //this.refreshPageButtons();
       });
     },
 
     //刷新当前页面的菜单
-    refreshPageButtons(){
+    refreshPageButtons() {
       //判断是否存在人员
-      if(this.operatorData.operatorId == null || this.operatorData.operatorId == ''){
+      if (this.operatorData.operatorId == null || this.operatorData.operatorId == '') {
         this.buttonTags.createNewRollFlag = true;
         this.buttonTags.switchRollFlag = true;
         this.buttonTags.separateRollFlag = true;
@@ -2858,59 +2880,59 @@ export default {
         this.buttonTags.toolFlag = true;
         this.buttonTags.materialFlag = true;
         this.buttonTags.downTimeFlag = true;
-      }else{
+      } else {
         //存在人员既可以合并卷
         this.buttonTags.mergeRollFlag = false;
         //刷新其他的菜单
         refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
-          if(data.resultMap.createNewRollFlag == 'Y'){
+          if (data.resultMap.createNewRollFlag == 'Y') {
             this.buttonTags.createNewRollFlag = false;
-          }else{
+          } else {
             this.buttonTags.createNewRollFlag = true;
           }
-          if(data.resultMap.switchRollFlag == 'Y'){
+          if (data.resultMap.switchRollFlag == 'Y') {
             this.buttonTags.switchRollFlag = false;
-          }else{
+          } else {
             this.buttonTags.switchRollFlag = true;
           }
-          if(data.resultMap.separateRollFlag == 'Y'){
+          if (data.resultMap.separateRollFlag == 'Y') {
             this.buttonTags.separateRollFlag = false;
-          }else{
+          } else {
             this.buttonTags.separateRollFlag = true;
           }
-          if(data.resultMap.finishRollFlag == 'Y'){
+          if (data.resultMap.finishRollFlag == 'Y') {
             this.buttonTags.finishRollFlag = false;
-          }else{
+          } else {
             this.buttonTags.finishRollFlag = true;
           }
-          if(data.resultMap.tuningFlag == 'Y'){
+          if (data.resultMap.tuningFlag == 'Y') {
             this.buttonTags.tuningFlag = false;
-          }else{
+          } else {
             this.buttonTags.tuningFlag = true;
           }
-          if(data.resultMap.produceFlag == 'Y'){
+          if (data.resultMap.produceFlag == 'Y') {
             this.buttonTags.produceFlag = false;
-          }else{
+          } else {
             this.buttonTags.produceFlag = true;
           }
-          if(data.resultMap.defectFlag == 'Y'){
+          if (data.resultMap.defectFlag == 'Y') {
             this.buttonTags.defectFlag = false;
-          }else{
+          } else {
             this.buttonTags.defectFlag = true;
           }
-          if(data.resultMap.toolFlag == 'Y'){
+          if (data.resultMap.toolFlag == 'Y') {
             this.buttonTags.toolFlag = false;
-          }else{
+          } else {
             this.buttonTags.toolFlag = true;
           }
-          if(data.resultMap.materialFlag == 'Y'){
+          if (data.resultMap.materialFlag == 'Y') {
             this.buttonTags.materialFlag = false;
-          }else{
+          } else {
             this.buttonTags.materialFlag = true;
           }
-          if(data.resultMap.downTimeFlag == 'Y'){
+          if (data.resultMap.downTimeFlag == 'Y') {
             this.buttonTags.downTimeFlag = false;
-          }else{
+          } else {
             this.buttonTags.downTimeFlag = true;
           }
         });
@@ -2918,18 +2940,18 @@ export default {
     },
 
     //设置参数
-    initOperatorData(operatorData){
+    initOperatorData(operatorData) {
       this.showOperatorFlag = false;
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //切换当前账户的信息
       //设置弹窗的标题
       this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
-        + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName+ '）';
+        + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
       //刷新菜单
     },
 
     /*不初始化操作员的方法*/
-    notInitOperatorData(){
+    notInitOperatorData() {
       //关闭切换用户的组件
       this.showOperatorFlag = false;
     },
@@ -2949,7 +2971,7 @@ export default {
     },
 
     //创建新卷的功能
-    createNewRollFun(){
+    createNewRollFun() {
       //校验当前的功能是否可用
       this.scheduleData.functionName = 'createNewRollFlag';
       this.scheduleData.operatorId = this.operatorData.operatorId;
@@ -2957,17 +2979,17 @@ export default {
         //判断校验是否通过
         let resultMap = data.resultMap;
         //判断是否通过验证
-        if(resultMap.code == 200){
+        if (resultMap.code == 200) {
           //调用创建卷的方法
           this.createNewRollDo();
-        }else{
+        } else {
           this.$message.error(resultMap.msg)
         }
       });
     },
 
     /*切换卷操作*/
-    switchRollModal(){
+    switchRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('switchRollFlag');
       //打开切换用户的页面
@@ -2978,7 +3000,7 @@ export default {
     },
 
     /*创建分卷的modal调用*/
-    separateRollModal(){
+    separateRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('separateRollFlag');
       //打开创建分卷的页面         76一会还把
@@ -2989,7 +3011,7 @@ export default {
     },
 
     /*结束卷操作*/
-    finishRollModal(){
+    finishRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('finishRollFlag');
       //打开结束卷的页面
@@ -3000,7 +3022,7 @@ export default {
     },
 
     /*合并卷modal*/
-    mergeRollModal(){
+    mergeRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('mergeRollFlag');
       //打开合并卷的页面
@@ -3012,7 +3034,7 @@ export default {
     },
 
     /*开始调机modal*/
-    startTuningModal(){
+    startTuningModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('startTuningFlag');
       //打开开始调机的页面
@@ -3024,7 +3046,7 @@ export default {
     },
 
     /*开始调机modal*/
-    startProduceModal(){
+    startProduceModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('startProduceFlag');
       //打开开始生产的页面
@@ -3036,7 +3058,7 @@ export default {
     },
 
     /*报告不良modal*/
-    defectRollModal(){
+    defectRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('defectRollFlag');
       //打开不良卷的页面
@@ -3047,7 +3069,7 @@ export default {
     },
 
     /*生产过程的工具组件*/
-    produceToolModal(){
+    produceToolModal() {
       //1.首先调用菜单判断方式  打开生产过程的工具的页面
       //checkProduceButton('produceToolFlag');
       //打开生产过程的工具的页面
@@ -3058,7 +3080,7 @@ export default {
     },
 
     /*生产过程的工具组件*/
-    produceMaterialModal(){
+    produceMaterialModal() {
       //1.首先调用菜单判断方式  打开生产过程的材料的页面
       //checkProduceButton('produceMaterialFlag');
       //打开生产过程的工具的页面
@@ -3070,7 +3092,7 @@ export default {
 
 
     /*生产过程的停机组件*/
-    produceDownModal(){
+    produceDownModal() {
       //1.首先调用菜单判断方式  打开生产过程的停机的页面
       //checkProduceButton('produceDownFlag');
       //打开生产过程的工具的页面
@@ -3081,14 +3103,14 @@ export default {
     },
 
     //创建新卷的方法
-    createNewRollDo(){
+    createNewRollDo() {
       createNewRoll(this.scheduleData).then(({data}) => {
         //判断是否成功
-        if(data.success){
+        if (data.success) {
           this.$message.success(data.msg);
           //刷新当的按钮
           this.refreshPageData();
-        }else{
+        } else {
           this.$message.error(data.msg);
         }
       });
@@ -3105,7 +3127,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .customer-tab .el-tabs__content{
+/deep/ .customer-tab .el-tabs__content {
   padding: 0px !important;
 }
 
diff --git a/src/views/modules/yieldReport/com_produce_tool.vue b/src/views/modules/yieldReport/com_produce_tool.vue
index fa4f43c..84c4dbb 100644
--- a/src/views/modules/yieldReport/com_produce_tool.vue
+++ b/src/views/modules/yieldReport/com_produce_tool.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="325px" style="height: 680px;" class="customer-dialog">
+               width="305px" style="height: 680px;" class="customer-dialog">
       <el-container style="height: 225px;">
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 扫描工具实例编码 -->
diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index 0b7373e..8fe378e 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="360px" style="height: 680px;" class="customer-dialog">
+               width="270px" style="height: 680px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 100px;"
                label-width="80px">
         <!-- 时间 -->
         <el-row style="margin-top: -10px;">
-          <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item :label="'当前时间:'">
               <el-date-picker style="width: 100px;"
                               v-model="scheduleData.reportDate"
@@ -16,7 +16,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8" style="margin-top: 27px;">
+          <el-col :span="8" style="margin-left: 20px; margin-top: 27px;">
             <el-form-item :label="''">
               <el-form-item :label="''">
                 <el-time-picker style="width: 80px;"
diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue
index d8c24f4..2c4c18b 100644
--- a/src/views/modules/yieldReport/com_switch_operator.vue
+++ b/src/views/modules/yieldReport/com_switch_operator.vue
@@ -1,6 +1,6 @@
 <template>
   <!--  展示员工切换的模块  -->
-  <el-dialog :title="titleCon" v-bind="$attrs" v-on="$listeners"  width="300px">
+  <el-dialog :title="titleCon" v-bind="$attrs" v-on="$listeners"  width="280px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label="'操作员:'">
           <el-input ref="operatorId" @keyup.enter.native="saveOperatorData"
diff --git a/src/views/modules/yieldReport/com_switch_roll.vue b/src/views/modules/yieldReport/com_switch_roll.vue
index 39693a0..a575707 100644
--- a/src/views/modules/yieldReport/com_switch_roll.vue
+++ b/src/views/modules/yieldReport/com_switch_roll.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="240px" style="height: 680px;" class="customer-dialog">
+               width="210px" style="height: 680px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 60px;"
                label-width="80px">
         <!-- 半成品卷卷号 -->