|
|
@@ -47,14 +47,26 @@
|
|
|
<!-- <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" inputAlign='right'
|
|
|
- clearable></u--input>
|
|
|
+ <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="" 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 class='row-between'>
|
|
|
<view class="gray">挂车号（选填）</view>
|
|
|
- <view class="">
|
|
|
+ <view class="flex">
|
|
|
<u--input placeholder="请输入挂车号" border="none" v-model="dataDetails.trailerNumber" inputAlign='right'
|
|
|
clearable></u--input>
|
|
|
</view>
|
|
|
@@ -64,38 +76,40 @@
|
|
|
<view class="">
|
|
|
<view @click="dateShow">{{dataDetails.startDates?dataDetails.startDates:'请选择运输开始日期'}}
|
|
|
</view>
|
|
|
- <u-datetime-picker :show="startShow" mode="date"
|
|
|
- @cancel="removeStart" @confirm="startDate" @close="removeStart"></u-datetime-picker>
|
|
|
+ <u-datetime-picker :show="startShow" mode="date" @cancel="removeStart" @confirm="startDate"
|
|
|
+ @close="removeStart"></u-datetime-picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
<view class="gray">运输截止日期</view>
|
|
|
<view class="">
|
|
|
- <!-- <u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
|
|
|
+ <!-- <u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
|
|
|
clearable></u--input> -->
|
|
|
- <view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}</view>
|
|
|
- <u-datetime-picker :show="endShow" mode="date" @cancel="removeEnd" @confirm="endDate" @close="removeEnd"></u-datetime-picker>
|
|
|
+ <view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}
|
|
|
+ </view>
|
|
|
+ <u-datetime-picker :show="endShow" mode="date" @cancel="removeEnd" @confirm="endDate"
|
|
|
+ @close="removeEnd"></u-datetime-picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
<view class="gray">联络人姓名</view>
|
|
|
<view class="">
|
|
|
- <u--input placeholder="请输入联络人姓名" border="none" v-model="dataDetails.contactPersonName" inputAlign='right'
|
|
|
- clearable></u--input>
|
|
|
+ <u--input placeholder="请输入联络人姓名" border="none" v-model="dataDetails.contactPersonName"
|
|
|
+ inputAlign='right' clearable></u--input>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
<view class="gray">联络人电话</view>
|
|
|
<view class="">
|
|
|
- <u--input placeholder="请输入联络人电话" border="none" type="number" maxlength="11" v-model="dataDetails.contactPersonPhone" inputAlign='right'
|
|
|
- clearable></u--input>
|
|
|
+ <u--input placeholder="请输入联络人电话" border="none" type="number" maxlength="11"
|
|
|
+ v-model="dataDetails.contactPersonPhone" inputAlign='right' clearable></u--input>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
<view class="gray">装车后预付款</view>
|
|
|
<view class="">
|
|
|
- <u--input placeholder="请输入装车后预付款" border="none" v-model="dataDetails.advanceCharge" inputAlign='right'
|
|
|
- clearable></u--input>
|
|
|
+ <u--input placeholder="请输入装车后预付款" border="none" v-model="dataDetails.advanceCharge"
|
|
|
+ inputAlign='right' clearable></u--input>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -128,16 +142,28 @@
|
|
|
<!-- <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>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
</view>
|
|
|
</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,
|
|
|
radioCustomStyle: {
|
|
|
margin: '0 0 0 10rpx'
|
|
|
@@ -163,12 +189,16 @@
|
|
|
},
|
|
|
],
|
|
|
startShow: false,
|
|
|
- endShow:false,
|
|
|
-
|
|
|
-
|
|
|
+ endShow: false,
|
|
|
+
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ ...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
|
|
|
+ },
|
|
|
onLoad(options) {
|
|
|
+ this.carList = []
|
|
|
that = this
|
|
|
console.log(JSON.parse(options.obj))
|
|
|
// this.dataDetails = JSON.parse(options.obj)
|
|
|
@@ -184,25 +214,86 @@
|
|
|
})
|
|
|
.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: {
|
|
|
- dateShow(){
|
|
|
+ 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) {
|
|
|
+ this.carNumber = ''
|
|
|
+ } else {
|
|
|
+ this.carNumber = this.dataDetails.carrierInfo.carNo
|
|
|
+ }
|
|
|
+ if (this.$refs.keyboard.open) {
|
|
|
+ this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
|
|
|
+ } else {
|
|
|
+ this.$refs.keyboard[0].open(false)
|
|
|
+ }
|
|
|
+ if (this.$refs.keyboard.open) {
|
|
|
+ this.$refs.keyboard.open(true) //true 键盘显示 false 键盘隐藏
|
|
|
+ } else {
|
|
|
+ this.$refs.keyboard[0].open(true)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //车牌号弹出键盘
|
|
|
+ handleClick(e) {
|
|
|
+ this.carNumber = e.value
|
|
|
+ this.dataDetails.carrierInfo.carNo = e.value //键盘输入值
|
|
|
+ },
|
|
|
+ dateShow() {
|
|
|
this.startShow = true
|
|
|
},
|
|
|
- removeStart(){
|
|
|
+ removeStart() {
|
|
|
this.startShow = false
|
|
|
},
|
|
|
- removeEnd(){
|
|
|
+ removeEnd() {
|
|
|
this.endShow = false
|
|
|
},
|
|
|
startDate(e) {
|
|
|
let timeFormat = uni.$u.timeFormat
|
|
|
- this.dataDetails.startDates = timeFormat(e.value,"yyyy-mm-dd")
|
|
|
+ this.dataDetails.startDates = timeFormat(e.value, "yyyy-mm-dd")
|
|
|
this.startShow = false
|
|
|
},
|
|
|
- endDate(e){
|
|
|
+ endDate(e) {
|
|
|
let timeFormat = uni.$u.timeFormat
|
|
|
- this.dataDetails.endDates = timeFormat(e.value,"yyyy-mm-dd")
|
|
|
+ this.dataDetails.endDates = timeFormat(e.value, "yyyy-mm-dd")
|
|
|
this.endShow = false
|
|
|
},
|
|
|
submit() {
|
|
|
@@ -213,7 +304,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: "运费不能为空！",
|
|
|
@@ -257,15 +348,17 @@
|
|
|
}
|
|
|
console.log(that.dataDetails)
|
|
|
let _obj = {}
|
|
|
+ debugger
|
|
|
_obj.trailerNumber = that.dataDetails.trailerNumber
|
|
|
_obj.startDates = that.dataDetails.startDates
|
|
|
_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
|
|
|
+ _obj.typeFlag = 2
|
|
|
uni.canvasToTempFilePath({
|
|
|
canvasId: 'handWriting',
|
|
|
fileType: 'png',
|
|
|
@@ -291,7 +384,7 @@
|
|
|
success: function(res) {
|
|
|
var filePath = res.tempFilePath;
|
|
|
uni.openDocument({
|
|
|
- filePath: filePath,
|
|
|
+ filePath: filePath,
|
|
|
showMenu: true,
|
|
|
success: function(res) {
|
|
|
console.log('打开文档成功');
|
|
|
@@ -303,10 +396,14 @@
|
|
|
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
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
}
|
zhongtianhaoyuan