lilei 2 lat temu
rodzic
commit
5323a57ac2

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1664336433825
+  "version": 1664350582736
 }

+ 18 - 9
src/libs/JGPrint.js

@@ -29,25 +29,34 @@ export const JGPrintTag = function (width, height, data) {
   LODOP.PRINT_INITA("0mm","0mm",width,height,"标签");
   LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
   LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
-  const top = data.dealerName.length > 12 ? '5mm' : '7mm';
-  const top1 = data.dealerName.length > 12 ? '17mm' : '15mm';
-  const top2 = data.dealerName.length > 12 ? '29mm' : '27mm';
+  const top = 3;
+  const tline = (data.dealerName.length > 14 ? 2 : 1);
+  const tline1 = (data.shelfName.length > 17 ? 2 : 1);
+  const top0 = top + tline * 5;
+  const top1 = top0 + 5;
+  const top2 = top1 + 12;
   // 经销商名称
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
-  LODOP.SET_PRINT_STYLE("FontSize",11);
-  LODOP.ADD_PRINT_TEXT(top,"5mm","50mm","10mm",data.dealerName);
+  LODOP.SET_PRINT_STYLE("FontSize",10);
+  LODOP.ADD_PRINT_TEXT(top+'mm',"3mm","54mm","10mm",data.dealerName);
+  LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+  LODOP.SET_PRINT_STYLEA(0,"Horient",2);
+  // 货架名称
+  LODOP.SET_PRINT_STYLE("TextNeatRow",true);
+  LODOP.SET_PRINT_STYLE("FontSize",9);
+  LODOP.ADD_PRINT_TEXT(top0+'mm',"3mm","54mm","10mm",tline1>1?data.shelfName.substring(0,14)+'...':data.shelfName);
   LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
   LODOP.SET_PRINT_STYLEA(0,"Horient",2);
   // 货位号
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
   LODOP.SET_PRINT_STYLE("FontSize",32);
-  LODOP.ADD_PRINT_TEXT(top1,"50%","28mm","15mm",data.shelfPlaceCode);
+  LODOP.ADD_PRINT_TEXT(top1+'mm',"50%","28mm","15mm",data.shelfPlaceCode);
   // 产品编码
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
-  LODOP.SET_PRINT_STYLE("FontSize",11);
-  LODOP.ADD_PRINT_TEXT(top2,"50%","30mm","15mm",data.productCode);
+  LODOP.SET_PRINT_STYLE("FontSize",12);
+  LODOP.ADD_PRINT_TEXT(top2+'mm',"50%","30mm","15mm",data.productCode);
   // 二维码
-  LODOP.ADD_PRINT_BARCODE(top1,'7mm',90,90,"QRCode",data.qrCodeContent)
+  LODOP.ADD_PRINT_BARCODE(top1+'mm','7mm',80,80,"QRCode",data.qrCodeContent)
   LODOP.SET_PRINT_STYLE("QRCodeVersion",5)
   // LODOP.SET_PRINT_STYLE("QRCodeErrorLevel",'H')
   LODOP.SET_PRINT_COPIES(data.printQty)// 指定份数

+ 6 - 2
src/views/numsGoodsShelves/replenishmentManagement/printView.vue

@@ -15,16 +15,19 @@
         :key="index"
         class="print-pages"
         style="font-size: 12px;padding:10pt 15pt;width:300px;margin:0 auto;">
-        <div class="storeName" style="text-align: center;margin: 5pt 0 10pt;">
+        <div class="storeName" style="text-align: center;margin: 5pt 0 0;">
           {{ nowData.dealerName }}
         </div>
+        <div class="storeName" style="text-align: center;margin: 0pt 0 10pt;">
+          {{ nowData.shelfInfo.shelfName }}
+        </div>
         <div style="overflow: hidden;">
           <div style="float: left;">
             <div class="qrcode" ref="qrCodeUrl" style="text-align: center;">
               <vue-qr :text="`${item.shelfSn}&${item.productCode}&${item.productSn}&${item.shelfPlaceSn}`" :margin="0" :size="70"></vue-qr>
             </div>
           </div>
-          <div style="float: left;padding-left:10pt;">
+          <div style="float: left;padding-left:10pt;width: 60%;">
             <div class="productSno" style="font-size: 30pt;height:30pt;line-height:30pt;">{{ item.shelfPlaceCode }}</div>
             <div class="productCode" style="margin-top: 2pt;font-size:12pt;">{{ item.productCode }}</div>
           </div>
@@ -69,6 +72,7 @@ export default {
         const item = this.list[i]
         item.dealerName = this.nowData.dealerName
         item.qrCodeContent = `${item.shelfSn}&${item.productCode}&${item.productSn}&${item.shelfPlaceSn}`
+        item.shelfName = this.nowData.shelfInfo.shelfName
         JGPrintTag('60mm', '40mm', item)
       }
     },