From 8b53f063a074d91e7093d35168bf0dc349c83ba9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 11 七月 2024 14:14:39 +0800
Subject: [PATCH] feat::发运单详情去除折叠
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 8fa831c..90ace43 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -101,11 +101,11 @@
<uni-th width='140'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='120'>浜у搧</uni-th>
- <uni-th align="center">浠撳簱</uni-th>
- <uni-th align="center">鐨噸</uni-th>
- <uni-th align="center">姣涢噸</uni-th>
- <uni-th align="center">鍑�閲�</uni-th>
- <uni-th align="center">鏁伴噺</uni-th>
+ <uni-th align="center" width='220'>浠撳簱</uni-th>
+ <uni-th align="center" width='120'>鐨噸</uni-th>
+ <uni-th align="center" width='120'>姣涢噸</uni-th>
+ <uni-th align="center" width='120'>鍑�閲�</uni-th>
+ <uni-th align="center" width='120'>鏁伴噺</uni-th>
<!-- <uni-th align="center">浠撳簱</uni-th> -->
<!-- <uni-th align="center">鐘舵��</uni-th> -->
@@ -115,21 +115,21 @@
<view class="btnBox">
<!-- -->
<u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(item,subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(subItem)" @click="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
<uni-td>
- <view class="name">{{ subItem.bunkerName }}</view>
+ <view>{{ subItem.bunkerName }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.skin }}</view>
+ <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.hair }}</view>
+ <view class="name" v-if="subItem.hair"> {{ Number(subItem.hair).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.clean }}</view>
+ <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number(subItem.clean).toFixed(2) || ''}}</view>
</uni-td>
<uni-td>
<view class="name">{{ subItem.productQuantity }}</view>
@@ -238,6 +238,25 @@
default: {}
}
},
+ computed:{
+ isBtnShow(){
+ return function(item){
+ console.log(item,'itemssss')
+ if(!item){
+ return false
+ }else{
+ if(this.errorStatusList.includes(item.status)){
+ return false
+ }else{
+ return true;
+ }
+ }
+
+ }
+
+ }
+
+ },
watch: {
loadUnloadData: {
handler(v) {
@@ -292,6 +311,7 @@
],
isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+ errorStatusList:[0,1,6,24,27,26] // 涓嶈兘鐐瑰嚮纭瑁呭嵏鐨勭姸鎬�
};
},
@@ -389,10 +409,6 @@
close(){
},
-
-
-
-
open(){},
enterOk(parintItem,item){
console.log(parintItem,'priintItem')
@@ -463,11 +479,10 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- if(this.activeObj.productName ==='EDC'){
- if( this.activeObj.checkStatus !== 7){
- this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
- return
- }
+ console.log(this.activeObj,'12313')
+ if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
+ this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ return
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
@@ -564,7 +579,7 @@
.self-deliver {
position: relative;
top: vww(10);
- width: 95%;
+ width: 98%;
height: vww(40);
margin: vww(8) 10rpx;
padding: 0 vww(8);
--
Gitblit v1.9.1