From 5f2b880f748b1d17c309b45dcee68ab96339027e Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 25 Nov 2022 17:29:53 +0800
Subject: [PATCH] =?UTF-8?q?fqc=20=E6=89=93=E5=8D=B0=202022=E5=B9=B411?=
 =?UTF-8?q?=E6=9C=8825=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/calendar.vue           |  19 +-
 .../schedule/order_schedule_expand.vue        |  69 +--
 .../modules/yieldReport/com_finish_roll.vue   |  24 +-
 .../modules/yieldReport/com_merge_roll.vue    |  70 ++-
 .../otherReport/change_finish_roll.vue        | 506 ++++++++++--------
 .../otherReport/change_packaging.vue          | 147 ++---
 .../otherReport/fqc_produce_report_normal.vue |   2 +-
 7 files changed, 473 insertions(+), 364 deletions(-)

diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index eda1720..d0b304b 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -1517,13 +1517,18 @@ export default {
     },
     // 保存修改后的班次信息
     updateWorkingCalendar() {
-
-      this.workingCalendar.excepttime1 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H')
-      this.workingCalendar.excepttime2 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H')
-      this.workingCalendar.excepttime3 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H')
-      this.workingCalendar.excepttime4 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H')
-      this.workingCalendar.excepttime5 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H')
-      this.workingCalendar.excepttime6 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H')
+      this.workingCalendar.excepttime1 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('mm'))/60
+      this.workingCalendar.excepttime2 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('mm'))/60
+      this.workingCalendar.excepttime3 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('mm'))/60
+      this.workingCalendar.excepttime4 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('mm'))/60
+      this.workingCalendar.excepttime5 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('mm'))/60
+      this.workingCalendar.excepttime6 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('mm'))/60
       updateWorkingCalendar(this.workingCalendar).then(({data}) => {
         if (data && data.code == 0) {
           this.$message.success(data.msg)
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index c79696e..d547a95 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -1313,44 +1313,49 @@ export default {
       batchScheduleOrderWithExpand(newItemList).then(({data}) => {
         if (data.code == 200) {
           this.$message.success(data.msg)
+          this.scheduleVisible = false
+          this.getShopOrderList()
         } else if (data.code == 201) {
-          this.$confirm(data.msg, '提示', {
-            confirmButtonText: this.labels.confirmLabel,
-            celButtonText: this.labels.cancelLabel,
-            type: 'warning'
-          }).then(() => {
-            for (let i = 0; i < this.dataListSelections.length; i++) {
-              let item = this.dataListSelections[i]
-              let newItem = {
-                checkFlag: false,
-                itemNo: item.itemNo,
-                orderNo: item.orderNo,
-                qtyToSchedule: item.scheduledQty,
-                resourceId: item.resourceId,
-                scheduleDate: this.scheduleDate,
-                scheduleTime: this.scheduleTime,
-                scheduledQty: item.qtyToSchedule,
-                site: item.site,
-                specifiedTime: this.specifiedTime,
-                username: this.$store.state.user.name,
-                workCenterNo: item.workCenterNo
-              }
-              newItemList.push(newItem)
-            }
-            batchScheduleOrderWithExpand(newItemList).then(({data}) => {
-              if (data.code == 200) {
-                this.$message.success(data.msg)
-              } else if (data.code == 500) {
-                this.$message.error(data.msg)
-              }
-            })
-          });
-          this.$message.warning(data.msg)
+          this.$message.warning(data.msg.substring(0,data.msg.indexOf(','))+"!")
         } else if (data.code == 500) {
           this.$message.error(data.msg)
         }
       })
     },
+    /**
+     *     this.$confirm(data.msg, '提示', {
+     *             confirmButtonText: this.labels.confirmLabel,
+     *             celButtonText: this.labels.cancelLabel,
+     *             type: 'warning'
+     *           }).then(() => {
+     *             newItemList = []
+     *             for (let i = 0; i < this.dataListSelections.length; i++) {
+     *               let item = this.dataListSelections[i]
+     *               let newItem = {
+     *                 checkFlag: false,
+     *                 itemNo: item.itemNo,
+     *                 orderNo: item.orderNo,
+     *                 qtyToSchedule: item.scheduledQty,
+     *                 resourceId: item.resourceId,
+     *                 scheduleDate: this.scheduleDate,
+     *                 scheduleTime: this.scheduleTime,
+     *                 scheduledQty: item.qtyToSchedule,
+     *                 site: item.site,
+     *                 specifiedTime: this.specifiedTime,
+     *                 username: this.$store.state.user.name,
+     *                 workCenterNo: item.workCenterNo
+     *               }
+     *               newItemList.push(newItem)
+     *             }
+     *             batchScheduleOrderWithExpand(newItemList).then(({data}) => {
+     *               if (data.code == 200) {
+     *                 this.$message.success(data.msg)
+     *               } else if (data.code == 500) {
+     *                 this.$message.error(data.msg)
+     *               }
+     *             })
+     *           });
+     */
     // scheduleBatchDialog
     scheduleBatchDialog() {
       if (this.dataListSelections.find(item => item.resourceId == '' || item.resourceId == null)) {
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 4853ea5..29568e4 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -231,11 +231,15 @@
                         :visible.sync="showShiftFlag"
                         @initScheduleShift = "initScheduleShift">
     </comSelectShift>
+
+    <!--打印卷标签-->
+    <com-roll-label ref="comRollLabel"></com-roll-label>
   </div>
 
 </template>
 
 <script>
+   import comRollLabel from "../common/com-roll-label";/*打印卷标签*/
   /*添加组件*/
   import comExceptionReason from "./com_exception_reason";//异常远远
   import comSelectShift from "./com_select_shift";//班次选择的组件
@@ -898,11 +902,13 @@ export default {
         languageCode: this.$i18n.locale,
         objectType: 'label'
       },
+      isFqc:false,
     }
   },
   components: {
     comExceptionReason,/*异常原因的组件*/
     comSelectShift,/*班次选择的组件*/
+    comRollLabel,
   },
   methods: {
     sORoutingPreviousOperationItemNo(){
@@ -918,7 +924,8 @@ export default {
 
     },
     /*初始化页面参数*/
-    init(scheduleData, operatorData) {
+    init(scheduleData, operatorData,isFqc) {
+      this.isFqc = isFqc?true:false
       //初始化参数
       this.scheduleData = scheduleData;
       //初始化参数
@@ -1244,10 +1251,17 @@ export default {
         }else{
           //判断是否打印卷标签
           if(data.rollNo != ''){
-            //需要打印标签
-            let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
-              rollNo: data.rollNo};
-            this.printSfdcFlowLabel(printRow);
+            // 是否是FQC出货标签
+            if(this.isFqc ){
+              this.$nextTick(() => {
+                this.$refs.comRollLabel.init(data.rollNo)
+              });
+            }else {
+              //需要打印标签
+              let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+                rollNo: data.rollNo};
+              this.printSfdcFlowLabel(printRow);
+            }
             //延时一秒关闭  --预防没有出标签
             setTimeout(() => {
               this.closeDialog();
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index 9810f40..90c6f1e 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -46,6 +46,8 @@
         <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
       </span>
     </el-dialog>
+    <!--打印卷标签-->
+    <com-roll-label ref="comRollLabel"></com-roll-label>
   </div>
 </template>
 
@@ -75,8 +77,13 @@
     saveSysLanguageList
   } from "@/api/sysLanguage.js";
 
+  /*引入组件*/
+  import comRollLabel from "../common/com-roll-label";/*打印卷标签*/
+
   var functionId = 'C10000006';
 
+
+
 export default {
   data() {
     return {
@@ -252,6 +259,9 @@ export default {
       },
     }
   },
+  components:{
+    comRollLabel,// 打印组件
+  },
   methods: {
     //初始化页面
     init(scheduleData, operatorData,rollType) {
@@ -399,10 +409,17 @@ export default {
                       this.$message.error(data.msg);
                     } else {
                       this.$message.success(data.msg);
-                      //先打印再继续关闭
-                      let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
-                        rollNo: data.rollNo};
-                      this.printSfdcFlowLabel(printRow);
+                      if(this.rollType == 1 ){
+                        // 出货标签
+                        this.$nextTick(() => {
+                          this.$refs.comRollLabel.init(data.rollNo)
+                        });
+                      }else {
+                        //先打印再继续关闭
+                        let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+                          rollNo: data.rollNo};
+                        this.printSfdcFlowLabel(printRow);
+                      }
                       //延时一秒关闭  --预防没有出标签
                       setTimeout(() => {
                         this.closeDialog();
@@ -417,10 +434,17 @@ export default {
                     this.$message.error(data.msg);
                   } else {
                     this.$message.success(data.msg);
-                    //先打印再继续关闭
-                    let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
-                      rollNo: data.rollNo};
-                    this.printSfdcFlowLabel(printRow);
+                    if(this.rollType == 1 ){
+                      // 出货标签
+                      this.$nextTick(() => {
+                        this.$refs.comRollLabel.init(data.rollNo)
+                      });
+                    }else {
+                      //先打印再继续关闭
+                      let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+                        rollNo: data.rollNo};
+                      this.printSfdcFlowLabel(printRow);
+                    }
                     //延时一秒关闭  --预防没有出标签
                     setTimeout(() => {
                       this.closeDialog();
@@ -450,10 +474,17 @@ export default {
                     this.$message.error(data.msg);
                   } else {
                     this.$message.success(data.msg);
-                    //先打印再继续关闭
-                    let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
-                      rollNo: data.rollNo};
-                    this.printSfdcFlowLabel(printRow);
+                    if(this.rollType == 1 ){
+                      // 出货标签
+                      this.$nextTick(() => {
+                        this.$refs.comRollLabel.init(data.rollNo)
+                      });
+                    }else {
+                      //先打印再继续关闭
+                      let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+                        rollNo: data.rollNo};
+                      this.printSfdcFlowLabel(printRow);
+                    }
                     //延时一秒关闭  --预防没有出标签
                     setTimeout(() => {
                       this.closeDialog();
@@ -468,10 +499,17 @@ export default {
                   this.$message.error(data.msg);
                 } else {
                   this.$message.success(data.msg);
-                  //先打印再继续关闭
-                  let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
-                                  rollNo: data.rollNo};
-                  this.printSfdcFlowLabel(printRow);
+                  if(this.rollType == 1 ){
+                    // 出货标签
+                    this.$nextTick(() => {
+                      this.$refs.comRollLabel.init(data.rollNo)
+                    });
+                  }else {
+                    //先打印再继续关闭
+                    let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+                      rollNo: data.rollNo};
+                    this.printSfdcFlowLabel(printRow);
+                  }
                   //延时一秒关闭  --预防没有出标签
                   setTimeout(() => {
                     this.closeDialog();
diff --git a/src/views/modules/yieldReport/otherReport/change_finish_roll.vue b/src/views/modules/yieldReport/otherReport/change_finish_roll.vue
index 51e89d4..f604dc2 100644
--- a/src/views/modules/yieldReport/otherReport/change_finish_roll.vue
+++ b/src/views/modules/yieldReport/otherReport/change_finish_roll.vue
@@ -16,16 +16,22 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
-                {{buttons.refreshButton}}</el-button>
+              <el-button class="customer-bun-min" type="primary" @click="refreshPageData"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                {{ buttons.refreshButton }}
+              </el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button  class="customer-bun-min"  type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
-                {{buttons.finishRoll}}</el-button>
+              <el-button class="customer-bun-min" type="primary" @click="finishRollBun"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                {{ buttons.finishRoll }}
+              </el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button  class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
-                {{buttons.closeButton}}</el-button>
+              <el-button class="customer-bun-min" type="primary" @click="closeDialog"
+                         style="margin-left: 10px; margin-bottom: 5px;">
+                {{ buttons.closeButton }}
+              </el-button>
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
@@ -36,157 +42,179 @@
         <!--  卷数量统计 班次信息  -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 495px;">
-            <legend>{{labels.rollQtySum}}</legend>
+            <legend>{{ labels.rollQtySum }}</legend>
             <el-form-item class="customer-item">
               <el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
-                           v-model="pageData.reportedFlag">{{labels.whetherReport}}</el-checkbox>
+                           v-model="pageData.reportedFlag">{{ labels.whetherReport }}
+              </el-checkbox>
             </el-form-item>
-            <el-form-item class="customer-item" :label=labels.approvedQty  style="margin-top: -10px;">
+            <el-form-item class="customer-item" :label=labels.approvedQty style="margin-top: -10px;">
               <!--<el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"-->
-              <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number"
+                        style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.defectedQty style="margin-top: -10px;">
-              <el-input v-model="pageData.defectedQty" :disabled="showNumFlag" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="pageData.defectedQty" :disabled="showNumFlag" class="customer-input-color-red"
+                        readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.totalQty style="margin-top: -10px;">
-              <el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly"
+                        style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.otherRollQty style="margin-top: -10px;">
-              <el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly"
+                        style="width: 80px;"></el-input>
             </el-form-item>
           </fieldset>
           <!-- 操作员信息和班次信息 -->
           <fieldset class="customer-fieldset"
                     style="margin-left: 500px; margin-top: -70px; width: 400px;">
-            <legend>{{labels.operatorScheduleInfo}}</legend>
+            <legend>{{ labels.operatorScheduleInfo }}</legend>
             <el-form-item class="customer-item" :label=labels.operatorId>
-              <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
+              <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.operatorName>
-              <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly"
+                        style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.scheduledDate>
-              <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
+              <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;"></el-input>
             </el-form-item>
             <el-form-item class="customer-item" :label=labels.shiftNo>
-              <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly"
+                        style="width: 80px;"></el-input>
             </el-form-item>
             <el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
                        style="margin-left: -10px; margin-top: 10px; height: 20px; padding: 3px 3px;">
-              <icon-svg name="ellipsis" style="height: 10px; width: 10px;" ></icon-svg>
+              <icon-svg name="ellipsis" style="height: 10px; width: 10px;"></icon-svg>
             </el-button>
 
           </fieldset>
         </el-form>
         <!-- 卷生产时间统计产量报告 -->
         <el-form style="margin-top: 5px;">
-            <fieldset class="customer-fieldset" style="width: 320px; margin-top: -10px;">
-              <legend>{{labels.rollTimeSum}}</legend>
-              <!-- 调机时间 -->
-              <el-row style="margin-top: -10px;">
-                <el-col :span="24">
-                  <el-form-item  :label=labels.totalTuningTime >
-                    <el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;" ></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalTuningDownTime >
-                    <el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalPureTuningTime >
-                    <el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <!-- 生产时间 -->
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item  :label=labels.totalProdTime>
-                    <el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalProdDownTime>
-                    <el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalPureProdTime >
-                    <el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <!-- 制造时间 -->
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item  :label=labels.totalManufTime>
-                    <el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalManufDownTime>
-                    <el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.totalPureManufTime>
-                    <el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </fieldset>
-            <!-- 产量报告 -->
-            <fieldset class="customer-fieldset"
-                      style="margin-left: 325px; margin-top: -165px; width: 575px;">
+          <fieldset class="customer-fieldset" style="width: 320px; margin-top: -10px;">
+            <legend>{{ labels.rollTimeSum }}</legend>
+            <!-- 调机时间 -->
+            <el-row style="margin-top: -10px;">
+              <el-col :span="24">
+                <el-form-item :label=labels.totalTuningTime>
+                  <el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalTuningDownTime>
+                  <el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red"
+                            readonly="readonly" style="width: 100px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalPureTuningTime>
+                  <el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- 生产时间 -->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label=labels.totalProdTime>
+                  <el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalProdDownTime>
+                  <el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red"
+                            readonly="readonly" style="width: 100px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalPureProdTime>
+                  <el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- 制造时间 -->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label=labels.totalManufTime>
+                  <el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalManufDownTime>
+                  <el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red"
+                            readonly="readonly" style="width: 100px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.totalPureManufTime>
+                  <el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red"
+                            readonly="readonly" style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </fieldset>
+          <!-- 产量报告 -->
+          <fieldset class="customer-fieldset"
+                    style="margin-left: 325px; margin-top: -165px; width: 575px;">
 
-              <legend>{{ labels.produceReport }}</legend>
-              <!-- 开工时间 -->
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item  :label=labels.startTime>
-                    <el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.finishTime>
-                    <el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.prodTime >
-                    <el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.tuningTime>
-                    <el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.manufTime>
-                    <el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <!-- 合格数量 -->
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item  :label=labels.sfdcApprovedQty>
-                    <el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.sfdcDefectedQty>
-                    <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.sfdcReportedQty >
-                    <el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.tuningDown>
-                    <el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.manufTuning >
-                    <el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <!-- 备注 -->
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item  :label=labels.remark>
-                    <el-input v-model="pageData.remark"  style="width: 430px;"></el-input>
-                  </el-form-item>
-                  <el-form-item  :label=labels.downTime>
-                    <el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </fieldset>
+            <legend>{{ labels.produceReport }}</legend>
+            <!-- 开工时间 -->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label=labels.startTime>
+                  <el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.finishTime>
+                  <el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.prodTime>
+                  <el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.tuningTime>
+                  <el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.manufTime>
+                  <el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- 合格数量 -->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label=labels.sfdcApprovedQty>
+                  <el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly"
+                            style="width: 130px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.sfdcDefectedQty>
+                  <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly"
+                            style="width: 130px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.sfdcReportedQty>
+                  <el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.tuningDown>
+                  <el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.manufTuning>
+                  <el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- 备注 -->
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label=labels.remark>
+                  <el-input v-model="pageData.remark" style="width: 430px;"></el-input>
+                </el-form-item>
+                <el-form-item :label=labels.downTime>
+                  <el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </fieldset>
         </el-form>
         <!-- 主材料 -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 830px;">
-            <legend>{{labels.primaryMaterial}}</legend>
+            <legend>{{ labels.primaryMaterial }}</legend>
             <el-table
               height="180"
               :data="sfdcMaterialList"
@@ -208,7 +236,7 @@
                   <!--<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"-->
                   <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
                             v-model="scope.row[item.columnProp]"></el-input>
-                  <span v-else>{{scope.row[item.columnProp]}}</span>
+                  <span v-else>{{ scope.row[item.columnProp] }}</span>
                   <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                      style="width: 100px; height: 80px"/></span>
                 </template>
@@ -223,24 +251,28 @@
 
     <!-- 异常原因录入的组件 -->
     <comExceptionReason ref="comExceptionReason" :close-on-click-modal="false"
-                    :visible.sync="showExceptionFlag"
-                    @initExceptionReason = "initExceptionReason">
+                        :visible.sync="showExceptionFlag"
+                        @initExceptionReason="initExceptionReason">
 
     </comExceptionReason>
 
     <!-- 班次选择组件 -->
     <comSelectShift ref="comSelectShift" :close-on-click-modal="false"
-                        :visible.sync="showShiftFlag"
-                        @initScheduleShift = "initScheduleShift">
+                    :visible.sync="showShiftFlag"
+                    @initScheduleShift="initScheduleShift">
     </comSelectShift>
+
+    <!--打印卷标签-->
+    <com-roll-label ref="comRollLabel"></com-roll-label>
   </div>
 
 </template>
 
 <script>
-  /*添加组件*/
-  import comExceptionReason from "../com_exception_reason";//异常远远
-  import comSelectShift from "../com_select_shift";//班次选择的组件
+/*添加组件*/
+import comExceptionReason from "../com_exception_reason";//异常远远
+import comSelectShift from "../com_select_shift";//班次选择的组件
+import comRollLabel from "../../common/com-roll-label";/*打印卷标签*/
 import {
   getCurrentRollReportedQty,
   countSfdcTimeQty,
@@ -255,20 +287,21 @@ import {
   repackFinishRollWithNoFqc
 } from '@/api/yieldReport/com_finish_roll.js';
 
-  import {
-    searchSysLanguagePackList,
-    searchSysLanguageParam,
-    searchFunctionButtonList,
-    saveButtonList,
-    searchSysLanguage,
-    searchLanguageListByLanguageCode,
-    saveSysLanguageOne,
-    searchPageLanguageData,
-    removerLanguage,
-    saveSysLanguageList
-  } from "@/api/sysLanguage.js";
+import {
+  searchSysLanguagePackList,
+  searchSysLanguageParam,
+  searchFunctionButtonList,
+  saveButtonList,
+  searchSysLanguage,
+  searchLanguageListByLanguageCode,
+  saveSysLanguageOne,
+  searchPageLanguageData,
+  removerLanguage,
+  saveSysLanguageList
+} from "@/api/sysLanguage.js";
+
 
-  var functionId = 'C10000031';
+var functionId = 'C10000031';
 
 export default {
   data() {
@@ -277,7 +310,7 @@ export default {
       showDefault: false,
       showExceptionFlag: false,
       showShiftFlag: false,
-      showNumFlag:false,
+      showNumFlag: false,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -522,7 +555,7 @@ export default {
           fixed: false
         }
       ],
-      buttonTags:{
+      buttonTags: {
         selectShiftFlag: true,
         finishRollFlag: true,
       },
@@ -897,14 +930,15 @@ export default {
   components: {
     comExceptionReason,/*异常原因的组件*/
     comSelectShift,/*班次选择的组件*/
+    comRollLabel,
   },
   methods: {
-    sORoutingPreviousOperationItemNo(){
-      getSORoutingPreviousOperationItemNo( this.pageData).then(({data})=>{
-        if (data.code==0){
-          if (data.itemNo>0){
+    sORoutingPreviousOperationItemNo() {
+      getSORoutingPreviousOperationItemNo(this.pageData).then(({data}) => {
+        if (data.code == 0) {
+          if (data.itemNo > 0) {
             this.showNumFlag = true
-          }else {
+          } else {
             this.showNumFlag = false
           }
         }
@@ -930,17 +964,17 @@ export default {
       //初始化操作员对象
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //初始化标题
-      this.titleCon = this.labels.titleCon+this.labels.seqNoName+scheduleData.seqNo;
+      this.titleCon = this.labels.titleCon + this.labels.seqNoName + scheduleData.seqNo;
       //处理异常的原因
       this.pageData.exceptionFlag = 'N';
-      this.pageData.exceptionReason =  '';
-       //判断是否启用多语言
+      this.pageData.exceptionReason = '';
+      //判断是否启用多语言
       this.getMultiLanguageList();  //刷新多语言的信息
       //刷新当前派工单的信息
       this.refreshPageData();
     },
     /*关闭modal*/
-    closeDialog(){
+    closeDialog() {
       //刷新报工的页面
       this.$emit('refreshPageData');
       //关闭当前的页面
@@ -959,7 +993,7 @@ export default {
     },
 
     /*刷新当前的页面参数*/
-    async refreshPageData(){
+    async refreshPageData() {
       //1.刷新当前卷的报工数据
       await getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
         this.pageData.approvedQty = data.row.approvedQty;
@@ -996,11 +1030,11 @@ export default {
       await getScheduleShiftData(this.pageData).then(({data}) => {
         let specialAuth = 'N';
         //区分是否存在班次
-        if(data.code == 500){
+        if (data.code == 500) {
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = '';//重置排产日期
           this.pageData.shiftNo = '';
-        }else{
+        } else {
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
           this.pageData.shiftNo = data.row.shiftNo;
@@ -1008,47 +1042,47 @@ export default {
           specialAuth = data.row.specialAuth;
         }
         //根据不同设置不同的属性
-        if("Y" === specialAuth){
+        if ("Y" === specialAuth) {
           this.buttonTags.selectShiftFlag = false;
-        }else{
+        } else {
           this.buttonTags.selectShiftFlag = true;
         }
       });
-        //4.刷新当前卷的最早和最晚时间
-       await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
-          this.pageData.eventTime = data.row.eventTime;
-          this.pageData.tillTime = data.row.tillTime;
-        });
-        //5.刷新当前卷的Sfdc表的时间
-       await getSfdcTimeData(this.scheduleData).then(({data}) => {
-          //先判断是否成功查询
-          if(data.resultCode == 200){
-            //判断是否操作成功
-            this.pageData.eventTime = data.row.finishTime;
-            this.pageData.sfdcProdTime = data.row.sfdcProdTime;
-            this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
-            this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
-            this.pageData.sfdcDownTime = data.row.sfdcDownTime;
-            this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
-            this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
-          }else{
-            //暂时不处理数据
-          }
-        });
-        //6.刷新当前卷的报工数据
-        await getSfdcReportedData(this.scheduleData).then(({data}) => {
-          this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
-          this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
-          this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
-        });
-        //刷新当前卷的时间数据
-        await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
-          this.sfdcMaterialList = data.rows;
-        });
+      //4.刷新当前卷的最早和最晚时间
+      await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
+        this.pageData.eventTime = data.row.eventTime;
+        this.pageData.tillTime = data.row.tillTime;
+      });
+      //5.刷新当前卷的Sfdc表的时间
+      await getSfdcTimeData(this.scheduleData).then(({data}) => {
+        //先判断是否成功查询
+        if (data.resultCode == 200) {
+          //判断是否操作成功
+          this.pageData.eventTime = data.row.finishTime;
+          this.pageData.sfdcProdTime = data.row.sfdcProdTime;
+          this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
+          this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
+          this.pageData.sfdcDownTime = data.row.sfdcDownTime;
+          this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
+          this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
+        } else {
+          //暂时不处理数据
+        }
+      });
+      //6.刷新当前卷的报工数据
+      await getSfdcReportedData(this.scheduleData).then(({data}) => {
+        this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
+        this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
+        this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
+      });
+      //刷新当前卷的时间数据
+      await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
+        this.sfdcMaterialList = data.rows;
+      });
     },
 
     /*刷新当前卷的报工数据汇总*/
-    refreshCurrentRollReportedQty(){
+    refreshCurrentRollReportedQty() {
       getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
         this.pageData.approvedQty = data.row.approvedQty;
         this.pageData.defectedQty = data.row.defectedQty;
@@ -1058,7 +1092,7 @@ export default {
     },
 
     //刷新当前卷的时间信息
-    refreshCurrentRollTimeQty(){
+    refreshCurrentRollTimeQty() {
       countSfdcTimeQty(this.scheduleData).then(({data}) => {
         this.pageData.totalSetupTime = data.row.totalSetupTime;
         this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
@@ -1073,14 +1107,14 @@ export default {
     },
 
     //刷新派工单的班次信息
-    refreshScheduleShiftData(){
+    refreshScheduleShiftData() {
       getScheduleShiftData(this.scheduleData).then(({data}) => {
         //区分是否存在班次
-        if(data.code == 500){
+        if (data.code == 500) {
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = '';//重置排产日期
           this.pageData.shiftNo = '';
-        }else{
+        } else {
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
           this.pageData.shiftNo = data.row.shiftNo;
@@ -1089,7 +1123,7 @@ export default {
     },
 
     //刷新当前卷的时间信息
-    refreshCurrentRollMaxAndMinTime(){
+    refreshCurrentRollMaxAndMinTime() {
       getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
         this.pageData.eventTime = data.row.eventTime;
         this.pageData.tillTime = data.row.tillTime;
@@ -1097,7 +1131,7 @@ export default {
     },
 
     //刷新当前卷的Sfdc的信息
-    refreshSfdcTimeData(){
+    refreshSfdcTimeData() {
       getSfdcTimeData(this.scheduleData).then(({data}) => {
         //判断是否操作成功
         this.pageData.eventTime = data.row.finishTime;
@@ -1111,7 +1145,7 @@ export default {
     },
 
     //刷新当前卷的报工数据
-   async refreshSfdcData(){
+    async refreshSfdcData() {
       await getSfdcReportedData(this.scheduleData).then(({data}) => {
         this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
         this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
@@ -1120,29 +1154,28 @@ export default {
     },
 
     //刷新当前卷的时间数据
-    refreshSfdcMaterialTable(){
+    refreshSfdcMaterialTable() {
       getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
         this.sfdcMaterialList = data.rows;
       });
     },
 
 
-
     /*检查数据是否有效*/
-    checkValidQty(row){
+    checkValidQty(row) {
       //判断当前是否为空
-      if(row.netIssueQty == ''){
+      if (row.netIssueQty == '') {
         this.$message.error(this.labels.materialConsumedCantBeNull);
         row.netIssueQty = 0;//重新赋值
         return false;
       }
       //判断当前是否有效
-      if(row.netIssueQty <= 0){
+      if (row.netIssueQty <= 0) {
         this.$message.error(this.labels.materialConsumedMustMoreTanZero);
         return false;
       }
       //判断是否超限
-      if(row.netIssueQty > row.transQty){
+      if (row.netIssueQty > row.transQty) {
         this.$message.error(this.labels.materialConsumedMoreTanDelivery);
         row.netIssueQty = 0;//重新赋值
         return false;
@@ -1152,41 +1185,41 @@ export default {
 
     /*添加定制的css类*/
     customerCellClassName({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
+      if (column.property == 'netIssueQty') {
         return 'customer-number-cell';
       }
     },
 
     /*添加定制的cess样式*/
     customerCellStyle({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
+      if (column.property == 'netIssueQty') {
         return 'padding: 0px 0px;';
       }
     },
 
     /*检验良品的总数量*/
-  async  checkValidApprovedQty(){
+    async checkValidApprovedQty() {
       //调用刷新的方法
-     await this.refreshSfdcData();
+      await this.refreshSfdcData();
       this.pageData.totalQty = parseFloat(this.pageData.approvedQty) + parseFloat(this.pageData.defectedQty);
     },
 
     /*结束当前的操作*/
-    finishRollBun(){
+    finishRollBun() {
       //首先判断数值是否通过判断
       let approvedQty = this.pageData.approvedQty;
-      if(approvedQty == null || approvedQty == ''){
+      if (approvedQty == null || approvedQty == '') {
         this.$message.error(this.labels.this.labels.approvedQtyCantBeNull);
         this.pageData.approvedQty = 0;//重新赋值
         return false;
       }
-      if(approvedQty <= 0){
+      if (approvedQty <= 0) {
         this.$message.error(this.labels.approvedQtyMustMoreTanZero);
         this.pageData.approvedQty = 0;//重新赋值
         return false;
       }
       //班次判断
-      if(this.pageData.shiftDesc == '无班次'){
+      if (this.pageData.shiftDesc == '无班次') {
         this.$message.error(this.labels.noMatchShiftInfo);
         return false;
       }
@@ -1197,9 +1230,9 @@ export default {
       //先调用检查方法
       checkRepackFinishRollWithNoFqc(postData).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else if (data.resultMap.resultCode == '201'){
+        } else if (data.resultMap.resultCode == '201') {
           //打开异常原因录入的界面
           this.$confirm(data.resultMap.resultMsg, '提示', {
             confirmButtonText: this.labels.confirmLabel,
@@ -1208,7 +1241,7 @@ export default {
           }).then(() => {
             this.showExceptionReasonModal();
           });
-        }else{
+        } else {
           //执行结束卷操作
           this.finishRollOperation();
         }
@@ -1216,15 +1249,19 @@ export default {
     },
 
     /*结束卷的具体操作*/
-    finishRollOperation(){
+    finishRollOperation() {
       //验证通过提交到后台
       let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
       //处理信息
       repackFinishRollWithNoFqc(postData).then(({data}) => {
         //判断操作是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
+          // 打印
+          this.$nextTick(() => {
+            this.$refs.comRollLabel.init(this.pageData.rollNo)
+          });
           //关闭当前的页面
           this.closeDialog();
         }
@@ -1232,7 +1269,7 @@ export default {
     },
 
     /*打开异常原因录入页面*/
-    showExceptionReasonModal(){
+    showExceptionReasonModal() {
       //1.首先调用菜单判断方式  打开生产过程的材料的页面
       //checkProduceButton('produceMaterialFlag');
       //打开生产过程的工具的页面
@@ -1243,16 +1280,16 @@ export default {
     },
 
     /*处理异常的原因*/
-    initExceptionReason(exceptionReason){
+    initExceptionReason(exceptionReason) {
       //处理异常的原因
       this.pageData.exceptionFlag = 'Y';
-      this.pageData.exceptionReason =  exceptionReason;
+      this.pageData.exceptionReason = exceptionReason;
       //然后提交结束卷的数据
       this.finishRollOperation();
     },
 
     /*打开班次选择页面*/
-    selectSchduleShiftModal(){
+    selectSchduleShiftModal() {
       //1.首先调用菜单判断方式  打开生产过程的材料的页面
       //checkProduceButton('produceMaterialFlag');
       //打开生产过程的工具的页面
@@ -1263,11 +1300,11 @@ export default {
     },
 
     /*修改页面的班次和排产的时间*/
-    initScheduleShift(scheduleDate, shiftDesc, username){
+    initScheduleShift(scheduleDate, shiftDesc, username) {
       //重置班次和排产的时间
       this.pageData.scheduledDate = scheduleDate.substring(0, 10);
       this.pageData.shiftDesc = shiftDesc;
-      this.pageData.remark = username+"更改了班次."
+      this.pageData.remark = username + "更改了班次."
     },
 
     // 保存 默认配置 列
@@ -1282,7 +1319,7 @@ export default {
     getMultiLanguageList() {
       //首先查询当前按钮的多语言
       searchFunctionButtonList(this.queryButton).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.buttons = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
@@ -1291,7 +1328,7 @@ export default {
       });
       //其次查询当前标签的多语言
       searchFunctionButtonList(this.queryLabel).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.labels = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
@@ -1301,7 +1338,6 @@ export default {
     },
 
 
-
   },
   created() {
     // this.factoryList()
@@ -1313,43 +1349,45 @@ export default {
 
 <style scoped lang="scss">
 /*调节页面button和input的上下间距*/
-.customer-css .customer-button{
+.customer-css .customer-button {
   margin-top: 25px;
 }
 
 /*调节样式*/
-.customer-item{
+.customer-item {
   margin-top: -10px;
 }
+
 /*fieldset下table的样式*/
-.customer-fieldset /deep/ .el-table__header th.is-leaf{
+.customer-fieldset /deep/ .el-table__header th.is-leaf {
   line-height: 16px;
 }
 
-/deep/ .customer-tab .el-tabs__content{
+/deep/ .customer-tab .el-tabs__content {
   padding: 0px !important;
 }
 
 /*table中input*/
-div.table-input /deep/ input.el-input__inner{
+div.table-input /deep/ input.el-input__inner {
   text-align: right;
 }
 
 /*当前按钮的通用样式*/
-.customer-css .customer-bun-mid{
+.customer-css .customer-bun-mid {
   width: 65px;
   text-align: center;
 }
 
-.customer-css .customer-bun-min{
+.customer-css .customer-bun-min {
   width: 50px;
   text-align: center;
 }
 
-.customer-css .customer-bun-max{
+.customer-css .customer-bun-max {
   width: 80px;
   text-align: center;
 }
+
 /*当前按钮的通用样式*/
 .customer-css .el-button--medium {
   padding: 5px 5px;
diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue
index 1d08a2e..8fc8c1e 100644
--- a/src/views/modules/yieldReport/otherReport/change_packaging.vue
+++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue
@@ -49,13 +49,13 @@
           </el-form-item>
           <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">{{labels.onlyCurrentRoll}}
+                         v-model="scheduleData.currentRollFlag">{{ labels.onlyCurrentRoll }}
             </el-checkbox>
           </el-form-item>
         </el-form>
         <!-- 第四行菜单- 卷操作 -->
         <fieldset class="customer-fieldset" style="width: 330px; height: 60px">
-          <legend class="customer-legend">{{labels.rollButtons}}</legend>
+          <legend class="customer-legend">{{ labels.rollButtons }}</legend>
           <el-form style="margin-top: 5px">
             <el-form-item class="customer-roll-css" style="width: 130px; font-size: 16px; color: #387877;">
               <span>{{ this.currentRollOps.rollNo }}</span>
@@ -79,15 +79,15 @@
         </fieldset>
         <!-- 第四行菜单- fqc成品卷奥做 -->
         <fieldset class="customer-fieldset" style="width: 330px; margin-top: -60px;margin-left: 340px;height: 60px">
-          <legend class="customer-legend">{{labels.fqcSfdcOperation}}</legend>
+          <legend class="customer-legend">{{ labels.fqcSfdcOperation }}</legend>
           <el-form>
             <el-form-item style="margin-top: -10px ;">
-              <span slot="label" type="label">{{labels.perRollQty}}</span>
+              <span slot="label" type="label">{{ labels.perRollQty }}</span>
               <el-input style="width: 80px" oninput="value=value.replace(/[^0-9]/g,'')" v-model="createRoll.rollQty">
               </el-input>
             </el-form-item>
             <el-form-item style="margin-top: -10px ;">
-              <span slot="label" type="label">{{labels.rollNums}}</span>
+              <span slot="label" type="label">{{ labels.rollNums }}</span>
               <el-input class="customer-bun-mid" oninput="value=value.replace(/[^0-9]/g,'')"
                         v-model="createRoll.rollNums">
               </el-input>
@@ -96,14 +96,14 @@
               <span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
               <el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
                          :disabled="buttonTags.createNewRollFlag">
-                {{buttons.separateRoll}}
+                {{ buttons.separateRoll }}
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: -12px ;">
               <span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag"
                          @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
-                {{buttons.mergeRoll}}
+                {{ buttons.mergeRoll }}
               </el-button>
             </el-form-item>
 
@@ -111,7 +111,7 @@
         </fieldset>
         <!-- 列表展示区域 -->
         <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 870px; height: 300px;">
-          <legend class="customer-legend">{{labels.listDesc}}</legend>
+          <legend class="customer-legend">{{ labels.listDesc }}</legend>
           <el-tabs v-model="activeTable" style="margin-top: -3px; width: 870px;"
                    type="border-card" @tab-click="tabClick" class="customer-tab">
             <el-tab-pane :label=labels.materialList name="sfdc_material">
@@ -169,15 +169,15 @@
                   <template slot-scope="scope">
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.rollNo != '*' && scope.row.sAPBOMItemNo >= 0
                     && scope.row.finishedFlag == 'N' && scope.row.histType == '发料'"
-                       @click="replaceMaterialModal(scope.row)">{{labels.materialListReplace}}</a>
+                       @click="replaceMaterialModal(scope.row)">{{ labels.materialListReplace }}</a>
                     <a class="customer-a" v-if="operatorData.operatorName != ''  && scope.row.rollNo == '*' && scope.row.sAPBOMItemNo >= 0
                     && scope.row.finishedFlag == 'N' && scope.row.histType == '发料'"
                        @click="cuttingMaterialModal(scope.row)"
-                    >{{labels.materialListCutting}}</a>
+                    >{{ labels.materialListCutting }}</a>
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.sAPBOMItemNo >= 0
                     && scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'"
                        @click="warnFinishMaterialWithNoRemainderConfirm(scope.row)"
-                    >{{labels.materialListFinish}}</a>
+                    >{{ labels.materialListFinish }}</a>
                   </template>
                 </el-table-column>
               </el-table>
@@ -210,39 +210,40 @@
             <el-tab-pane :label=labels.defectList name="sfdc_defect">
               <el-form>
                 <el-form-item style="margin-top: 0px ;">
-                  <span slot="label" type="label">{{labels.reportDate}}</span>
+                  <span slot="label" type="label">{{ labels.reportDate }}</span>
                   <el-date-picker style="width: 100px"
                                   format="yyyy-MM-dd"
                                   value-format="yyyy-MM-dd hh:mm:ss" v-model="harmful.reportedDate">
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item style="margin-top: 0px ;">
-                  <a slot="label" type="label" @click="getBaseList(89)">{{labels.defectCode}}</a>
+                  <a slot="label" type="label" @click="getBaseList(89)">{{ labels.defectCode }}</a>
                   <el-input style="width: 90px" v-model="harmful.defectCode">
                   </el-input>
                 </el-form-item>
                 <el-form-item style="margin-top: 0px ;">
-                  <span slot="label" type="label">{{labels.defectDesc}}</span>
+                  <span slot="label" type="label">{{ labels.defectDesc }}</span>
                   <el-input style="width: 150px" v-model="harmful.defectDesc" readonly>
                   </el-input>
                 </el-form-item>
                 <el-form-item style="margin-top: 0px ;">
-                  <span slot="label" type="label">{{labels.defectQty}}</span>
+                  <span slot="label" type="label">{{ labels.defectQty }}</span>
                   <el-input style="width: 120px" v-model="harmful.defectQty"
                             oninput="value=value.replace(/[^0-9]/g,'')">
                   </el-input>
                 </el-form-item>
                 <el-form-item style="margin-top: 0px ;">
-                  <span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px" @click="getBaseList(89)"> </span>
+                  <span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"
+                        @click="getBaseList(89)"> </span>
                   <el-button class="customer-bun-mid" type="primary" @click="saveHarmful">
-                    {{buttons.saveButton}}
+                    {{ buttons.saveButton }}
                   </el-button>
                 </el-form-item>
                 <el-form-item style="margin-top: 0px ;">
                   <span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
                   <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag"
                              @click="getInspectionDefectCodeList" style="margin-left: 10px; margin-bottom: 5px;">
-                    {{buttons.batchSaveButton}}
+                    {{ buttons.batchSaveButton }}
                   </el-button>
                 </el-form-item>
 
@@ -307,13 +308,13 @@
                   <template slot-scope="scope">
                     <a v-if="scope.row.virtualRollFlag=='N'" class="customer-a"
                        @click="rollPrintLabel(scope.row)"
-                    >{{'打印'}}</a>
+                    >{{ '打印' }}</a>
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
                        @click="warnReopenSfdcRollsConfirm(scope.row)"
                     >{{ labels.rollListReopen }}</a>
                     <a class="customer-a" v-if="operatorData.operatorName != ''"
                        @click="warnDeleteSfdcRollsConfirm(scope.row)"
-                    >{{labels.rollListDelete}}</a>
+                    >{{ labels.rollListDelete }}</a>
                   </template>
                 </el-table-column>
               </el-table>
@@ -323,23 +324,23 @@
         <!-- 生产调机菜单 -->
         <fieldset class="customer-fieldset"
                   style="margin-left: 680px; margin-top: -510px; width: 200px; height: 200px;">
-          <legend class="customer-legend">{{labels.produceTuning}}</legend>
+          <legend class="customer-legend">{{ labels.produceTuning }}</legend>
           <el-form>
             <el-form-item style="margin-left: 10px; margin-top: 20px">
               <el-button class="customer-bun-mid" type="primary" @click="refreshPageData"
                          style="width: 80px; ">
-                {{buttons.refreshButton}}
+                {{ buttons.refreshButton }}
               </el-button>
             </el-form-item>
             <el-form-item style="margin-left: 100px; margin-top: -20px">
               <el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal" style="width: 80px;">
-                {{buttons.switchOperator}}
+                {{ buttons.switchOperator }}
               </el-button>
             </el-form-item>
             <el-form-item style="margin-left: 100px; margin-top: -20px">
               <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag"
                          @click="showFinishScheduleModal" style="width: 80px; margin-left: -90px;margin-top: 15px;">
-                {{buttons.finishSchedule}}
+                {{ buttons.finishSchedule }}
               </el-button>
             </el-form-item>
             <el-form-item style="margin-left: 100px; margin-top: -20px">
@@ -361,7 +362,7 @@
 
     <!-- 开始生产组件 -->
     <changeSwitchRoll ref="changeSwitchRoll" :close-on-click-modal="false"
-                     :visible.sync="showSwitchFlag" @refreshPageData="refreshPageData">
+                      :visible.sync="showSwitchFlag" @refreshPageData="refreshPageData">
 
     </changeSwitchRoll>
 
@@ -373,7 +374,7 @@
 
     <!--  结束卷的modal -->
     <changeFinishRoll ref="changeFinishRoll" :close-on-click-modal="false"
-                   :visible.sync="showFinishFlag" @refreshPageData="refreshPageData">
+                      :visible.sync="showFinishFlag" @refreshPageData="refreshPageData">
 
     </changeFinishRoll>
 
@@ -450,15 +451,15 @@
 
     </comFinishSchedule>
 
-    <defectList ref="defectList" @getSfdcDefectList='getSfdcDefectList' ></defectList>
+    <defectList ref="defectList" @getSfdcDefectList='getSfdcDefectList'></defectList>
 
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
     <!-- 为生产下机拆卷 -->
     <notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
                        @refreshPageData="refreshPageData"></notOverFinishRoll>
 
     <!--打印卷标签-->
-    <com-roll-label ref="comRollLabel" ></com-roll-label>
+    <com-roll-label ref="comRollLabel"></com-roll-label>
   </div>
 
 </template>
@@ -543,7 +544,7 @@ export default {
       titleCon: '',
       showDefault: false,
       popoverFlag: false,
-      showNotOverFlag:false,
+      showNotOverFlag: false,
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2788,8 +2789,8 @@ export default {
         produceToolFlag: true,
         materialFlag: true,
         downTimeFlag: true,
-        scannerRollFlag:true,
-        otherFlag:true,
+        scannerRollFlag: true,
+        otherFlag: true,
       },
       dataListLoading: false,
       createRoll: {
@@ -3004,7 +3005,7 @@ export default {
           objectId: 'preItemNo',
           objectType: 'label',
           tableId: '*'
-        },{
+        }, {
           functionId: functionId,
           languageValue: '后道工序',
           objectId: 'nextItemNo',
@@ -3016,7 +3017,7 @@ export default {
           objectId: 'onlyCurrentRoll',
           objectType: 'label',
           tableId: '*'
-        },{
+        }, {
           functionId: functionId,
           languageValue: '卷操作',
           objectId: 'rollButtons',
@@ -3208,7 +3209,7 @@ export default {
           objectId: 'pleaseScanRollThanSplitRoll',
           objectType: 'label',
           tableId: '*'
-        },{
+        }, {
           functionId: functionId,
           languageValue: '确实要创建一个新卷吗?',
           objectId: 'sureCreateNewRoll',
@@ -3306,21 +3307,21 @@ export default {
   },
   methods: {
     // 卷标签打印
-    rollPrintLabel(val){
+    rollPrintLabel(val) {
       this.$nextTick(() => {
         this.$refs.comRollLabel.init(val.rollNo)
       });
     },
     // 不良记录
-    sfdcDefectListSummaries(param){
-      const { columns, data } = param;
+    sfdcDefectListSummaries(param) {
+      const {columns, data} = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 1) {
           sums[index] = this.labels.totalSum;
           return;
         }
-        if (index == 4){
+        if (index == 4) {
           const values = data.map(item => Number(item[column.property]));
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -3331,25 +3332,25 @@ export default {
                 return prev;
               }
             }, 0);
-            sums[index] ;
+            sums[index];
           }
-          sums[index] = sums[index]?sums[index]:0
+          sums[index] = sums[index] ? sums[index] : 0
         }
 
       });
       return sums;
     },
     // 机器下机卷
-    sfdcRollListSummaries(param){
-      const { columns, data } = param;
+    sfdcRollListSummaries(param) {
+      const {columns, data} = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = this.labels.sfdcRollSum;
           return;
         }
-        if (index == 14){
-          let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
+        if (index == 14) {
+          let list = data.filter(item => item.virtualRollFlag != 'Y' && item.rollType != '删除卷')
           const values = list.map(item => Number(item[column.property]));
           let sum = 0
           if (!values.every(value => isNaN(value))) {
@@ -3363,7 +3364,7 @@ export default {
             }, 0);
 
           }
-          sums[0]+= sum?sum:0
+          sums[0] += sum ? sum : 0
         }
       });
       return sums;
@@ -3377,26 +3378,26 @@ export default {
       });
     },
     /*列表方法的回调*/
-    getBaseData(val){
+    getBaseData(val) {
       console.log(val)
-      if (this.tagNo === 89){
+      if (this.tagNo === 89) {
         this.harmful.defectCode = val.DefectCode;
         this.harmful.defectDesc = val.DefectDesc;
       }
     },
     // 获取基础数据列表
-    getBaseList(val){
+    getBaseList(val) {
       this.tagNo = val
       this.$nextTick(() => {
         let strVal = "";
-        if (val === 89 ){
-          strVal =  this.harmful.defectCode;
+        if (val === 89) {
+          strVal = this.harmful.defectCode;
         }
         this.$refs.baseList.init(val, strVal)
       })
     },
     // 不良信息列表
-    getInspectionDefectCodeList(){
+    getInspectionDefectCodeList() {
       this.$nextTick(() => {
         this.$refs.defectList.init(this.scheduleData)
       });
@@ -3431,11 +3432,11 @@ export default {
       saveSfdcDefect(this.harmful).then(({data}) => {
         if (data.code == 0) {
           this.$message.success(data.msg)
-          this.harmful.defectCode= ''
-          this.harmful.defectQty= ''
+          this.harmful.defectCode = ''
+          this.harmful.defectQty = ''
           this.harmful.defectDesc = ''
           this.getSfdcDefectList();
-        } else if(data.code == 500){
+        } else if (data.code == 500) {
           this.$message.error(data.msg)
         } else {
           this.$message.warning(data.msg)
@@ -3578,7 +3579,7 @@ export default {
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
       this.operatorData = operatorData;
-       //判断是否启用多语言
+      //判断是否启用多语言
       this.getMultiLanguageList();  //刷新多语言的信息
       //清空当前的页面列表参数
       this.sfdcTimeList = [];
@@ -3721,7 +3722,7 @@ export default {
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //切换当前账户的信息
       //设置弹窗的标题
-      this.titleCon =  this.labels.titleCon + ' - ' + this.scheduleData.workCenterDesc + ' '
+      this.titleCon = this.labels.titleCon + ' - ' + this.scheduleData.workCenterDesc + ' '
         + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
       //刷新菜单
     },
@@ -3791,11 +3792,11 @@ export default {
     /*创建分卷的modal调用*/
     separateRollModal() {
       if (!this.currentRollOps.rollNo) {
-        this.$message.warning( this.labels.pleaseEnterPreRollQtyAndRollNums)
+        this.$message.warning(this.labels.pleaseEnterPreRollQtyAndRollNums)
         return;
       }
       if (!this.createRoll.rollQty || !this.createRoll.rollNums) {
-        this.$message.warning( this.labels.pleaseEnterPreRollQtyAndRollNums)
+        this.$message.warning(this.labels.pleaseEnterPreRollQtyAndRollNums)
         return;
       }
 
@@ -3838,18 +3839,26 @@ export default {
           this.$message.error(data.msg);
         } else if (data.code == 200) {
           this.$message.success(data.msg)
-          this.createRoll.rollNums= ''
-          this.createRoll.rollQty= ''
+          this.createRoll.rollNums = ''
+          this.createRoll.rollQty = ''
           //打印卷标签
-          // let printList = data.printList;
+          let printList = data.printList;
           // printSfdcLabel(printList);
+          let rollNos = ''
+          for (let i = 0; i < printList.length; i++) {
+            if (i == 0 && printList.length == 1) {
+              rollNos += printList[i].rollNo
+            } else {
+              rollNos += printList[i].rollNo + ';'
+            }
+          }
           // 打印
           this.$nextTick(() => {
-            this.$refs.comRollLabel.init(data.rollNos)
+            this.$refs.comRollLabel.init(rollNos)
           });
           //刷新报工的页面
           this.getSfdcRollList()
-        }else {
+        } else {
           this.$message.warning(data.msg)
         }
 
@@ -3884,7 +3893,7 @@ export default {
       //打开合并卷的页面
       this.$nextTick(() => {
         this.showMergeFlag = true;
-        this.$refs.comMergeRoll.init(this.scheduleData, this.operatorData,1)
+        this.$refs.comMergeRoll.init(this.scheduleData, this.operatorData, 1)
       });
     },
 
@@ -3998,7 +4007,7 @@ export default {
       this.showFinishScheduleFlag = true;
       this.$nextTick(() => {
         // 第三个换包装结单参数
-        this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData,4);
+        this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData, 4);
       });
     },
 
@@ -4150,7 +4159,7 @@ export default {
         }
       });
     },
-    closeDialog(){
+    closeDialog() {
       Object.assign(this.$data, this.$options.data.call(this));
     },
 
@@ -4166,7 +4175,7 @@ export default {
     getMultiLanguageList() {
       //首先查询当前按钮的多语言
       searchFunctionButtonList(this.queryButton).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.buttons = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
@@ -4175,7 +4184,7 @@ export default {
       });
       //其次查询当前标签的多语言
       searchFunctionButtonList(this.queryLabel).then(({data}) => {
-        if (data && data.code == 0 ) {
+        if (data && data.code == 0) {
           this.labels = data.data
         } else {
           // saveButtonList(this.buttonList).then(({data}) => {
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index f944947..5a13f8f 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -3920,7 +3920,7 @@ export default {
       //打开结束卷的页面
       this.$nextTick(() => {
         this.showFinishFlag = true;
-        this.$refs.comFinishRoll.init(this.scheduleData, this.operatorData)
+        this.$refs.comFinishRoll.init(this.scheduleData, this.operatorData, this.isFinishItemNo)
       });
     },