Browse Source

Merge branch 'develop_szhj04' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into pre-release

# Conflicts:
#	public/version.json
lilei 2 năm trước cách đây
mục cha
commit
b09a278e0b

+ 1 - 1
public/version.json

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

+ 8 - 3
src/libs/JGPrint.js

@@ -34,7 +34,8 @@ export const JGPrintTag = function (width, height, data) {
   const tline1 = (data.shelfName.length > 17 ? 2 : 1);
   const top0 = top + tline * 5;
   const top1 = top0 + 5;
-  const top2 = top1 + 12;
+  const top2 = top1 + 10;
+  const top3 = top2 + 6;
   // 经销商名称
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
   LODOP.SET_PRINT_STYLE("FontSize",10);
@@ -49,15 +50,19 @@ export const JGPrintTag = function (width, height, data) {
   LODOP.SET_PRINT_STYLEA(0,"Horient",2);
   // 货位号
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
-  LODOP.SET_PRINT_STYLE("FontSize",32);
+  LODOP.SET_PRINT_STYLE("FontSize",30);
   LODOP.ADD_PRINT_TEXT(top1+'mm',"50%","28mm","15mm",data.shelfPlaceCode);
   // 产品编码
   LODOP.SET_PRINT_STYLE("TextNeatRow",true);
   LODOP.SET_PRINT_STYLE("FontSize",12);
   LODOP.ADD_PRINT_TEXT(top2+'mm',"50%","30mm","15mm",data.productCode);
   // 二维码
-  LODOP.ADD_PRINT_BARCODE(top1+'mm','7mm',80,80,"QRCode",data.qrCodeContent)
+  LODOP.ADD_PRINT_BARCODE(top1+'mm','6mm',80,80,"QRCode",data.qrCodeContent)
   LODOP.SET_PRINT_STYLE("QRCodeVersion",5)
+  // 时间
+  LODOP.SET_PRINT_STYLE("TextNeatRow",true);
+  LODOP.SET_PRINT_STYLE("FontSize",9);
+  LODOP.ADD_PRINT_TEXT(top3+'mm',"50%","30mm","15mm",data.printTime);
   // LODOP.SET_PRINT_STYLE("QRCodeErrorLevel",'H')
   LODOP.SET_PRINT_COPIES(data.printQty)// 指定份数
   LODOP.SET_PRINT_PAGESIZE(1, width, height)

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

@@ -30,6 +30,7 @@
           <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 style="margin: 2pt 0;">{{ moment().format('YYYY-MM-DD HH:mm') }}</div>
           </div>
         </div>
       </div>
@@ -73,6 +74,7 @@ export default {
         item.dealerName = this.nowData.dealerName
         item.qrCodeContent = `${item.shelfSn}&${item.productCode}&${item.productSn}&${item.shelfPlaceSn}`
         item.shelfName = this.nowData.shelfInfo.shelfName
+        item.printTime = moment().format('YYYY-MM-DD HH:mm')
         JGPrintTag('60mm', '40mm', item)
       }
     },