|
|
@@ -47,17 +47,21 @@
|
|
|
<!-- <view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
|
|
|
class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
|
|
|
<view class="flex">
|
|
|
- <u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freightCars"
|
|
|
+ <u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight"
|
|
|
inputAlign='right' clearable></u--input>
|
|
|
<!-- <span>元/车</span> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
<view class="gray">车牌号</view>
|
|
|
- <view class="flex">
|
|
|
+ <view class="" style="color:#BBBBBB;" @click="carClick">
|
|
|
+ {{dataDetails.carrierInfo.carNo?dataDetails.carrierInfo.carNo:'请选择车牌号'}}
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- <view class="flex">
|
|
|
<input class="" v-model='dataDetails.carrierInfo.carNo' @click.stop="handleShowKeyboard"
|
|
|
:disabled="true" placeholder="输入车牌号" name="input" style="text-align: right;"></input>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
@@ -138,6 +142,8 @@
|
|
|
<!-- <button @click="subCanvas" class="subBtn">完成</button> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <u-picker :show="showCarList" :columns="carList" :closeOnClickOverlay='true' @close='selectTypeClose'
|
|
|
+ @cancel='selectTypeClose' @confirm='confirmBtn'></u-picker>
|
|
|
<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
|
|
|
:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
@@ -146,11 +152,16 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+ import {
|
|
|
+ mapState
|
|
|
+ } from 'vuex';
|
|
|
var that;
|
|
|
import uploadImage from '@/components/ossutil/uploadFile.js';
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ showCarList:false,
|
|
|
+ carList:[],
|
|
|
keyShow: false,
|
|
|
carNumber: '',
|
|
|
isScaleStart: false,
|
|
|
@@ -183,7 +194,11 @@
|
|
|
|
|
|
};
|
|
|
},
|
|
|
- onLoad(options) {debugger
|
|
|
+ computed: {
|
|
|
+ ...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
|
|
|
+ },
|
|
|
+ onLoad(options) {
|
|
|
+ this.carList = []
|
|
|
that = this
|
|
|
console.log(JSON.parse(options.obj))
|
|
|
// this.dataDetails = JSON.parse(options.obj)
|
|
|
@@ -199,12 +214,48 @@
|
|
|
})
|
|
|
.exec();
|
|
|
});
|
|
|
+ uni.showLoading({
|
|
|
+ title:'加载中'
|
|
|
+ })
|
|
|
+ this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
|
|
|
+ driverId: that.userInfo.driverId,
|
|
|
+ // driverId:this.firstAuthentication.id
|
|
|
+ }).then(res => {
|
|
|
+ if (res.code == '200') {debugger
|
|
|
+ uni.hideLoading()
|
|
|
+ if(res.data.length>0){
|
|
|
+ let _list = []
|
|
|
+ for(let i = 0;i<res.data.length;i++){
|
|
|
+ if(res.data[i].status=='已通过'){
|
|
|
+ _list.push(res.data[i].carNumber)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ that.carList = [_list]
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ uni.$u.toast(res.message);
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ uni.$u.toast(res.message);
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
+ confirmBtn(e){
|
|
|
+ this.dataDetails.carrierInfo.carNo = e.value[0]
|
|
|
+ this.showCarList = false
|
|
|
+ },
|
|
|
+ selectTypeClose(){
|
|
|
+ this.showCarList = false
|
|
|
+ },
|
|
|
+ carClick(){
|
|
|
+ this.showCarList = true
|
|
|
+ },
|
|
|
//车牌号弹出键盘
|
|
|
handleShowKeyboard() {
|
|
|
debugger
|
|
|
- if (this.dataDetails.carrierInfo.carNo == '') {
|
|
|
+ if (!this.dataDetails.carrierInfo.carNo) {
|
|
|
this.carNumber = ''
|
|
|
} else {
|
|
|
this.carNumber = this.dataDetails.carrierInfo.carNo
|
|
|
@@ -252,7 +303,7 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (uni.$u.test.isEmpty(that.dataDetails.freightCars)) {
|
|
|
+ if (uni.$u.test.isEmpty(that.dataDetails.freight)) {
|
|
|
that.$refs.uToast.show({
|
|
|
type: 'error',
|
|
|
message: "运费不能为空！",
|
|
|
@@ -302,7 +353,7 @@
|
|
|
_obj.endDates = that.dataDetails.endDates
|
|
|
_obj.contactPersonName = that.dataDetails.contactPersonName
|
|
|
_obj.contactPersonPhone = that.dataDetails.contactPersonPhone
|
|
|
- _obj.freightCars = that.dataDetails.freightCars
|
|
|
+ _obj.freight = that.dataDetails.freight
|
|
|
_obj.advanceCharge = that.dataDetails.advanceCharge
|
|
|
_obj.id = that.dataDetails.id
|
|
|
_obj.carNumber =that.dataDetails.carrierInfo.carNo
|
|
|
@@ -344,10 +395,13 @@
|
|
|
type: 'success',
|
|
|
message: "提交成功",
|
|
|
complete() {
|
|
|
- that.upCallback({
|
|
|
- size: 10,
|
|
|
- num: 1
|
|
|
- })
|
|
|
+ uni.$u.route('/pages/order/confirmLoading', {
|
|
|
+ obj: JSON.stringify(that.dataDetails),
|
|
|
+ });
|
|
|
+ // that.upCallback({
|
|
|
+ // size: 10,
|
|
|
+ // num: 1
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
}
|
