From 5a8575299f1cc6b4bf0601025d17273e92c2d8cf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 08 十一月 2023 17:23:42 +0800
Subject: [PATCH] 日计划增加磅单类型
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 17 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 66e8f9d..b4b60e5 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -58,7 +58,7 @@
<view class="label-text">
鎵ｆ福鍚庡噣閲�
</view>
- <view class="count">{{ item.weight }}</view>
+ <view class="count">{{ item.weight || item.clean}}</view>
</view>
</view>
<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
@@ -155,6 +155,67 @@
<view class="num-show"
v-else-if="flag">
{{item.weight1}}
+ </view>
+ </view>
+ <!-- 鏂板鎵ｇ綒绉嶇被銆� 鎵ｇ綒閲戦锛屼笉鍚堟牸鍒ゅ畾绉嶇被-->
+ <view class="notice-num">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="鎵ｇ綒绉嶇被"
+ size='32'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u-radio-group v-model="item.penaltyType">
+ <u-radio :name="0" :label="'鏃犳墸缃�'" :disabled="disabled">鏃犳墸缃�</u-radio>
+ <u-radio :name="'鍏朵粬鎵ｇ綒'" :label="'鍏朵粬鎵ｇ綒'" :disabled="disabled">鍏朵粬鎵ｇ綒</u-radio>
+ </u-radio-group>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.penaltyType}}
+ </view>
+ </view>
+ <!-- 鎵ｇ綒閲戦 -->
+ <view class="notice-num">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="鎵ｇ綒閲戦"
+ size='32'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <u--input placeholder="璇疯緭鍏ユ墸缃氶噾棰�"
+ border="bottom"
+ clearable
+ v-model="item.penaltyAmount"></u--input>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.penaltyAmount}}
+ </view>
+ </view>
+ <!--涓嶅悎鏍煎垽瀹氱绫� -->
+ <view class="notice-num">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
+ <u--text text="涓嶅悎鏍煎垽瀹氱绫�"
+ size='32'></u--text>
+ </view>
+ <view class="num-input"
+ v-if='roleType===4&&!flag'
+ >
+ <!-- <u--input placeholder="璇疯緭鍏ユ墸缃氶噾棰�"
+ border="bottom"
+ clearable
+ v-model="item.penaltyAmount"></u--input> -->
+ <u-select v-model="item.unqualifiedType" mode="mutil-column-auto" :list="list" @confirm="confirm"></u-select>
+ </view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.unqualifiedType}}
</view>
</view>
</view>
@@ -327,6 +388,7 @@
return {
orderPlanId: "",
title: '绱犺儦鍕惧嫆鍑洪潚鑺憋紝绗旈攱娴撹浆娣�',
+ isWeighingType:'',
subTitle: '2020-05-15',
thumb: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
coalDetailsData: {},
@@ -444,6 +506,7 @@
if(!this.coalDetailsData.tmTaskCoalItems.length){
this.current = 0;
}
+ this.isWeighingType = res.data.weighingType //褰撳墠纾呭崟鏄惁鍥炵
} else {
this.$u.toast('鍔犺浇澶辫触')
uni.hideLoading()
@@ -517,6 +580,20 @@
}
})
},
+ // 鏍￠獙鏁版嵁鏄惁鍚堟牸
+ checkValue(data,target){
+ if(!data.length){
+ return
+ }
+ let flag = data.find(item=>item[target] <=0);
+ console.log(flag,'flag');
+ if(flag){
+ return false
+ }else{
+ return true;
+ }
+
+ },
// 鐗╄祫鏄庣粏
goodsPopoverShow(index) {
if (this.roleType === 4 && !this.flag) {
@@ -559,13 +636,18 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
console.log('璁＄畻鍑�閲�',value, index, clean)
- value = Number(value)
- this.showWeigh[index].cinderWeight = Number(value)
- if (clean) {
- let x = new BigNumber(clean)
- let y = new BigNumber(value)
- this.showWeigh[index].weight = x.minus(y).toFixed(2)
- }
+ this.showWeigh[index].cinderWeight = (value - 0)
+ let x = new BigNumber(clean - 0)
+ let y = new BigNumber(value - 0)
+ let z = new BigNumber(this.showWeigh[index].unqualifiedWeight - 0)
+ console.log(clean,value,this.showWeigh[index].unqualifiedWeight - 0,'鎵ｆ福');
+ if(x.minus(y).minus(z).toFixed(2) <= 0){
+ this.showWeigh[index].weight = '0';
+ this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
+ }else{
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2)
+ }
+
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
@@ -586,15 +668,18 @@
},
// 涓嶅悎鏍奸噸閲忚緭鍏�
unqualifiedWeightInputHandle(value, index, clean) {
- console.log(value, typeof value ,'value')
- if(!value){
- value = 0;
- }
- let x = new BigNumber(clean)
- let y = new BigNumber(value)
- let z = new BigNumber(this.showWeigh[index].cinderWeight)
- console.log(value, index, clean,'涓嶅悎鏍奸噸閲忚緭鍏�')
- this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
+ // 鍒ゆ柇鏄笉鏄湁鍑�閲嶆墠杩涜璁＄畻
+ let x = new BigNumber(clean - 0)
+ let y = new BigNumber(value - 0)
+ let z = new BigNumber(this.showWeigh[index].cinderWeight - 0);
+ if(x.minus(y).minus(z).toFixed(2) <= 0){
+ this.showWeigh[index].weight = '0';
+ this.$u.toast('褰撳墠鍑�閲嶄笉鍚堟牸锛岃妫�鏌ョ毊閲嶏紝姣涢噸鏄惁鍑嗙‘')
+ }else{
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) ;
+ }
+
+
},
// 鍒犻櫎鍥剧墖
deletePic(event) {
--
Gitblit v1.9.1