From f3288edb3b2f0e0e89cc28d719a1f83462459f33 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 26 七月 2023 17:22:16 +0800
Subject: [PATCH] 修改发运统计错误
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 114 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 28 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 c1352fd..6e48a53 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
@@ -57,65 +57,90 @@
</view>
</view>
<view class="notice-num">
- <view class="num-text">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
<u--text text="閫氱煡鏁伴噺"
size='32'></u--text>
</view>
- <view class="num-input">
+ <view class="num-input"
+ v-if='roleType===4&&!flag'>
<u--input placeholder="璇疯緭鍏ラ�氱煡鏁伴噺"
border="bottom"
clearable
v-model="item.num"></u--input>
</view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.num}}
+ </view>
</view>
<view class="unqualifiedBreed">
- <view class="num-text"
- style="width: 160rpx;">
+ <view style="width: 180rpx;">
<u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
</view>
- <view class="num-input">
+ <view class="tag-select"
+ @click="selectunqualifiedBreed(i)">
+ <text>
+ {{item.unqualifiedBreed||'璇烽�夋嫨'}}
+ </text>
+ </view>
+ <!-- <view class="tag-select">
<u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
plain
@click='selectunqualifiedBreed(i)'></u-tag>
- </view>
+ </view> -->
</view>
<view class="notice-num">
<view class="num-text">
<u--text text="涓嶅悎鏍奸噸閲�"
size='32'></u--text>
</view>
- <view class="num-input">
+ <view class="num-input"
+ v-if='roleType===4&&!flag'>
<u--input placeholder="璇疯緭鍏ヤ笉鍚堟牸閲嶉噺"
border="bottom"
clearable
v-model="item.unqualifiedWeight"
@input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input>
</view>
+ <view class="num-show"
+ v-else-if="flag">
+ {{item.unqualifiedWeight}}
+ </view>
</view>
<view class="level"
v-if='!flag'>
- <view class=""
- style="width: 140rpx;">
+ <view style="width: 140rpx;">
<u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
- <u-tag :text="item.breed+item.spec||item.modifygoodsName||'鏆傛棤'"
- plain
+ <view class="tag-select"
@click="goodsPopoverShow(i)"
- v-if='roleType===4'></u-tag>
+ v-if='roleType===4'>
+ <text>
+ {{item.breed+item.spec||item.modifygoodsName||'鏆傛棤'}}
+ </text>
+ </view>
</view>
<view class="level"
v-if='item.modifygoodsName||flag'>
- <view style="width: 200rpx;">
+ <view style="width: 180rpx;">
<u--text text="鍝佸悕涓庤鏍�"
size='32'></u--text>
</view>
- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
- <u-tag :text="!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec"
+ <view class="tag-select"
+ @click="productNamePopoverShow(i)"
+ v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
+ <text>
+ {{!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec}}
+ </text>
+ </view>
+ <!-- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
+ <u-tag :text="!flag?showWeighCopy[i].modifyProductName:(item.breed?item.breed+item.spec:'璇烽�夋嫨')"
plain
@click="productNamePopoverShow(i)"></u-tag>
- </view>
+ </view> -->
</view>
<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
v-if="item.isImage">
@@ -132,7 +157,7 @@
</view>
</view>
<view v-else-if='!item.isImage&&!flag'
- style="margin-top: 8rpx;">
+ style="margin: 30rpx 80rpx;">
<u-upload :fileList="item.fileList"
deletable
@afterRead="afterRead"
@@ -184,6 +209,7 @@
</template>
<script>
+ import BigNumber from "bignumber.js"
import { BaseUrl } from '@/api/publicInterface.js';
import { onlineurl } from '@/api/request.js'
import backtop from '../../../../../uni_modules/uview-ui/libs/config/props/backtop';
@@ -329,8 +355,10 @@
},
// 鐗╄祫鏄庣粏
goodsPopoverShow(index) {
- this.goodsShow = true
- this.goodsIndex = index
+ if (this.roleType === 4 && !this.flag) {
+ this.goodsShow = true
+ this.goodsIndex = index
+ }
},
goodsNameClose() {
this.goodsShow = false
@@ -363,7 +391,11 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
- this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
+ if (clean) {
+ let x = new BigNumber(clean)
+ let y = new BigNumber(value)
+ this.showWeigh[index].weight = x.minus(y).toFixed(2)
+ }
},
// 閫夋嫨涓嶅悎鏍煎搧鍚�
selectunqualifiedBreed(index) {
@@ -374,8 +406,11 @@
},
// 涓嶅悎鏍奸噸閲忚緭鍏�
unqualifiedWeightInputHandle(value, index, clean) {
- this.showWeigh[index].weight = (clean - (Number(value)) - this.showWeigh[index].cinderWeight).toFixed(2)
- console.log(this.showWeigh[index].weight);
+ // this.showWeigh[index].weight = (clean - (Number(value)) - this.showWeigh[index].cinderWeight).toFixed(2)
+ let x = new BigNumber(clean)
+ let y = new BigNumber(value)
+ let z = new BigNumber(this.showWeigh[index].cinderWeight)
+ this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
},
unqualifiedClose() {
this.unqualifiedShow = false
@@ -540,20 +575,43 @@
width: 60%;
border-bottom: 1px solid rgb(218, 219, 222);
}
+
+ .num-show {
+ width: 60%;
+ color: #303030
+ }
}
.unqualifiedBreed {
- width: 64% !important;
- margin-left: 70rpx !important;
@extend .level;
}
.level {
- width: 60%;
- margin-top: 30rpx;
- margin-left: 80rpx;
+ width: 89%;
+ margin: 30rpx 80rpx;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
+
+ .tag-select {
+ flex: 1;
+ margin-left: 14rpx;
+ text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ border: 1rpx solid rgb(60, 156, 255);
+ padding: 8rpx 14rpx;
+ color: rgb(60, 156, 255);
+ font-size: 26rpx;
+
+ .tag-select_text {
+ // width: vww(180);
+ // border: 1rpx solid rgb(60, 156, 255);
+ // padding: 8rpx 14rpx;
+ // color: rgb(60, 156, 255);
+ // font-size: 26rpx;
+ }
+ }
}
.select-button {
--
Gitblit v1.9.1