打印

admin-ui/src/components/payStatusPopup/index.vue

@@ -317,7 +317,7 @@ export default {
           this.barCodePrinter(this.LODOP, this.pointerInfo, p_name)
         }
 
-        // this.show = false
+        // this.show = false CL1108946378974957568
       })
 
      

admin-ui/src/layout/components/AppMain.vue

@@ -33,7 +33,7 @@ export default {
   width: 100%;
   position: relative;
   overflow: visible;
-  z-index: 1;
+  // z-index: 1;
 }
 
 .fixed-header + .app-main {

admin-ui/src/utils/index.js

@@ -566,10 +566,10 @@ export function sendClothPrinter(LODOP, data, lodopName) {
 
   LODOP.ADD_PRINT_TEXT(330, 10, 150, 20, `客户：${data.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}`);
+  LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, `客户地址：${data.province || ''}${data.city || ''}${data.area || ''}${data.address || ''}${data.addressDetail || ''}`);
 
   LODOP.ADD_PRINT_LINE(385, 10, 385, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(395, 10, 300, 20, `本店地址：${data.sysOrg.address+data.sysOrg.addressDetail}`);
+  LODOP.ADD_PRINT_TEXT(395, 10, 300, 20, `本店地址：${data.sysOrg.address}${data.sysOrg.addressDetail}`);
   LODOP.ADD_PRINT_TEXT(425, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone}`);
 
   LODOP.ADD_PRINT_TEXT(455, 10, 180, 20, `营业时间：${data.sysOrg.time?data.sysOrg.time:''}`);
@@ -636,10 +636,10 @@ export function laundryPrinter(LODOP, data, lodopName) {
 
   LODOP.ADD_PRINT_TEXT(330, 10, 150, 20, `客户：${data.contactName?data.contactName:''}`);
   LODOP.ADD_PRINT_TEXT(330, 160, 180, 20, `客户电话：${data.contactPhone?data.contactPhone:''}`);
-  LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, `客户地址：${data.province?data.province+data.city+data.area+data.address+data.addressDetail:''}`);
+  LODOP.ADD_PRINT_TEXT(360, 10, 300, 20, `客户地址：${data.province || ''}${data.city || ''}${data.area || ''}${data.address || ''}${data.addressDetail || ''}`);
 
   LODOP.ADD_PRINT_LINE(385, 10, 385, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(395, 10, 300, 20, `本店地址：${data.sysOrg.address?data.sysOrg.address+data.sysOrg.addressDetail:''}`);
+  LODOP.ADD_PRINT_TEXT(395, 10, 300, 20, `本店地址：${data.sysOrg.address || ''}${data.sysOrg.addressDetail || ''}`);
   LODOP.ADD_PRINT_TEXT(425, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone?data.sysOrg.contactPhone:''}`);
 
   LODOP.ADD_PRINT_TEXT(455, 10, 180, 20, `营业时间：${data.sysOrg.time?data.sysOrg.time:''}`);
@@ -720,7 +720,7 @@ export function labelPrinter(LODOP, data, lodopName) {
   })
   let _flaws = ''
   data.orderClothFlaws.forEach(item_n=>{
-    _flaws += item_n.clothFlawTypeName+';'
+    _flaws += item_n.clothFlawName+';'
   })
 
   LODOP.ADD_PRINT_TEXT(35, 5, 150, 20, `${data.clothItemName}${_name?'-'+_name:''}${_flaws?'-'+_flaws:''}`);
@@ -783,9 +783,14 @@ export function goodsPrinter(LODOP, data, lodopName) {
   const top = 280;
   for(var i = 0; i < data.orderGoodsSkuList.length; i++) {
     let item = data.orderGoodsSkuList[i];
+    let skuName = ''
+    if (item.skuName) {
+      let skuNames = JSON.parse(item.skuName)
+      skuName = skuNames.join('/')
+    }
     LODOP.ADD_PRINT_TEXT(top + i * 30, 20, 50, 20, i+1);
     LODOP.ADD_PRINT_TEXT(top + i * 30, 45, 110, 20, item.goodsName);
-    LODOP.ADD_PRINT_TEXT(top + i * 30, 165, 150, 20, `${item.salePrice}元*${item.buyNum}  ${item.skuName || ''}`);
+    LODOP.ADD_PRINT_TEXT(top + i * 30, 165, 150, 20, `${item.salePrice}元*${item.buyNum}  ${skuName}`);
   }
 
   const height = top + (data.orderGoodsSkuList.length+1)*25;
@@ -801,6 +806,7 @@ export function goodsPrinter(LODOP, data, lodopName) {
 
   //金额
   let payTypename = '';
+  let thisPrice = ''
   if(data.payType == '0'){
     payTypename = '微信 '
   }else if(data.payType == '1'){
@@ -809,6 +815,7 @@ export function goodsPrinter(LODOP, data, lodopName) {
     payTypename = '现金 '
   }else if(data.payType == '3'){
     payTypename = '余额 '
+    thisPrice = data.payAmount
   }
 
   LODOP.ADD_PRINT_TEXT(height + 45, 10, 150, 20, `总金额：${data.totalPrice}元`);
@@ -818,8 +825,8 @@ export function goodsPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_LINE(height + 85, 10, height + 85, 295, 1, 1);
 
   LODOP.ADD_PRINT_TEXT(height + 95, 10, 300, 20, `会员金额：${data.memberPrice?data.memberPrice+'元':''}`);
-  LODOP.ADD_PRINT_TEXT(height + 115, 10, 300, 20, `本次扣款：${data.thisPrice?data.thisPrice+'元':''}`);
-  LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, `会员余额：${data.totalPrice?data.totalPrice-data.thisPrice?data.thisPrice:0:''}元`);
+  LODOP.ADD_PRINT_TEXT(height + 115, 10, 300, 20, `本次扣款：${thisPrice?thisPrice+'元':''}`);
+  // LODOP.ADD_PRINT_TEXT(height + 135, 10, 300, 20, `会员余额：${data.totalPrice?data.totalPrice-thisPrice?thisPrice:0:''}元`);
 
   LODOP.ADD_PRINT_LINE(height + 155, 10, height + 155, 295, 1, 1);
 

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

@@ -250,8 +250,7 @@
                 <el-button @click="cancel" style="margin-left: 5%">关 闭</el-button>
             </div>
         </el-dialog>
-
-        <el-dialog title="打印操作" :visible.sync="pointerType" width="30%" :before-close="handlePointerClose" class="pointer_content">
+        <el-dialog title="打印操作" :visible.sync="pointerType" width="30%" :before-close="handlePointerClose" class="pointer_content" append-to-body>
             <div class="pointer_view">
                 <div class="pointer_icon">
                     <i class="el-icon-printer"></i>

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

@@ -690,6 +690,7 @@ export default {
                     p_name = pointer.printName
                 }
             })
+            console.log("AAAA", row)
             this.labelPrinter(this.LODOP, row, p_name)
         }
     }

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

@@ -543,6 +543,7 @@ export default {
                                 p_name = pointer.printName
                             }
                         })
+                        orderInfo.data.sendToUserTime = orderInfo.data.updateTime
                         this.sendClothPrinter(this.LODOP, orderInfo.data, p_name)
                     } catch (e) {
                         // 用户取消打印
@@ -630,6 +631,7 @@ export default {
                             p_name = pointer.printName
                         }
                     })
+                    console.log(res.data)
                     this.sendClothPrinter(this.LODOP, res.data, p_name)
                 })
             })