20241115

src/printFormat/logisticLabel.js

@@ -31,7 +31,7 @@ export const printLogisticLabel = (printList, printerName) => {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(42,126,40,20,"QTY");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_TEXT(63,126,50,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);

src/views/modules/label/printer.vue

@@ -45,7 +45,7 @@ const printer = {
   rollsPerCarton: 0,
   orderNo: '',
   templateNo:'',
-  printLabelType:'',
+  printLabelType:0,
 }
 export default {
   name: 'printer',
@@ -690,7 +690,7 @@ export default {
         this.printCurrentPart.moldCode = this.currentPart.moldCode;
       }
       if (this.printCurrentPart.category === 'Alpha/Hard Tag-Serials'){
-        this.$set(this.printCurrentPart,'printLabelType','Carton Label')
+        this.$set(this.printCurrentPart,'printLabelType',0)
         this.handleQueryTemplate();
       }
       this.handleQueryCategory();
@@ -819,6 +819,13 @@ export default {
                 freeInfo2: item.freeInfo2,
                 tradingMark: item.tradingMark,
                 weightUmName: item.weightUmName,
+                pictureMap:item.pictureMap,
+                printLabelType:item.printLabelType,
+                templateNo:item.templateNo,
+                dateStr:item.dateStr,
+                printStr1:item.printStr1,
+                printStr2:item.printStr2,
+                printStr3:item.printStr3,
               }
               if (item.packingWeight){
                 params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
@@ -837,7 +844,11 @@ export default {
               continue
             }
             if (label.printType === 'Alpha/Hard Tag'){
-              printAlphaHardTagLabel(prints,icons,label.defaultPrinterName)
+              if (this.printCurrentPart.category === 'Alpha/Hard Tag-Serials'){
+                printAlphaHardTagLabel(prints,icons,label.defaultPrinterName,this.$store.state.user.autoSerialNumber)
+              }else {
+                printAlphaHardTagLabel(prints,icons,label.defaultPrinterName)
+              }
             }else if (label.printType === 'Hardware(Antenna)'){
               printAntennaLabel(prints,icons,label.defaultPrinterName)
             }else if (label.printType === 'RF' || this.currentPart.category === 'RFID'){
@@ -1362,8 +1373,9 @@ export default {
         <el-col :span="8">
           <el-form-item label="Label Type">
             <el-select v-model="printCurrentPart.printLabelType" style="width: 100%">
-              <el-option label="Carton Label" value="Carton Label"></el-option>
-              <el-option label="Product Label" value="Product Label"></el-option>
+              <el-option label="Carton Label & Product Label" :value="0"></el-option>
+              <el-option label="Carton Label" :value="1"></el-option>
+              <el-option label="Product Label" :value="2"></el-option>
             </el-select>
           </el-form-item>
         </el-col>

src/views/modules/label/record.vue

@@ -318,6 +318,8 @@ export default {
           columnWidth: 140
         }
       ],
+
+      queryLoading:false,
     }
   },
   watch:{
@@ -342,6 +344,7 @@ export default {
         ...this.printRecord,
         site: this.$store.state.user.site,
       }
+      this.queryLoading = true
       getPrintLabelRecordPage(params,this.no,this.size).then(({data}) => {
         if (data && data.code === 0) {
           this.printLabelRecordList = data.rows
@@ -349,8 +352,10 @@ export default {
         } else {
           this.$message.warning(data.message)
         }
+        this.queryLoading = false
       }).catch((error) => {
         this.$message.error(error.message)
+        this.queryLoading = false
       })
     },
     handleSelectionChange (val) {
@@ -413,6 +418,14 @@ export default {
           freeInfo2:item.freeInfo2,
           tradingMark: item.tradingMark,
           weightUmName: item.weightUmName,
+          pictureMap:item.pictureMap,
+          printLabelType:item.printLabelType,
+          templateNo:item.templateNo,
+          category:item.category,
+          dateStr:item.dateStr,
+          printStr1:item.printStr1,
+          printStr2:item.printStr2,
+          printStr3:item.printStr3,
         }
         if (item.packingWeight){
           params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
@@ -444,7 +457,11 @@ export default {
             continue
           }
           if (str[1] === 'Alpha/Hard Tag'){
-            printAlphaHardTagLabel(dataList,base64List,str[0])
+            if (print.category === 'Alpha/Hard Tag-Serials'){
+              printAlphaHardTagLabel(dataList,base64List,str[0],this.$store.state.user.autoSerialNumber)
+            }else {
+              printAlphaHardTagLabel(dataList,base64List,str[0])
+            }
           }else if (str[1] === 'Hardware(Antenna)'){
             printAntennaLabel(dataList,base64List,str[0])
           }else if (str[1] === 'RF' || str[1] === 'RFID'){
@@ -591,7 +608,7 @@ export default {
       </el-form>
     </div>
     <qr-code ref="qrCode"></qr-code>
-    <el-table :data="printLabelRecordList" ref="table" @selection-change="handleSelectionChange"
+    <el-table :data="printLabelRecordList" v-loading="queryLoading" ref="table" @selection-change="handleSelectionChange"
               style="width: 100%;margin-top: 10px" border :height="height">
       <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
       <el-table-column

src/views/modules/part/external.vue

@@ -37,6 +37,9 @@ let part = {
   qtyPerCarton:0,
   qtyPerRoll:0,
   rollsPerCarton:0,
+  printStr1:'',
+  printStr2:'',
+  printStr3:'',
 }
 export default {
   name: "ExternalPart",
@@ -1306,6 +1309,21 @@ export default {
             <el-input v-model="savePart.partDesc"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="$store.state.user.autoSerialNumber === 'Y'">
+          <el-form-item label="Print Str1" :show-message="false">
+            <el-input v-model="savePart.printStr1"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="$store.state.user.autoSerialNumber === 'Y'">
+          <el-form-item label="Print Str2" :show-message="false">
+            <el-input v-model="savePart.printStr2"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="$store.state.user.autoSerialNumber === 'Y'">
+          <el-form-item label="Print Str3" :show-message="false">
+            <el-input v-model="savePart.printStr3"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="Part Category" prop="category" :show-message="false">
             <el-select v-model="savePart.category" placeholder="" @change="changeCategory" style="width: 100%">