From 288d334f5afcb45da57d769c6699cf3b91d7a194 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期二, 25 六月 2024 16:21:53 +0800 Subject: [PATCH] feat:集装箱显示加判断 --- pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 65 +++++++++++++++++++++++++------- 1 files changed, 51 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 2083e40..69233de 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 @@ -15,7 +15,7 @@ <view class="" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view> <view class="" - v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view> + v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view> </view> </view> <view class="block-information"> @@ -35,7 +35,7 @@ <view class="send-date">{{ coalDetailsData.sendDate }}</view> </view> <view class="coal-code">绫诲瀷: {{ coalDetailsData.orderType || '' }}</view> - <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view> + <view class="coal-code">鏀跺彂鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view> <view class="coal-code">杞︾墝鍙�: {{ coalDetailsData.carNo || '' }}</view> <view class="order-code" v-if="!isSpecial"> @@ -51,19 +51,19 @@ <view class="concrete" style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;"> 鐨�</view> - <view class="num">{{ Number(weightObj.skin).toFixed(2) ||"" }}</view> + <view class="num" v-if="weightObj.skin">{{ Number(weightObj.skin).toFixed(2) ||"" }}</view> </view> <view class="item"> <view class="concrete" style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;"> 姣�</view> - <view class="num">{{ Number(weightObj.hair).toFixed(2) ||"" }}</view> + <view class="num" v-if="weightObj.hair">{{ Number(weightObj.hair).toFixed(2) ||"" }}</view> </view> <view class="item"> <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">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view> + <view class="num" v-if="weightObj.clean">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view> </view> </view> </view> @@ -81,26 +81,40 @@ <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">鎵e惃</uni-th> </uni-tr> <uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index"> <uni-td align="center"> <view class="name">{{ subItem.productName }}</view></uni-td> <uni-td align='right'> - <view >{{ Number( subItem.skin).toFixed(2) || ''}}</view> + <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view> </uni-td> <uni-td align='right'> - <view class="name">{{ Number(subItem.hair) .toFixed(2) || '' }}</view> + <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view> </uni-td> <uni-td align='right'> - <view class="name">{{ Number( subItem.clean).toFixed(2) || '' }}</view> + <view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view> </uni-td> -<!-- - 聽 <uni-td align="center"> - <view>{{ subItem.bunkerName }}</view></uni-td> --> + + 聽 <uni-td align="right"> + <view>{{ subItem.discount }}</view + ></uni-td> </uni-tr> </uni-table> + </view> + <!-- 璇疯緭鍏ラ泦瑁呯鍙� --> + <view class="codeBox" v-if="coalDetailsData.isContainerNum"> + <text>闆嗚绠卞彿:</text> + <view class="inp"> + <u--input + placeholder="璇疯緭鍏ラ泦瑁呯鍙�" + v-model="coalDetailsData.containerNumber" + ></u--input> + </view> + <view> + <u-button type="primary" text="纭畾" @click="enterClick"></u-button> + </view> </view> </view> <view class="origin-info" @@ -276,7 +290,7 @@ :loading="outLoading" loadingText="鎵撳嵃涓�,璇风◢鍊�"></u-button> </view> --> - <view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�" + <view class="weigh-button"><u-button text="灞曠ず鏀跺彂鍗�" @click="showCaolPickUpBill" type="primary" shape="circle"></u-button></view> @@ -1150,13 +1164,36 @@ this.$refs.swiperAlbum.onPreviewTap(); this.$refs.swiperAlbum.openPage(); }) - + }, + enterClick(){ + console.log('click') + this.$reqPut('addContainer',{id:this.coalDetailsData.id,containerNumber:this.coalDetailsData.containerNumber},'json').then(res=>{ + console.log(res,'res') + this.$u.toast('鎿嶄綔鎴愬姛') + }) } } }; </script> <style lang="scss" scoped> +.codeBox{ + height: 100rpx; + display: flex; + width: 100%; + justify-content: space-around; + align-items: center; + .inp{ + border: solid 1px #ccc; + input{ + + text-indent: 15px; + } + + } + + +} .table{ width: 100%; /deep/ .uni-table{ -- Gitblit v1.9.1