From 30cb0df99ada7cffda1bd5b97c52ea3e45c4cda7 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期一, 12 八月 2024 22:05:41 +0800
Subject: [PATCH] update
---
pages/order/order-delivery-detail.vue | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index 07e5372..c281216 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 {
@@ -79,11 +89,11 @@
}
},
printDeliveryOrder(item) {
- this.$message.showToast('敬请期待')
- // this.$storage.setItem('cache_delivery_order_print',JSON.stringify(item))
- // uni.navigateTo({
- // url:'/sub_pages/supplier/print/print-list'
- // })
+ // this.$message.showToast('敬请期待')
+ this.$storage.setItem('cache_delivery_order_print', JSON.stringify(item))
+ uni.navigateTo({
+ 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" @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>
@@ -107,26 +116,28 @@
</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 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>
@@ -134,23 +145,23 @@
</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 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 class="value red">{{item.warehouseLocationCode||'待分配'}}</view>
</view>
</view>
- <!-- #ifdef PUB_CUSTOMER -->
+ <!-- #ifdef PUB_SUPPLIER -->
<view class="line"></view>
<view class="buttons">
<view class="button button-1 m-r-0" @click="printDeliveryOrder(item)">打印</view>
</view>
<!-- #endif -->
-
+
@@ -161,7 +172,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')">
@@ -214,6 +225,18 @@
margin-bottom: 20rpx;
padding: 22rpx;
+ .each-item {
+ .label {
+ min-width: 120rpx;
+
+ }
+
+ .label:after {
+ content: ":";
+ margin-right: 10rpx;
+ }
+ }
+
.buttons {
display: flex;
margin-left: auto;
@@ -249,6 +272,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 {
@@ -278,6 +309,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