1
xuxueyang
2024-08-01 71c87b8273fa08c2a7e48d159b05c4160c7e749a
1
已删除3个文件
已修改4个文件
3615 ■■■■■ 文件已修改
mixin/mixin.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
plugins/encoding-indexes.js 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
plugins/encoding.js 3312 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
plugins/tsc.js 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/trade/list.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/partner/delivery/delivery-detail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/print/print-list.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
mixin/mixin.js
@@ -134,6 +134,7 @@
                                    idsMap[item.id] = item
                                }
                            }
                            var hasnew = false
                            for (var item of data.records) {
                                if (ids.indexOf(item.id) < 0) {
                                    this.list.push(item)
@@ -143,8 +144,12 @@
                                        ...idsMap[item.id],
                                        ...item,//覆盖了
                                    }
                                    hasnew = true
                                }
                            }
                            if(hasnew){
                                this.$forceUpdate()
                            }
                        }
                        this.page.total = data.total || 0
plugins/encoding-indexes.js
文件已删除
plugins/encoding.js
文件已删除
plugins/tsc.js
文件已删除
sub_pages/customer/trade/list.vue
@@ -231,7 +231,6 @@
            // this.
        },
        onReachBottom() {
            this.page.current += 1
            this.getMore('post')
        },
        async onPullDownRefresh() {
sub_pages/partner/delivery/delivery-detail.vue
@@ -165,7 +165,7 @@
                    <view class="flex1">
                        <view class=" flex">
                            <view class="title">{{ item.flowerName }}<span
                                    class="level">{{ item.flowerLevelStr }}</span></view>
                                    class="level">{{ item.flowerLevelStr || ''}}</span></view>
                        </view>
                        <view class="each-list">
                            <view class="each-item">
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 {
@@ -455,7 +455,7 @@
                // command.setQR(40, 120, "L", 5, "A", "www.smarnet.cc佳博智汇")
                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, 60, "TSS24.BF2", 1, 1, "仓库: " + that.item.warehouseName)
                if (that.item.warehouseLocationCode)
                    command.setText(200, 60, "TSS24.BF2", 1, 1, "库位: " + that.item.warehouseLocationCode)
@@ -463,28 +463,28 @@
                // 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(10, 100, "TSS24.BF2", 1, 1, "供应商: " + (that.item.supplierName || '-'))
                command.setText(10, 140, "TSS24.BF2", 1, 1, "商品名称: " + (that.item.flowerName || '-'))
                command.setText(10, 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(10, 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(10, 260, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
                command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
                command.setText(170, 300, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
                if (that.item.params) {
                    var addnum = 0
                    var hlen = 300
                    for (var p of that.item.params) {
                        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
                        }
                    }