From 472a1ffc28590479b3f4027cbe8d04e699b6e592 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 18 七月 2023 16:00:26 +0800
Subject: [PATCH] 修改样式，增加逻辑，修复计算错误
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 159 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 35 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 6f7b9ba..50baa1a 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
@@ -61,48 +61,62 @@
<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="notice-num">
- <view class="num-text">
- <u--text text=" 涓嶅悎鏍煎搧鍚�"
+ <view class="unqualifiedBreed">
+ <view style="width: 180rpx;">
+ <u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
</view>
- <view class="num-input">
- <u--input placeholder="璇疯緭鍏� 涓嶅悎鏍煎搧鍚�"
- border="bottom"
- clearable
- v-model="item.unqualifiedBreed"></u--input>
+ <view class="tag-select">
+ <u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
+ plain
+ @click='selectunqualifiedBreed(i)'></u-tag>
</view>
</view>
<view class="notice-num">
<view class="num-text">
- <u--text 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"></u--input>
+ 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
- @click="goodsPopoverShow(i)"
- v-if='item.breed&&item.spec||roleType===4'></u-tag>
+ <view class="tag-select">
+ <view class="tag-select_text"
+ @click="goodsPopoverShow(i)"
+ v-if='roleType===4'>
+ <text>
+ {{item.breed+item.spec||item.modifygoodsName||'鏆傛棤'}}
+ </text>
+ </view>
+ </view>
</view>
<view class="level"
v-if='item.modifygoodsName||flag'>
@@ -111,13 +125,27 @@
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"
+ <u-tag :text="!flag?showWeighCopy[i].modifyProductName:(item.breed?item.breed+item.spec:'璇烽�夋嫨')"
plain
@click="productNamePopoverShow(i)"></u-tag>
</view>
</view>
- <view class=""
- style="margin-top: 8rpx;">
+ <view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
+ v-if="item.isImage">
+ <view style="width: 100px;"
+ v-for="(val,index) in item.inspectionJpg"
+ :key="index">
+ <u--image :showLoading="true"
+ :src="`${BaseUrl}${val}`"
+ width="80px"
+ height="80px">
+ <view slot="error"
+ style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
+ </view>
+ </view>
+ <view v-else-if='!item.isImage&&!flag'
+ style="margin: 30rpx 80rpx;">
<u-upload :fileList="item.fileList"
deletable
@afterRead="afterRead"
@@ -137,7 +165,7 @@
:closeOnClickOverlay='true'
@close='goodsNameClose'
@select="goodsselectClick"></u-action-sheet>
- <!-- 浜у搧鍒楄〃 -->
+ <!-- 鍝佸悕涓庤鏍� -->
<view class="">
<u-action-sheet :actions="actionsList"
:show="actionShow"
@@ -145,6 +173,15 @@
:closeOnClickOverlay='true'
@close='productNameClose'
@select="selectClick"></u-action-sheet>
+ </view>
+ <!-- 涓嶅悎鏍煎搧鍚� -->
+ <view class="">
+ <u-action-sheet :actions="actionsList"
+ :show="unqualifiedShow"
+ cancelText='鍙栨秷'
+ :closeOnClickOverlay='true'
+ @close='unqualifiedClose'
+ @select="selectUnqualifiedClick"></u-action-sheet>
</view>
</view>
<view class="confirm-button"
@@ -160,8 +197,10 @@
</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';
export default {
data() {
return {
@@ -190,6 +229,10 @@
isModify: false,
// 涓婁紶鍥剧墖
fileList1: [],
+ BaseUrl,
+ // 涓嶅悎鏍煎搧鍚�
+ unqualifiedShow: false,
+ unqualifiedIndex: null
};
},
@@ -220,7 +263,9 @@
...v,
modifyProductName: '',
modifygoodsName: '',
- fileList: []
+ fileList: [],
+ inspectionJpg: v.inspectionJpg.split(','),
+ isImage: v.inspectionJpg
}
})
this.showWeighCopy = JSON.parse(JSON.stringify(this.showWeigh))
@@ -276,7 +321,7 @@
...v,
breed: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].breed : v.breed,
spec: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].spec : v.spec,
- inspectionJpg: v.fileList.join(',')
+ inspectionJpg: v.fileList.map(v => v.url.replace(BaseUrl, '')).join(',')
}
})
@@ -292,14 +337,16 @@
}, 800)
} else {
this.loading = false
- this.$u.toast('鎿嶄綔澶辫触')
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触')
}
})
},
// 鐗╄祫鏄庣粏
goodsPopoverShow(index) {
- this.goodsShow = true
- this.goodsIndex = index
+ if (this.roleType === 4 && !this.flag) {
+ this.goodsShow = true
+ this.goodsIndex = index
+ }
},
goodsNameClose() {
this.goodsShow = false
@@ -314,7 +361,7 @@
this.showWeigh[this.goodsIndex].spec = val.spec
this.showWeigh[this.goodsIndex].weightUnit = val.weightUnit
},
- // 浜у搧鍒楄〃
+ // 鍝佸悕涓庤鏍�
productNamePopoverShow(index) {
if (this.roleType === 4 && !this.flag) {
this.actionShow = true
@@ -332,12 +379,34 @@
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
- this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
+ let x = new BigNumber(clean)
+ let y = new BigNumber(value)
+ this.showWeigh[index].weight = x.minus(y).toFixed(2)
+ },
+ // 閫夋嫨涓嶅悎鏍煎搧鍚�
+ selectunqualifiedBreed(index) {
+ if (this.roleType === 4 && !this.flag) {
+ this.unqualifiedShow = true
+ this.unqualifiedIndex = index
+ }
+ },
+ // 涓嶅悎鏍奸噸閲忚緭鍏�
+ unqualifiedWeightInputHandle(value, index, clean) {
+ // 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
+ },
+ selectUnqualifiedClick(val) {
+ this.showWeigh[this.unqualifiedIndex].unqualifiedBreed = val.secondCategoryName + val.spec
},
// 鍒犻櫎鍥剧墖
deletePic(event) {
this.showWeigh[event.name].fileList.splice(event.index, 1);
- // this[`fileList${event.name}`].splice(event.index, 1);
},
// 鏂板鍥剧墖
async afterRead(event) {
@@ -374,7 +443,6 @@
name: 'file',
formData: {},
success: res => {
- this.showWeigh[num].fileList.push(JSON.parse(res.data).data.url)
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
});
@@ -493,14 +561,35 @@
width: 60%;
border-bottom: 1px solid rgb(218, 219, 222);
}
+
+ .num-show {
+ width: 60%;
+ color: #303030
+ }
+ }
+
+ .unqualifiedBreed {
+ @extend .level;
}
.level {
- width: 60%;
- margin-top: 30rpx;
- margin-left: 80rpx;
+ width: 96%;
+ margin: 30rpx 80rpx;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
+
+ .tag-select {
+ // flex: 0.7;
+ margin-left: 14rpx;
+ text-align: center;
+
+ .tag-select_text {
+ border: 1rpx solid rgb(60, 156, 255);
+ padding: 8rpx 14rpx;
+ color: rgb(60, 156, 255);
+ font-size: 26rpx;
+ }
+ }
}
.select-button {
--
Gitblit v1.9.1