From a587937ce53f79b4680e930b5d5f7fee33de5311 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 14:50:40 +0800
Subject: [PATCH] 标签
---
sub_pages/partner/delivery/delivery-detail.vue | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index e04d172..23e7fe5 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -9,6 +9,7 @@
orderNo: '',
stationName: '',
arriveRemarks: '',
+ arriveImages: [],
},
id: '',
form: {
@@ -100,9 +101,19 @@
this.$message.hideLoading()
if (data) {
+ var t = data || {}
+ if (!t.arriveImages) {
+ t.arriveImages = []
+ } else {
+ try {
+ t.arriveImages = JSON.parse(t.arriveImages) || []
+ } catch (e) {
+ console.log('parse arriveImages', e)
+ }
+ }
this.dto = {
...this.dto,
- ...data
+ ...t
}
}
},
@@ -140,7 +151,15 @@
}
}
})
+ },
+ printDeliveryOrder(item) {
+ // this.$message.showToast('敬请期待')
+ this.$storage.setItem('cache_delivery_order_print', JSON.stringify(item))
+ uni.navigateTo({
+ url: '/sub_pages/supplier/print/print-list'
+ })
}
+
}
}
</script>
@@ -149,12 +168,20 @@
<view v-if="dto.id">
<view class="delivery-info flex">
<view class="flex1 desc">
- <view>供货商名称:{{ dto.stationName }}</view>
- <view>订单号:{{ dto.orderNo }}</view>
- <view>供货商备注:{{ dto.arriveRemarks }}</view>
+ <view>供货商名称:{{ dto.stationName ||''}}</view>
+ <view>订单号:{{ dto.orderNo ||''}}</view>
+ <view>供货商备注:{{ dto.arriveRemarks ||''}}</view>
+ <view>入位时间:{{ dto.arriveTime ||'-'}}</view>
</view>
<view class="m-l-15 m-r-0 station">
<view>{{ dto.stationName }}</view>
+ </view>
+
+ </view>
+ <view class="m-t-12 flex" v-if="dto.arriveImages&&dto.arriveImages.length>0">
+ <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.arriveImages" :key="index">
+ <image class="arrive-img" :src="timg" @click.stop="previewImg(timg)">
+ </image>
</view>
</view>
<view v-for="(item,index) of dto.items" :key="index" class="delivery-order-item m-t-12">
@@ -165,7 +192,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">
@@ -182,20 +209,26 @@
<view class="value">{{ item.num || 0 }}</view>
</view>
- <view class="each-item">
+ <!-- <view class="each-item">
<view class="label">价格</view>
<view class="value">{{ item.price || '-' }}</view>
- </view>
+ </view> -->
</view>
+ </view>
+ </view>
+ <view class="line-gray" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status">
+
+ </view>
+ <view class="buttons" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status">
+ <view class="button text-center" v-for="button of check_status" :key="button.value"
+ @click.stop="clickCheck(item,button.value)">{{ button.label }}
</view>
</view>
<view class="line-gray">
</view>
- <view class="buttons">
- <view class="button text-center" v-for="button of check_status" :key="button.value"
- @click.stop="clickCheck(item,button.value)">{{ button.label }}
- </view>
+ <view class="buttons m-r-0 m-l-a w-fit">
+ <view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
</view>
@@ -250,6 +283,13 @@
<style lang="scss" scoped>
.delivery-detail-page {
+ .arrive-img {
+ width: 96rpx;
+ height: 96rpx;
+ border-radius: 4rpx;
+ border: 2rpx dashed #CECECE;
+ }
+
.delivery-order-item {
.title {
font-weight: 600;
@@ -280,6 +320,12 @@
color: #666666;
line-height: 34rpx;
}
+
+ .button-0 {
+ color: #fff;
+ border: 2rpx solid #20613D;
+ background: #20613D;
+ }
}
.flower-img {
--
Gitblit v1.9.3