From 71ba67906896248aa2df5e70756b997fad9a9033 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期一, 09 九月 2024 17:54:18 +0800
Subject: [PATCH] feat：门卫
---
pages/driver-page/delivery-my/delivery-my/delivery-my.vue | 109 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 25 deletions(-)
diff --git a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
index 7dff548..33c5c44 100644
--- a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
+++ b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
@@ -35,7 +35,7 @@
label="杞︾墝鍙�"
labelWidth="20%"
borderBottom
- required>
+ >
<u--input v-model="registerFormModel.carNo"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable></u--input>
@@ -46,6 +46,7 @@
borderBottom
required v-if="daydata.isWeighing==1">
<u--input v-model="skin"
+ border="surround"
placeholder="璇疯緭鍏ョ毊閲�"
clearable></u--input>
</u-form-item>
@@ -55,6 +56,7 @@
borderBottom
required v-if="daydata.isWeighing==1">
<u--input v-model="hair"
+ border="surround"
placeholder="璇疯緭鍏ユ瘺閲�"
clearable></u--input>
</u-form-item>
@@ -64,6 +66,8 @@
borderBottom
required v-if="daydata.isWeighing==1">
<u--input v-model="clean"
+ border="surround"
+ disabled
placeholder="璇疯緭鍏ュ噣閲�"
clearable></u--input>
</u-form-item>
@@ -90,7 +94,7 @@
</uni-table>
<u-form-item prop='contactPicture'>
<view class="label-text">
- <text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
+ <text style="color: #f56c6c;">*</text>鍘熷彂鍗曟嵁
</view>
<u-upload :fileList="fileList1"
@afterRead="afterRead"
@@ -155,7 +159,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ daydata.sendDate }}</view>
@@ -163,7 +167,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
</view>
</view>
<view class="senddate">{{ daydata.orderCode }}</view>
@@ -202,6 +206,7 @@
import { apiRegister } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
import { BaseUrl } from '@/api/publicInterface.js';
+ import BigNumber from "bignumber.js"
export default {
// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
onReady() {
@@ -241,7 +246,6 @@
},
skin:"",
hair:"",
- clean:"",
TableData:[],
radiolist1: [{
name: '鍚�',
@@ -295,28 +299,68 @@
trigger: ['change', 'blur']
}
],
- carNo: [{
- type: 'string',
- required: true,
- message: '璇疯緭鍏ヨ溅鐗屽彿',
- trigger: ['blur', 'change']
- },
- {
- transform(value) {
- return String(value);
- },
- validator: (rule, value, callback) => {
- return uni.$u.test.carNo(value);
- },
- message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
- trigger: ['change', 'blur']
- }
- ],
+ // carNo: [{
+ // type: 'string',
+ // required: true,
+ // message: '璇疯緭鍏ヨ溅鐗屽彿',
+ // trigger: ['blur', 'change']
+ // },
+ // {
+ // transform(value) {
+ // return String(value);
+ // },
+ // validator: (rule, value, callback) => {
+ // return uni.$u.test.carNo(value);
+ // },
+ // message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
+ // trigger: ['change', 'blur']
+ // }
+ // ],
},
};
},
+ computed:{
+ clean() {
+ if(this.daydata.isWeighing==1){
+ let xx = BigNumber(this.hair ? this.hair : 0)
+ let yy = BigNumber(this.skin ? this.skin : 0)
+ return xx.minus(yy).toNumber() > 0 ? xx.minus(yy).toNumber().toFixed(2) : 0
+ }else{
+ //鏁伴噺
+ if(!this.tmTaskCoalList.length){
+ return false
+ }else{
+ const reslut = this.tmTaskCoalList.find(item=>!item.productQuantity);
+ if(reslut){
+ return false
+ }else{
+ return true
+ }
+ }
+ }
+ }
+ },
methods: {
...mapMutations(['changeisUploadimg']),
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
+ } else {
+ this.isfocus2 = true;
+ }
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
+ },
+ inputChange() {
+ if (Number(this.originInfoForm.coalContactHair) > 0 && Number(this.originInfoForm.coalContactSkin >
+ 0)) {
+ this.isInputOrigin = true;
+ }
+ },
deletePic(event) {
this.changeisUploadimg(true);
this[`fileList${event.name}`].splice(event.index, 1);
@@ -392,7 +436,7 @@
});
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
- this.GetMyDelivery()
+ this.GetMyDeliverys()
} else {
uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
}
@@ -423,7 +467,7 @@
});
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
- this.GetMyDelivery()
+ this.GetMyDeliverys()
} else {
uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
}
@@ -449,7 +493,7 @@
});
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
- this.GetMyDelivery()
+ this.GetMyDeliverys()
} else {
uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
}
@@ -457,6 +501,21 @@
}
})
},
+ GetMyDeliverys() {
+ this.$reqGet('driverYuYueList', {orderPlanId:this.id}).then(res => {
+ if (res.code == 0) {
+ this.yuYueData = res.data;
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ }
+ });
+ this.$reqGetId('myDelivery',this.id).then(res => {
+ if (res.data) {
+ this.daydata=res.data
+ this.tmTaskCoalList=res.data.jhOrderPlanList
+ }
+ });
+ },
GetMyDelivery() {
uni.showLoading({
title: '鍔犺浇涓�...'
--
Gitblit v1.9.1