打印

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
- VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+#  VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

admin-ui/src/utils/index.js

@@ -533,11 +533,18 @@ export function collectClothPrinter(LODOP, data, lodopName) {
     item.orderClothColors.forEach(col_n=>{
       _name += '-'+col_n.clothColorName
     })
-    _name = item.clothItemName+_name
+    let Craft = ''
+    if (item.orderClothCrafts) {
+      item.orderClothCrafts.forEach(item_n => {
+        Craft += ('|' + item_n.clothCraftName)
+      })
+    }
+    _name = item.clothItemName+_name + ('-' + item.clothSpeedName) + Craft
     let _flaws = ''
     item.orderClothFlaws.forEach(item_n=>{
       _flaws += item_n.clothFlawName+';'
     })
+
     LODOP.ADD_PRINT_TEXT(height, 20, 50, 20, i+1);
     LODOP.ADD_PRINT_TEXT(height, 45, 110, 20, _name);
     LODOP.ADD_PRINT_TEXT(height, 165, 40, 20, `${item.totalPrice}元`);
@@ -564,7 +571,7 @@ export function collectClothPrinter(LODOP, data, lodopName) {
 
   //金额
   let payTypename = '';
-  if (data.payTimeType == 1) {
+  if (data.payTimeType == 1 && data.payStatus == 0) {
     payTypename = '取衣付款 '
   } else if(data.payType == '0'){
     payTypename = '微信 '
@@ -579,12 +586,20 @@ export function collectClothPrinter(LODOP, data, lodopName) {
 
 
   LODOP.ADD_PRINT_TEXT(height + 115, 10, 150, 20, `付款方式：${payTypename}`);
-  LODOP.ADD_PRINT_TEXT(height + 115, 160, 150, 20, `会员金额：${data.memberBeforeBalance?data.memberBeforeBalance+'元':''}`);
-  LODOP.ADD_PRINT_TEXT(height + 135, 10, 150, 20, `本次扣款：${data.memberChangeAmount?data.memberChangeAmount+'元':'0'}`);
-  LODOP.ADD_PRINT_TEXT(height + 135, 160, 150, 20, `会员余额：${data.memberBeforeBalance?data.memberBeforeBalance +'元':''}`);
-
-  LODOP.ADD_PRINT_TEXT(height + 155, 10, 150, 20, `客户：${data.appUserInfoVO.contactName}`);
-  LODOP.ADD_PRINT_TEXT(height + 155, 160, 180, 20, `客户电话：${data.appUserInfoVO.contactPhone}`);
+  LODOP.ADD_PRINT_TEXT(height + 115, 160, 150, 20, `会员金额：${data.memberBeforeBalance?data.memberBeforeBalance+'元':'0元'}`);
+  LODOP.ADD_PRINT_TEXT(height + 135, 10, 150, 20, `本次扣款：${data.memberChangeAmount?data.memberChangeAmount+'元':'0元'}`);
+  LODOP.ADD_PRINT_TEXT(height + 135, 160, 150, 20, `会员余额：${data.memberAfterBalance?data.memberAfterBalance +'元':'0元'}`);
+  let contactName = ''
+  let n = 0
+  for(let i = 0; i < (data.appUserInfoVO.contactName || data.appUserInfoVO.nickName || data.realName).length; i++) {
+    n++
+    if (i < 9) {
+      contactName += (data.appUserInfoVO.contactName || data.appUserInfoVO.nickName || data.realName)[i]
+    }
+  }
+  if (n >= 9) contactName += '...'
+  LODOP.ADD_PRINT_TEXT(height + 155, 10, 150, 20, `客户：${contactName}`);
+  LODOP.ADD_PRINT_TEXT(height + 155, 160, 180, 20, `客户电话：${data.appUserInfoVO.contactPhone || data.appUserInfoVO.phoneNumber}`);
   let address = `客户地址：${data.appUserInfoVO.province || ''}${ data.appUserInfoVO.city|| ''}${ data.appUserInfoVO.area|| ''}${ data.appUserInfoVO.address|| ''}${ data.appUserInfoVO.addressDetail|| ''}`
   LODOP.ADD_PRINT_TEXT(height + 175, 10, 300, 20, address);
   var userHeight = addDynamicText(90, address)
@@ -608,8 +623,9 @@ export function collectClothPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_LINE(height + 290, 10, height + 290, 295, 1, 1);
   LODOP.ADD_PRINT_TEXT(height + 300, 50, 300, 20, `请仔细阅读店内张贴的取衣凭证注意事项`);
   LODOP.ADD_PRINT_LINE(height + 320, 10, height + 320, 295, 1, 1);
+  console.log("AAA!23", lodopName, this.LODOP.SET_PRINTER_INDEXA(lodopName))
   if (this.LODOP.SET_PRINTER_INDEXA(lodopName))
-
+    console.log("AAA!2223")
   // this.LODOP.PREVIEW(); //打印预览
   this.LODOP.PRINT(); //直接打印
 }
@@ -666,11 +682,19 @@ export function sendClothPrinter(LODOP, data, lodopName) {
   }
 
   LODOP.ADD_PRINT_TEXT(270, 10, 150, 20, `付款方式：${payTypename}`);
-  LODOP.ADD_PRINT_TEXT(270, 160, 150, 20, `会员金额：${data.memberPrice?data.memberPrice:'--'}元`);
-  LODOP.ADD_PRINT_TEXT(300, 10, 150, 20, `本次扣款：${data.thisPrice?data.thisPrice:'--'}元`);
-  LODOP.ADD_PRINT_TEXT(300, 160, 150, 20, `会员余额：${data.totalPrice?data.totalPrice-data.thisPrice:'--'}元`);
-
-  LODOP.ADD_PRINT_TEXT(330, 10, 150, 20, `客户：${data.contactName}`);
+  LODOP.ADD_PRINT_TEXT(270, 160, 150, 20, `会员金额：${data.memberPrice?data.memberPrice+data.payAmount:0}元`);
+  LODOP.ADD_PRINT_TEXT(300, 10, 150, 20, `本次扣款：${data.payAmount?data.payAmount : 0}元`);
+  LODOP.ADD_PRINT_TEXT(300, 160, 150, 20, `会员余额：${data.memberPrice?data.memberPrice:0}元`);
+  let contactName = ''
+  let n = 0
+  for(let i = 0; i < (data.contactName).length; i++) {
+    n++
+    if (i < 9) {
+      contactName += (data.contactName)[i]
+    }
+  }
+  if (n >= 9) contactName += '...'
+  LODOP.ADD_PRINT_TEXT(330, 10, 150, 20, `客户：${contactName}`);
   LODOP.ADD_PRINT_TEXT(330, 160, 180, 20, `客户电话：${data.contactPhone}`);
   LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, `客户地址：${data.province || ''}${data.city || ''}${data.area || ''}${data.address || ''}${data.addressDetail || ''}`);
 
@@ -772,6 +796,7 @@ export function barCodePrinter(LODOP, data, lodopName){
   LODOP.SET_PRINT_PAGESIZE(3, 1016, 45, '');
   //这里3表示纵向打印且纸高“按内容的高度”；800表示纸宽80mm；45表示页底空白4.5mm
   console.log(data)
+  let _flawsHeight = 0
   const top = 20;
   for(var i = 0; i < data.orderClothItemVOS.length; i++) {
     let item = data.orderClothItemVOS[i];
@@ -783,38 +808,54 @@ export function barCodePrinter(LODOP, data, lodopName){
     let _flaws = ''
     let n = 0
     item.orderClothFlaws.forEach(item_n=>{
-      if (n < 5) {
+      if (n < 10) {
         _flaws += item_n.clothFlawName+';'
       } 
       n++
     })
-    if (n >= 5) {
+    if (n >= 10) {
       _flaws += '...'
     }
     let junInfo = ''
-    if (item.orderClothAdjunct) {
+    if (item.orderClothAdjuncts) {
       item.orderClothAdjuncts.forEach(item_n=>{
-        junInfo += `${item_n.adjunctName}*${item_n.num}`+';'
+        junInfo += `${item_n.adjunctName}`+';'
       })
     }
-    
 
+    let Craft = ''
+    if (item.orderClothCrafts) {
+      item.orderClothCrafts.forEach(item_n => {
+        Craft += ('|' + item_n.clothCraftName)
+      })
+    }
+
+    let h = i * 110 + _flawsHeight
+    
+    console.log(_flawsHeight)
     //  绘制条码
-    LODOP.ADD_PRINT_BARCODE(top + i * 110, 10, 260, 40, '128B', item.washCode);
+    LODOP.ADD_PRINT_BARCODE(top + h, 10, 180, 40, '128A', item.washCode);
     LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-    LODOP.ADD_PRINT_TEXT(top + 50 + i * 110, 10, 260, 20, `${_name}`);
-
-    LODOP.ADD_PRINT_TEXT(top + i * 110 - 10, 280, 700, 20, _flaws);
-    LODOP.ADD_PRINT_TEXT(top + 10 + i * 110, 280, 700, 20, `1件 ${item.createTime}（￥${item.payPrice}） `);
-
-    LODOP.ADD_PRINT_TEXT(top + 30 + i * 110, 280, 400, 15, `附件：${junInfo}`);
-    LODOP.ADD_PRINT_TEXT(top + 30 + i * 110, 650, 100, 15, `${data.id}-${i+1}`);
-    LODOP.ADD_PRINT_TEXT(top + 50 + i * 110, 280, 400, 15, `备注：${item.remark}  | ${item.clothSpeedName}`);
-    LODOP.ADD_PRINT_TEXT(top + 50 + i * 110, 650, 100, 20, data.sysOrg.name);
+    LODOP.ADD_PRINT_TEXT(top + 50 + h, 10, 180, 20, `${_name}`);
+
+    // 
+    LODOP.ADD_PRINT_TEXT(top + h - 10, 200, 700, 20, item.createTime);
+    LODOP.ADD_PRINT_TEXT(top + 10 + h, 200, 700, 20, `1件（￥${item.payPrice}） `);
+
+    // 
+    LODOP.ADD_PRINT_TEXT(top + 30 + h, 200, 100, 15, `${data.id}-${i+1}`);
+    LODOP.ADD_PRINT_TEXT(top + 30 + h, 250, 100, 20, data.sysOrg.name);
+    LODOP.ADD_PRINT_TEXT(top + 50 + h, 200, 400, 15, `备注：${item.clothSpeedName}${Craft}`);
+    LODOP.ADD_PRINT_TEXT(top + 70 + h, 200, 400, 15, `附件：${junInfo}`);
+    LODOP.ADD_PRINT_TEXT(top + 90 + h, 10, 460, 20, _flaws);
+    _flawsHeight = addDynamicText(100, `${_flaws || ''}`)
+    
   }
 
-
+  console.log("AAA123")
   if (this.LODOP.SET_PRINTER_INDEXA(lodopName))
+    console.log("AAA123")
+
   // this.LODOP.PREVIEW(); //打印预览
   this.LODOP.PRINT(); //直接打印
 }

admin-ui/src/views/order/cloth/orderList.vue

@@ -555,9 +555,11 @@ export default {
             // console.log(this.pointerList, p_name)
 
             if (type == 0) {
+                console.log("AAAA1")
                 this.collectClothPrinter(this.LODOP, this.pointerInfo, p_name)
                 // this.laundryPrinter(this.LODOP, this.pointerInfo, p_name)
             } else {
+                console.log("AAAA2")
                 this.barCodePrinter(this.LODOP, this.pointerInfo, p_name)
             }
 

admin-ui/src/views/order/cloth/sendCloth.vue

@@ -327,6 +327,7 @@ import { listOrderClothItem } from '../../../api/order/clothItem'
 import { getDeliveryManListByOrg } from '../../../api/app/delivery'
 import { getLodop } from '@/utils/lodopUtils'
 import payStatusPopup from '@/components/payStatusPopup'
+import { findUserByPhoneNumber } from '@/api/app/user'
 
 export default {
     name: 'ClothItem',
@@ -649,8 +650,12 @@ export default {
                             p_name = pointer.printName
                         }
                     })
-                    console.log(res.data)
-                    this.sendClothPrinter(this.LODOP, res.data, p_name)
+                    findUserByPhoneNumber({ phoneNumber: res.data.contactPhone }).then(userInfo => {
+                        console.log(res.data)
+                        res.data.memberPrice = userInfo.data.rechargeBalance + userInfo.data.giveBalance + userInfo.data.welfareBalance
+                        this.sendClothPrinter(this.LODOP, res.data, p_name)
+                    })
+                   
                 })
             })
         },