From b940b7f96e03accaba6299704e6a0b924b8bb365 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 20:32:12 +0800
Subject: [PATCH] update 花店注册流程变化（2步化为一步）
---
pages/order/order-delivery-detail.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index 55591f4..4afbf9d 100644
--- a/pages/order/order-delivery-detail.vue
+++ b/pages/order/order-delivery-detail.vue
@@ -61,6 +61,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 {
@@ -78,6 +82,13 @@
uni.navigateBack()
}
},
+ printDeliveryOrder(item) {
+ // this.$message.showToast('敬请期待')
+ this.$storage.setItem('cache_delivery_order_print', JSON.stringify(item))
+ uni.navigateTo({
+ url: '/sub_pages/supplier/print/print-list'
+ })
+ }
}
}
@@ -87,8 +98,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" @click="toDetail(item)"
- 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>
@@ -103,41 +113,49 @@
<view class="title">{{item.flowerName }}
</view>
</view>
- <view class="each-list flex">
- <view class="each-item">
+ <view class="each-list ">
+ <view class="each-item flex1 flex">
<view class="label">颜色</view>
<view class="value">{{ item.flowerColor || '-' }}</view>
</view>
- <view class="each-item">
+ <view class="each-item flex1 flex">
<view class="label">规格</view>
<view class="value">{{ item.flowerUnit || '-' }}</view>
</view>
</view>
</view>
<view class="each-list price">
- <view class="each-item">
+ <view class="each-item flex1">
<view class="value">￥{{ item.price || '-' }}</view>
</view>
- <view class="each-item">
+ <view class="each-item flex1">
<view class="value">x {{ item.num || 0 }}</view>
</view>
</view>
</view>
-
<view class="line"></view>
<view class="delivery-form">
- <view class="form-item">
+ <view class="form-item flex1">
<view class="label">仓库名称</view>
<view class="value red">{{item.warehouseName}}</view>
</view>
- <view class="form-item">
+ <view class="form-item flex1">
<view class="label">库位名称</view>
<view class="value red">{{item.warehouseLocationCode}}</view>
</view>
</view>
+ <!-- #ifdef PUB_SUPPLIER -->
+ <view class="line"></view>
+ <view class="buttons">
+ <view class="button button-1 m-r-0" @click="printDeliveryOrder(item)">打印</view>
+ </view>
+ <!-- #endif -->
+
+
+
</view>
</view>
@@ -146,7 +164,7 @@
<!-- 提交图片 -->
<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="label required" style="width: 400rpx;">图片</view>
<view class="m-l-a m-r-0 flex">
<view class="component-button-upload" @click="uploadIcon('arriveImageList')">
@@ -192,11 +210,24 @@
border-radius: 4rpx;
border: 2rpx dashed #CECECE;
}
+
.order-sale-list {
.order-sale-item {
background-color: #fff;
margin-bottom: 20rpx;
padding: 22rpx;
+
+ .each-item {
+ .label {
+ min-width: 120rpx;
+
+ }
+
+ .label:after {
+ content: ":";
+ margin-right: 10rpx;
+ }
+ }
.buttons {
display: flex;
@@ -270,12 +301,14 @@
color: #CF0000;
}
}
- .form{
- .form-item{
+
+ .form {
+ .form-item {
height: unset;
// min-height: ;
}
}
+
.delivery-form {
display: flex;
flex-wrap: wrap;
--
Gitblit v1.9.3