From 4f9eb354382eda4fe5e47c12e58a40896df552d9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 05 七月 2024 17:08:34 +0800
Subject: [PATCH] fix:沧化修改测试bug
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index de42249..32f4a5a 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -7,13 +7,13 @@
fontSize='36'></u-notice-bar>
<view class="top-information">
<view class="cutomer-name"
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.toFiledName || '' }}</view>
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
@@ -63,7 +63,7 @@
<view class="concrete"
style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
- <view class="num" v-if="weightObj.clean">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
+ <view class="num" v-if="(weightObj.clean || weight.clean === 0)">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
</view>
</view>
</view>
@@ -81,7 +81,8 @@
<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">浠舵暟</uni-th>
</uni-tr>
<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
<uni-td align="center">
@@ -93,13 +94,15 @@
<view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
</uni-td>
<uni-td align='right'>
- <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ <view class="name" v-if="(subItem.clean || subItem.clean === 0)">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
</uni-td>
聽 <uni-td align="right">
<view>{{ subItem.discount }}</view
></uni-td>
-
+ <uni-td align="right">
+ <view>{{ subItem.productQuantity }}</view
+ ></uni-td>
</uni-tr>
</uni-table>
</view>
@@ -371,14 +374,14 @@
placement="row"
@change="radioChange"
>
- <u-radio label="鐓ゅ満" :name="'鐓ゅ満'" :labelSize="30" :size="30"></u-radio>
- <u-radio label="鍗曚綅" :name="'鍗曚綅'":labelSize="30" :size="30"></u-radio>
+ <u-radio label="鍦哄湴" :name="'鍦哄湴'" :labelSize="30" :size="30"></u-radio>
+ <u-radio v-for="(item,index) in wareList" :label="'浠撳簱'+(index+1)" :name="index":labelSize="30" :size="30" ></u-radio>
</u-radio-group>
<div class="guidebox">
<u-swiper
v-if="guideLineshow"
- :height="200"
+ :height="400"
@click="swiperClick"
:list="swiperList"
keyName="image"
@@ -459,7 +462,7 @@
return {
swiperList:[],
orderPlanId: null,
- radioValue:'鐓ゅ満',
+ radioValue:'鍦哄湴',
tmTaskCoalList:[],
currentNum:0,
guideLineshow:false,
@@ -470,6 +473,7 @@
affiliationId:'',
type:2,
},
+ wareList:[],
coalDetailsData: {
tmTaskCoalList:[]
}, // 鎻愮叅鍗曡鎯�
@@ -720,6 +724,7 @@
this.orderType = this.coalDetailsData.orderType;
//
this.isSpecial = res.data.isSpecial
+ this.wareList=res.data.bunkerIds.split(",")
// // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
// this.completeOutSale.orderType = this.coalDetailsData.orderType;
// this.completeOutSale.deptId = this.coalDetailsData.deptId;
@@ -1237,7 +1242,7 @@
this.guideLineshow = true;
this.swiperList = [];
this.activeText = '';
- this.activeObj.affiliationId = this.coalDetailsData.filedId; //榛樿鏌ョ叅鍦�
+ this.activeObj.affiliationId = this.coalDetailsData.filedId;
this.getguideFun();
},
@@ -1245,12 +1250,12 @@
this.guideLineshow = false;
},
radioChange(item){
- console.log(item);
- if(item == '鐓ゅ満'){
+ console.log(111,item,this.coalDetailsData,this.wareList);
+ if(item == '鍦哄湴'){
this.activeObj.affiliationId = this.coalDetailsData.filedId;
this.activeObj.type = 2
}else{
- this.activeObj.affiliationId = this.coalDetailsData.deptId;
+ this.activeObj.affiliationId = this.wareList.length>0?this.wareList[item]:this.coalDetailsData.deptId;
this.activeObj.type = 1
}
this.getguideFun();
--
Gitblit v1.9.1