xuxueyang
2024-08-04 2027920b52077d9a6e580a04055dff10e291d4ee
update 打印机
已修改2个文件
128 ■■■■■ 文件已修改
sub_pages/customer/trade/detail.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/print/print-list.vue 117 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/detail.vue
@@ -201,7 +201,7 @@
            var url =
                `/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                //
                title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
                    "花满芫",
                path: url,
@@ -212,14 +212,15 @@
            var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
                currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
            //如果是合伙人的id,那么分享出去,需要附加id了
            var partnerUserId = ''
            if (that.currentInfo.customerDTO && that.currentInfo.customerDTO.partnerId) {
                partnerUserId = that.currentInfo.customerDTO.partnerId
            var partnerUserId = ''
            if (that.currentInfo.customerDTO && that.currentInfo.customerDTO.partnerId) {
                partnerUserId = that.currentInfo.customerDTO.partnerId
            }
            var url =
                `/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
            return {
                //
                title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
                    "花满芫",
                path: url,
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 ">
@@ -511,47 +515,76 @@
                    // 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 || '待分配'))
                    command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (that.item.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(100, 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 +805,13 @@
                    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 +841,13 @@
                        font-size: 28rpx;
                        color: #000000;
                        line-height: 40rpx;
                        .level {
                            font-weight: 400;
                            font-size: 28rpx;
                            color: #20613D;
                            line-height: 40rpx;
                            margin-right: 20rpx;
                        }
                    }
                    .desc {}