roll label

src/api/label/printRollLabelRecord.js

@@ -2,3 +2,4 @@ import {createAPI} from '../../utils/httpRequest'
 
 export const getPrintRollLabelRecordPage = (data,no,size) => createAPI(`/label/print/roll/record/page/${no}/${size}`,'post',data)
 export const savePrintRollLabelRecord = (data) => createAPI(`/label/print/roll/record/save`,'post',data)
+export const getPrintRollLabelRecord = (data) => createAPI(`/label/print/roll/record`,'post',data)

src/printFormat/roll_label.js

@@ -14,6 +14,7 @@ export const print_roll_label = (printList,printerName)=>{
     LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')
     for (let i = 0; i < printList.length; i++) {
       let row = printList[i];
+      console.log(row)
       LODOP.NewPage();
       LODOP.ADD_PRINT_IMAGE(2,-2,"20mm","20mm",`<img src="${row.qrCode}"/>`);
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
@@ -60,11 +61,16 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
+      if (row.rollLabelRequired === 'Y'){
         LODOP.ADD_PRINT_TEXT(58,78,30,20,"ROLL");
+      }else if (row.serialNumberRequired === 'Y'){
+        LODOP.ADD_PRINT_TEXT(58,78,50,20,"SERIAL");
+      }
+      if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
         LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
+      }
 
       LODOP.ADD_PRINT_TEXT(66,78,29,15,"DATE");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
@@ -76,10 +82,16 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
+      if (row.rollLabelRequired === 'Y'){
         LODOP.ADD_PRINT_TEXT(58,100,80,20,row.rollNo);
+      }else if (row.serialNumberRequired === 'Y'){
+        LODOP.ADD_PRINT_TEXT(58,105,80,20,row.serialNumber);
+      }
+      if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
         LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      }
       LODOP.PRINT();
     }
   }

src/views/modules/label/printer.vue

@@ -839,6 +839,9 @@ export default {
               moldCode: item.moldCode,
               rollNo: item.rollNo,
               sn: item.serialNumber,
+              rollLabelRequired: item.rollLabelRequired,
+              serialNumberRequired: item.serialNumberRequired,
+              serialNumber: item.serialNumber,
             }
           });
           let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{
@@ -941,7 +944,8 @@ export default {
         <el-col :span="8" >
           <el-form-item label=" ">
             <el-button type="primary" @click="handlePrint(0)">Print-Carton Label</el-button>
-            <el-button type="primary" @click="handlePrint(1)" :disabled="currentPart.rollLabelRequired === 'N'">Print-Roll Label</el-button>
+<!--            <el-button type="primary" @click="handlePrint(1)" :disabled="currentPart.rollLabelRequired === 'N'">Print-Roll Label</el-button>-->
+            <el-button type="primary" @click="handlePrint(1)" >Print-Roll Label</el-button>
           </el-form-item>
         </el-col>
       </el-row>

src/views/modules/label/roll.vue

@@ -13,7 +13,7 @@ import {
 } from '../../../api/label/labelFormatUserDefault'
 import getLodop from '@/utils/LodopFuncs.js'
 import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
-import {getPrintRollLabelRecordPage} from '../../../api/label/printRollLabelRecord'
+import {getPrintRollLabelRecord, getPrintRollLabelRecordPage} from '../../../api/label/printRollLabelRecord'
 import QrCode from './QrCode.vue'
 import {print_roll_label} from '../../../printFormat/roll_label'
 
@@ -331,7 +331,21 @@ export default {
         this.$message.warning('please select record')
         return
       }
-      let params = this.selectionPrintLabelRecordList.map((item) => {
+      let ids = this.selectionPrintLabelRecordList.map((item) => {
+        return item.id
+      })
+      getPrintRollLabelRecord(ids).then(({data})=>{
+        if (data && data.code === 0){
+          this.handlePrint(data.rows)
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error.message)
+      })
+    },
+    handlePrint(list){
+      let params = list.map((item) => {
         return {
           site:item.site,
           partNo:item.partNo,
@@ -341,7 +355,7 @@ export default {
           category:item.category,
         }
       })
-      let {data} = await getRollPrinterNameList(params)
+      getRollPrinterNameList(params).then(({data})=>{
         if (data && data.code === 0){
           for (let i = 0; i < this.selectionPrintLabelRecordList.length; i++) {
             let record = this.selectionPrintLabelRecordList[i]
@@ -362,6 +376,9 @@ export default {
                   moldCode: item.moldCode,
                   rollNo: item.rollNo,
                   sn: item.serialNumber,
+                  rollLabelRequired: item.rollLabelRequired,
+                  serialNumberRequired: item.serialNumberRequired,
+                  serialNumber: item.serialNumber,
                 }
               })
               let qrCodeList = this.$refs.qrCode.init(arr.map((item)=>{
@@ -377,6 +394,10 @@ export default {
         }else {
           this.$message.warning(data.msg)
         }
+      }).catch((error)=>{
+        this.$message.error(error.message)
+      })
+
     },
     printLabel(pictureList,formatList){
       let prints = this.selectionPrintLabelRecordList.map((item) => {
@@ -394,7 +415,6 @@ export default {
           sn: item.serialNumber,
         }
       })
-
       let notFound = [];
       for (let i = 0; i < prints.length; i++) {
         let print = prints[i]

static/config/index-prod.js

@@ -7,7 +7,7 @@
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9008';// 客户
   // window.SITE_CONFIG['baseUrl'] = 'http://192.168.254.12:9008/';// 客户
-  window.SITE_CONFIG['baseUrl'] = 'http://qrcode.checkpt.com:9008/';// 客户
+  window.SITE_CONFIG['baseUrl'] = '/api';// 客户
   // window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83
 
   // cdn地址 = 域名 + 版本号