fqc 打印 2022年11月25日 sxm

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)

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)) {

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 != ''){
+            // 是否是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();

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);
+                      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);
+                    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);
+                    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);
+                  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();

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>
@@ -39,20 +45,25 @@
             <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-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>
           <!-- 操作员信息和班次信息 -->
@@ -63,13 +74,15 @@
               <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-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;">
@@ -86,13 +99,16 @@
             <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-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-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-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -100,13 +116,16 @@
             <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-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-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-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -114,13 +133,16 @@
             <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-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-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-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red"
+                            readonly="readonly" style="width: 80px;"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -140,13 +162,16 @@
                   <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-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-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-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly"
+                            style="width: 80px;"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -154,13 +179,16 @@
             <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-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-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-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>
@@ -233,6 +261,9 @@
                     :visible.sync="showShiftFlag"
                     @initScheduleShift="initScheduleShift">
     </comSelectShift>
+
+    <!--打印卷标签-->
+    <com-roll-label ref="comRollLabel"></com-roll-label>
   </div>
 
 </template>
@@ -241,6 +272,7 @@
 /*添加组件*/
 import comExceptionReason from "../com_exception_reason";//异常远远
 import comSelectShift from "../com_select_shift";//班次选择的组件
+import comRollLabel from "../../common/com-roll-label";/*打印卷标签*/
 import {
   getCurrentRollReportedQty,
   countSfdcTimeQty,
@@ -268,6 +300,7 @@ import {
   saveSysLanguageList
 } from "@/api/sysLanguage.js";
 
+
 var functionId = 'C10000031';
 
 export default {
@@ -897,6 +930,7 @@ export default {
   components: {
     comExceptionReason,/*异常原因的组件*/
     comSelectShift,/*班次选择的组件*/
+    comRollLabel,
   },
   methods: {
     sORoutingPreviousOperationItemNo() {
@@ -1127,7 +1161,6 @@ export default {
     },
 
 
-
     /*检查数据是否有效*/
     checkValidQty(row) {
       //判断当前是否为空
@@ -1225,6 +1258,10 @@ export default {
         if (data.code == 500) {
           this.$message.error(data.msg);
         } else {
+          // 打印
+          this.$nextTick(() => {
+            this.$refs.comRollLabel.init(this.pageData.rollNo)
+          });
           //关闭当前的页面
           this.closeDialog();
         }
@@ -1301,7 +1338,6 @@ export default {
     },
 
 
-
   },
   created() {
     // this.factoryList()
@@ -1321,6 +1357,7 @@ export default {
 .customer-item {
   margin-top: -10px;
 }
+
 /*fieldset下table的样式*/
 .customer-fieldset /deep/ .el-table__header th.is-leaf {
   line-height: 16px;
@@ -1350,6 +1387,7 @@ div.table-input /deep/ input.el-input__inner{
   width: 80px;
   text-align: center;
 }
+
 /*当前按钮的通用样式*/
 .customer-css .el-button--medium {
   padding: 5px 5px;

src/views/modules/yieldReport/otherReport/change_packaging.vue

@@ -233,7 +233,8 @@
                   </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 }}
                   </el-button>
@@ -3841,11 +3842,19 @@ export default {
           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()

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)
       });
     },