From 07b5244ba8572922728f2663883915861554e7e0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 02 七月 2023 17:30:54 +0800
Subject: [PATCH] 验质逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 85 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 33 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 0f2d8e6..c30bfb4 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
@@ -1,26 +1,34 @@
<!-- 鏌ョ湅鐨瘺鍑�鏄庣粏 -->
<template>
<view class="main">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ v-if="showWeigh.length===0"></u-empty>
<view class="main-block"
v-for="(item,i) in showWeigh"
:key="i">
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/skin.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ 鐨�
+ </view>
<view class="num">{{ item.skin }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/hair.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ 姣�
+ </view>
<view class="num">{{ item.hair }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/clean.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ 鍑�
+ </view>
<view class="num">{{ item.clean }}</view>
</view>
</view>
@@ -29,31 +37,36 @@
<view class="label-text">
鎶樻墸鐜�
</view>
- <view v-if='roleType!==1'
- class="count">{{item.discount}}%</view>
- <view v-else
- class="count-input"><u--input placeholder="璇疯緭鍏ユ姌鎵g巼"
+ <view v-if='roleType===4&&!flag'
+ class="count-input">
+ <u--input placeholder="璇疯緭鍏ユ姌鎵g巼"
border="bottom"
clearable
v-model="item.discount"
- @input='v=>discountInputHandle(v,i,item.clean)'></u--input></view>
+ @input='v=>discountInputHandle(v,i,item.clean)'></u--input>
+ </view>
+ <view v-else-if='flag'
+ class="count">{{ item.discount }}%
+ </view>
</view>
<view class="weigh">
<view class="label-text">
鎶樻墸鍚庨噸閲�
</view>
- <view class="count">{{item.discountWeight}}</view>
+ <view class="count">{{ item.discountWeight }}</view>
</view>
</view>
<view class="level">
<u-tag :text="item.level||'璇烽�夋嫨'"
plain
- @click="popoverShow(i)"></u-tag>
+ @click="popoverShow(i)"
+ v-if='item.level||roleType===4'></u-tag>
<u-tag :text="item.productName||'璇烽�夋嫨'"
plain
- @click="productNamePopoverShow(i)"></u-tag>
+ @click="productNamePopoverShow(i)"
+ v-if='item.level||roleType===4'></u-tag>
</view>
- <view v-if='roleType===1'>
+ <view v-if='roleType===4'>
<u-picker :show="show"
:columns="columns"
@cancel='cancel'
@@ -69,7 +82,7 @@
</view>
</view>
<view class="confirm-button"
- v-if='roleType===1'>
+ v-if='roleType===4'>
<u-button type="primary"
shape="circle"
text="纭"
@@ -81,12 +94,11 @@
</template>
<script>
- import loginVue from '../../../../login/login.vue';
+ import { onlineurl } from '@/api/request.js'
export default {
data() {
return {
orderPlanId: "",
- index: null,
coalDetailsData: {},
showWeigh: [],
discountrate: "",
@@ -100,7 +112,10 @@
// 浜у搧鍒楄〃
actionsList: [],
actionShow: false,
- actionIndex: null
+ actionIndex: null,
+ onlineurl,
+ havedInput: false,
+ flag: false
};
},
computed: {
@@ -110,7 +125,7 @@
},
onLoad(params) {
this.orderPlanId = params.orderPlanId ? params.orderPlanId : ''
- this.index = params.index ? params.index : ''
+ this.flag = params.flag ? params.flag : false
},
onShow() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
@@ -138,8 +153,8 @@
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.coalDetailsData = res.data;
- this.showWeigh = this.coalDetailsData[this.index].tmTaskCoalItems ? this.coalDetailsData[
- this.index].tmTaskCoalItems : [],
+ this.showWeigh = this.coalDetailsData[this.index].tmTaskCoals ? this.coalDetailsData[
+ this.index].tmTaskCoals : [],
uni.hideLoading();
} else {
this.$u.toast('鍔犺浇澶辫触')
@@ -166,7 +181,12 @@
res => {
if (res.code == 0) {
this.loading = false
- this.$u.toast('鎿嶄綔鎴愬姛')
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�')
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
} else {
this.loading = false
this.$u.toast('鎿嶄綔澶辫触')
@@ -175,14 +195,14 @@
},
// 閫夋嫨璐ㄩ噺
popoverShow(i) {
- if (this.roleType === 1) {
+ if (this.roleType === 4 && !flag) {
this.show = true
this.selectIndex = i
}
},
// 閫夋嫨浜у搧
productNamePopoverShow(i) {
- if (this.roleType === 1) {
+ if (this.roleType === 4 && !flag) {
this.actionShow = true
this.actionIndex = i
}
@@ -204,7 +224,7 @@
},
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
- this.showWeigh[index].discountWeight = (Number(value) * clean) / 100
+ this.showWeigh[index].discountWeight = ((Number(value) * clean) / 100).toFixed(2)
}
},
}
@@ -223,10 +243,11 @@
}
.main {
- width: 100%;
- height: 100vh;
+ width: 96%;
+ height: 100%;
+ min-height: 400rpx;
background-color: #fff;
- margin: 0 auto;
+ margin: 10rpx auto;
display: flex;
flex-direction: column;
@@ -310,15 +331,13 @@
}
.confirm-button {
- // position: relative;
- // bottom: 10rpx;
- // right: 10rpx;
width: 100%;
@include flex;
justify-content: center;
+ margin-bottom: 40rpx;
/deep/ .u-button {
- width: 180rpx !important;
+ width: 180 rpx !important;
}
}
}
--
Gitblit v1.9.1