From 1e97cc472f8b156c464ecfd1c91c1e62f53151f0 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 11 八月 2024 18:18:30 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
sub_pages/supplier/print/print-list.vue | 136 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 36 deletions(-)
diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index d83a3a1..9bf47d5 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -14,7 +14,11 @@
</image>
<view class="flex1">
<view class=" flex">
- <view class="title">{{item.flowerName }}
+ <view class="title">
+ <span class="level"
+ v-if="item.flowerCategory">{{ item.flowerCategory || ''}}</span><span
+ class="level">{{ item.flowerLevelStr || ''}}</span>
+ {{item.flowerName }}
</view>
</view>
<view class="each-list ">
@@ -141,12 +145,19 @@
var t = this.$storage.getItem('cache_delivery_order_print') || ''
if (t) {
this.item = JSON.parse(t)
+ var apitype = ''
+ // #ifdef PUB_SUPPLIER
+ apitype = '/supplier'
+ // #endif
+ // #ifdef PUB_PARTNER
+ // apitype = '/supplier'
+ // #endif
//获取详情接口
this.$message.showLoading()
const {
code,
data
- } = await this.$http.request('get', '/api/supplier/delivery/list/items/view', {
+ } = await this.$http.request('get', `/api${apitype}/delivery/list/items/view`, {
params: {
id: this.item.id
}
@@ -511,47 +522,84 @@
// command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
// 仓库:
// if (that.item.warehouseName)
- command.setText(20, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
- // 库位:
- // if (that.item.warehouseLocationCode)
- command.setText(200, 40, "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, 80, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
- // 商品名称:
- command.setText(20, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerName || '-'))
- // 颜色:
- command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || '-'))
- // command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ￥ " + (that.item.price || '-'))
- command.setText(20, 160, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
- command.setText(200, 160, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
- // command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
- command.setText(100, 200, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
+ var paramsmap = {}
if (that.item.params) {
- var addnum = 0
- var hlen = 200
for (var p of that.item.params) {
if (p.name !== '枝长' && p.name !== '成熟度') {
continue
}
- if (p.value) {
- var lef = 20
- if (addnum % 2 == 1) {
- lef = 190
- } else {
- lef = 20
- hlen += 40
- }
- command.setText(lef, hlen, "TSS24.BF2", 1, 1, "" + (p.name || '') + ':' + p.value)
- addnum += 1
- }
+ paramsmap[p.name] = p.value || ''
}
}
+ command.setText(30, 40, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
+ command.setText(200, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
+ var flowerCategory = that.item.flowerCategory
+ if (flowerCategory) {
+ //只取二级分类
+ var tarr = flowerCategory.split("/")
+ if (tarr.length >= 2) {
+ flowerCategory = tarr[tarr.length - 1]
+ }
+ }
+ command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (flowerCategory || ''))
+ command.setText(200, 80, "TSS24.BF2", 1, 1, "库位:" + (that.item.warehouseLocationCode || ''))
+
+ command.setText(30, 120, "TSS24.BF2", 1, 1, "等级:" + (that.item.flowerLevelStr || ''))
+ command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || ''))
+ // 规格:
+ command.setText(30, 160, "TSS24.BF2", 1, 1, "" + (that.item.flowerUnit || '-'))
+ // 成熟度:
+ command.setText(200, 160, "TSS24.BF2", 1, 1, "" + (paramsmap['成熟度'] || '-'))
+ // 枝长:
+ command.setText(30, 200, "TSS24.BF2", 1, 1, "" + (paramsmap['枝长'] || '-'))
+ command.setText(200, 200, "TSS24.BF2", 1, 1, that.$util.toDate(new Date()))
+
+ command.setText(60, 230, "TSS24.BF2", 1, 1, "————————————")
+
+ command.setText(30, 260, "TSS24.BF2", 1, 1, "花满芫")
+ command.setText(200, 260, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
+
+ // command.setText(20, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
+ // // 库位:
+ // // if (that.item.warehouseLocationCode)
+ // command.setText(200, 40, "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, 80, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
+ // // 商品名称:
+ // command.setText(20, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerName || '-'))
+ // // 颜色:
+ // command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || '-'))
+ // // command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ￥ " + (that.item.price || '-'))
+ // command.setText(20, 160, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
+ // command.setText(200, 160, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
+ // // command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
+ // command.setText(100, 200, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
+ // if (that.item.params) {
+ // var addnum = 0
+ // var hlen = 200
+ // for (var p of that.item.params) {
+ // if (p.name !== '枝长' && p.name !== '成熟度') {
+ // continue
+ // }
+ // if (p.value) {
+ // var lef = 20
+ // if (addnum % 2 == 1) {
+ // lef = 190
+ // } else {
+ // lef = 20
+ // hlen += 40
+ // }
+ // command.setText(lef, hlen, "TSS24.BF2", 1, 1, "" + (p.name || '') + ':' + p.value)
+ // addnum += 1
+ // }
+ // }
+ // }
// <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>
@@ -772,6 +820,14 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-right: 20rpx;
+ }
}
.status {
@@ -801,6 +857,14 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-right: 20rpx;
+ }
}
.desc {}
--
Gitblit v1.9.3