From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题
---
pages/order/order-delivery-detail.vue | 108 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 39 deletions(-)
diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index ab2e6d1..5081e07 100644
--- a/pages/order/order-delivery-detail.vue
+++ b/pages/order/order-delivery-detail.vue
@@ -19,7 +19,13 @@
this.status = options.status || ''
this.query.id = this.id
}
+ // // #ifdef PUB_PARTNER
+ // this.listApi = '/api/partner/delivery/list/items'
+ // // #endif
+ // // #ifdef PUB_CUSTOMER
+ // // #endif
this.listApi = '/api/supplier/delivery/list/items'
+
await this.getList()
},
@@ -61,6 +67,10 @@
},
async submit(status) {
+ if (!this.dto.arriveImageList || this.dto.arriveImageList.length <= 0) {
+ this.$message.showToast('未上传图片')
+ return
+ }
await this.$message.confirm('是否确认入位')
this.$message.showLoading()
const {
@@ -80,9 +90,9 @@
},
printDeliveryOrder(item) {
// this.$message.showToast('敬请期待')
- this.$storage.setItem('cache_delivery_order_print',JSON.stringify(item))
+ this.$storage.setItem('cache_delivery_order_print', JSON.stringify(item))
uni.navigateTo({
- url:'/sub_pages/supplier/print/print-list'
+ url: '/sub_pages/supplier/print/print-list'
})
}
@@ -94,8 +104,7 @@
<view class="list-container order-delivery supplier">
<view class="p15">
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
- <view v-for="(item,index) in list" :key="index"
- class="m-b-24 order-sale-list list-container">
+ <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
<view class="order-sale-item list-item">
<view class="title flex">
<view>订单单号:{{item.orderNo}}</view>
@@ -107,7 +116,9 @@
</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 ">
@@ -136,11 +147,11 @@
<view class="delivery-form">
<view class="form-item flex1">
<view class="label">仓库名称</view>
- <view class="value red">{{item.warehouseName}}</view>
+ <view class="value red">{{item.warehouseName||'待分配'}}</view>
</view>
<view class="form-item flex1">
<view class="label">库位名称</view>
- <view class="value red">{{item.warehouseLocationCode}}</view>
+ <view class="value red">{{item.warehouseLocationCode||'待分配'}}</view>
</view>
</view>
@@ -150,51 +161,52 @@
<view class="button button-1 m-r-0" @click="printDeliveryOrder(item)">打印</view>
</view>
<!-- #endif -->
-
+
</view>
</view>
- </view>
- <view v-if="status=='PENDING'">
- <!-- 提交图片 -->
- <view class="delivery-form p20 bg-white br-4">
- <view class="form-item flex before-line bottom-border-no">
- <view class="label " style="width: 400rpx;">图片</view>
- <view class="m-l-a m-r-0 flex">
- <view class="component-button-upload" @click="uploadIcon('arriveImageList')">
+ <view v-if="status=='PENDING'">
+ <!-- 提交图片 -->
+ <view class="delivery-form p20 bg-white br-4">
+ <view class="form-item flex before-line bottom-border-no">
+ <view class="label required" style="width: 400rpx;">图片</view>
+ <view class="m-l-a m-r-0 flex">
+ <view class="component-button-upload" @click="uploadIcon('arriveImageList')">
+
+ </view>
</view>
</view>
- </view>
- <view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
- v-if="dto.arriveImageList&&dto.arriveImageList.length>0">
- <view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.arriveImageList" :key="index">
- <image class="banner-img" :src="tBanner" @click.stop="previewImg(tBanner)">
+ <view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
+ v-if="dto.arriveImageList&&dto.arriveImageList.length>0">
+ <view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.arriveImageList" :key="index">
+ <image class="banner-img" :src="tBanner" @click.stop="previewImg(tBanner)">
- </image>
- <view class="t-red text-center" @click.stop="deleteBanner(index)">删除</view>
+ </image>
+ <view class="t-red text-center" @click.stop="deleteBanner(index)">删除</view>
+ </view>
</view>
- </view>
- <view class="form-item flex m-t-12 ">
- <view class="label m-r-20">备注</view>
- <view class="m-l-a m-r-0 flex1">
- <view class="m-t-12 m-b-12">
- <u-textarea v-model="dto.arriveRemarks" clearable placeholder="请输入备注">
+ <view class="form-item flex m-t-12 ">
+ <view class="label m-r-20">备注</view>
+ <view class="m-l-a m-r-0 flex1">
+ <view class="m-t-12 m-b-12">
+ <u-textarea v-model="dto.arriveRemarks" clearable placeholder="请输入备注">
- </u-textarea>
+ </u-textarea>
+ </view>
</view>
</view>
</view>
</view>
- </view>
- <view class="button-space">
+ <view class="button-space" style="min-height: 190rpx;">
- </view>
- <view class="button-green-1 button-fixed-bottom" v-if="status=='PENDING'" @click="submit('ARRIVED')">
- 确认入位
+ </view>
+ <view class="button-green-1 button-fixed-bottom" v-if="status=='PENDING'" @click="submit('ARRIVED')">
+ 确认入位
+ </view>
</view>
</view>
</template>
@@ -213,12 +225,14 @@
background-color: #fff;
margin-bottom: 20rpx;
padding: 22rpx;
- .each-item{
- .label{
+
+ .each-item {
+ .label {
min-width: 120rpx;
-
+
}
- .label:after{
+
+ .label:after {
content: ":";
margin-right: 10rpx;
}
@@ -259,6 +273,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 {
@@ -288,6 +310,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