From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/supplier/print/print-list.vue | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 2bebd11..7df8f6b 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -55,7 +55,7 @@
<view class="line" v-if="item.params"></view>
<view class="delivery-form" v-if="item.params">
<view class="form-item" v-for="(p,k) of item.params" :key="k">
- <view class="label">{{p.name||'-'}}:</view>
+ <view class="label">{{p.name||'-'}}</view>
<view class="value red">{{p.value}}</view>
</view>
</view>
@@ -77,7 +77,7 @@
</template>
<script>
- var tsc = require("@/plugins/tsc.js");
+ var tsc = require("@/sub_pages/supplier/plugins/tsc.js");
// var app = uni.getApp()
export default {
@@ -199,6 +199,12 @@
})
}
},
+ fail: function() {
+ wx.showModal({
+ title: '提示',
+ content: '蓝牙状态获取失败',
+ })
+ }
})
},
fail: function() {
@@ -221,13 +227,19 @@
} else if (platform == "android") {
// uni.getDeviceInfo().platform = "android"
console.log(uni.getDeviceInfo()) //这里是拿到安卓的系统版本名 如：Android 9
- console.log('输出系统版本号', uni.getDeviceInfo().system.substring(uni.getDeviceInfo().system.length - (
- uni.getDeviceInfo().system.length -
- 8), uni.getDeviceInfo().system.length - (uni.getDeviceInfo().system.length - 8) +
- 1)) //这里为了获取到系统的版本号，如 9
- var systemVersion = uni.getDeviceInfo().system.substring(uni.getDeviceInfo().system.length - (uni
- .getDeviceInfo().system.length -
- 8), uni.getDeviceInfo().system.length - (uni.getDeviceInfo().system.length - 8) + 1)
+ systemVersion = 10
+ try {
+ var s = '' + (uni.getDeviceInfo().system || '')
+ console.log('输出系统版本号', s.substring(s.length - (
+ s.length -
+ 8), s.length - (s.length - 8) +
+ 1)) //这里为了获取到系统的版本号，如 9
+ systemVersion = s.substring(s.length - (s.length -
+ 8), s.length - (s.length - 8) + 1)
+ } catch (e) {
+ that.$message.showToast('获取系统版本错误，版本号：' + s)
+ systemVersion = 10
+ }
if (systemVersion > 5) {
wx.getSetting({
success: function(res) {
@@ -237,14 +249,27 @@
scope: 'scope.userLocation',
complete: function(res) {
that.getBluetoothDevices()
- }
+ },
+ fail: function(res) {
+ that.$message.showToast('获取蓝牙系统位置信息错误')
+
+ },
})
} else {
that.getBluetoothDevices()
}
- }
+ },
+ fail: function(res) {
+ that.$message.showToast('获取系统设置错误' + (res || ''))
+
+ },
})
+ } else {
+ that.$message.showToast('获取系统版本过低，版本号：' + systemVersion)
+
}
+ } else {
+ that.$message.showToast('未知平台：' + (platform || '-'))
}
},
@@ -281,9 +306,17 @@
wx.hideLoading()
wx.stopPullDownRefresh()
},
+ fail(e) {
+ that.$message.showToast('获取蓝牙设备出错：' + (e || ''))
+
+ }
})
}, 3000) //到这里 都是三秒后执行的内容
},
+ fail(e) {
+ that.$message.showToast('扫描蓝牙报错：' + (e || ''))
+
+ }
})
},
@@ -448,43 +481,46 @@
var that = this;
var command = tsc.jpPrinter.createNew()
- command.setSize(48, 96)
+ command.setSize(48, 60)
command.setGap(0)
command.setCls()
// command.setText(0, 30, "TSS24.BF2", 1, 1, "图片")
// command.setQR(40, 120, "L", 5, "A", "www.smarnet.cc佳博智汇")
- command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
+ // command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
if (that.item.warehouseName)
- command.setText(20, 60, "TSS24.BF2", 1, 1, "仓库: " + that.item.warehouseName)
+ command.setText(10, 20, "TSS24.BF2", 1, 1, "仓库: " + that.item.warehouseName)
if (that.item.warehouseLocationCode)
- command.setText(200, 60, "TSS24.BF2", 1, 1, "库位: " + that.item.warehouseLocationCode)
+ command.setText(200, 20, "TSS24.BF2", 1, 1, "库位: " + that.item.warehouseLocationCode)
// command.setText(170, 50, "TSS24.BF2", 1, 1, "小程序测试")
// command.setText(170, 90, "TSS24.BF2", 1, 1, "测试数字12345678")
// command.setText(170, 120, "TSS24.BF2", 1, 1, "测试英文abcdefg")
// command.setText(170, 150, "TSS24.BF2", 1, 1, "测试符号/*-+!@#$")
- command.setText(20, 100, "TSS24.BF2", 1, 1, "供应商: " + (that.item.supplierName || '-'))
- command.setText(20, 140, "TSS24.BF2", 1, 1, "商品名称: " + (that.item.flowerName || '-'))
- command.setText(20, 180, "TSS24.BF2", 1, 1, "等级: " + (that.item.flowerLevelStr || '-'))
- command.setText(200, 180, "TSS24.BF2", 1, 1, "颜色: " + (that.item.flowerColor || '-'))
- command.setText(20, 220, "TSS24.BF2", 1, 1, "价格: ￥ " + (that.item.price || '-'))
- command.setText(200, 220, "TSS24.BF2", 1, 1, "数目: x " + (that.item.num || '0'))
- command.setText(20, 260, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
- command.setText(20, 300, "TSS24.BF2", 1, 1, "花满芫")
- command.setText(170, 300, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
+ command.setText(10, 60, "TSS24.BF2", 1, 1, "供应商: " + (that.item.supplierName || '-'))
+ command.setText(10, 100, "TSS24.BF2", 1, 1, "商品名称: " + (that.item.flowerName || '-'))
+ command.setText(10, 140, "TSS24.BF2", 1, 1, "等级: " + (that.item.flowerLevelStr || '-'))
+ command.setText(200, 140, "TSS24.BF2", 1, 1, "颜色: " + (that.item.flowerColor || '-'))
+ // command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ￥ " + (that.item.price || '-'))
+ command.setText(10, 180, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
+ command.setText(200, 180, "TSS24.BF2", 1, 1, "数目: x " + (that.item.num || '0'))
+ // command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
+ command.setText(100, 220, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
if (that.item.params) {
var addnum = 0
- var hlen = 300
+ var hlen = 220
for (var p of that.item.params) {
+ if (p.name !== '枝长' && p.name !== '成熟度') {
+ continue
+ }
if (p.value) {
- var lef = 20
+ var lef = 10
if (addnum % 2 == 1) {
- lef = 200
+ lef = 190
} else {
- lef = 20
+ lef = 10
hlen += 40
}
- command.setText(lef, hlen, "TSS24.BF2", 1, 1, "" + (p.name || '') + p.value)
+ command.setText(lef, hlen, "TSS24.BF2", 1, 1, "" + (p.name || '') + ':' + p.value)
addnum += 1
}
}
--
Gitblit v1.9.3