|
|
@@ -7,7 +7,7 @@
|
|
|
<image class="back" src="../../static/images/return.png" @click="back" mode="" style="width: 40rpx; height: 40rpx;"></image>
|
|
|
<!-- <u-icon class="back" name="arrow-left" color="" size="20" ></u-icon> -->
|
|
|
<view class="nav-title">订单</view>
|
|
|
- <image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService" mode=""></image>
|
|
|
+ <image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService()" mode=""></image>
|
|
|
<!-- <u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -116,19 +116,16 @@
|
|
|
<view class=" gray">距离</view>
|
|
|
<view class="">约{{dataObj.distance}}公里</view>
|
|
|
</view>
|
|
|
- <view class='row-between'>
|
|
|
+ <view v-if='dataObj.publishTaskInfo' class='row-between'>
|
|
|
<view class=" gray">收货联系人</view>
|
|
|
<view class="flex flex-center">{{dataObj.publishTaskInfo.sender?dataObj.publishTaskInfo.sender:''}}
|
|
|
<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.senderPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.senderPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
|
|
|
- <!-- <u-icon name="phone-fill" color="#2772FB" size="20"></u-icon> -->
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class='row-between'>
|
|
|
+ </view>
|
|
|
+ <view v-if='dataObj.publishTaskInfo' class='row-between'>
|
|
|
<view class=" gray">发货联系人</view>
|
|
|
<view class="flex flex-center">{{dataObj.publishTaskInfo.receiver?dataObj.publishTaskInfo.receiver:''}}
|
|
|
<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
|
|
|
- <!-- <u-icon v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)"></u-icon> -->
|
|
|
- </view>
|
|
|
</view>
|
|
|
<!-- <view class='row-between'>
|
|
|
<view class=" gray">运费</view>
|
|
|
@@ -203,7 +200,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
|
|
|
- :closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
|
|
|
+ :closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick" @close="cancelClick"
|
|
|
@cancel="cancelClick" class="modal">
|
|
|
<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
|
|
|
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
|
|
|
@@ -240,6 +237,7 @@
|
|
|
</u-popup>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
@@ -262,6 +260,7 @@
|
|
|
status1:false,
|
|
|
status2:false,
|
|
|
id: '',
|
|
|
+ showCancelButton:true,
|
|
|
value2: '',
|
|
|
radiolist1: [{
|
|
|
name: '已与货主协商',
|
|
|
@@ -294,6 +293,13 @@
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ open() {
|
|
|
+ // console.log('open');
|
|
|
+ },
|
|
|
+ close() {
|
|
|
+ this.show = false
|
|
|
+ // console.log('close');
|
|
|
+ },
|
|
|
ylImg(src) {
|
|
|
uni.previewImage({
|
|
|
urls: src,
|
|
|
@@ -390,9 +396,30 @@
|
|
|
});
|
|
|
},
|
|
|
confirmLoading() {
|
|
|
- uni.$u.route('/pages/order/confirmLoading', {
|
|
|
- obj: JSON.stringify({id:this.id,carrierId:this.dataObj.hyCarrierInfo.id}),
|
|
|
- });
|
|
|
+ var that = this
|
|
|
+ this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
|
|
|
+ commonId: uni.getStorageSync('userInfo').id,
|
|
|
+ searchType:2
|
|
|
+ }).then(res => {
|
|
|
+ if (res.code == '200') {
|
|
|
+ if(res.data&&res.data.length>0){
|
|
|
+ uni.$u.route('/pages/order/confirmLoading', {
|
|
|
+ obj: JSON.stringify({id:that.id,carrierId:that.dataObj.hyCarrierInfo.id}),
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ that.alertTitle = '尚未添加车辆！'
|
|
|
+ that.showCancelButton = false
|
|
|
+ that.confirmText = '立即添加'
|
|
|
+ that.isShowAlert = true
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ uni.$u.toast(res.message);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ uni.$u.toast(res.message);
|
|
|
+ });
|
|
|
+
|
|
|
// uni.$u.route('/pages/order/confirmLoading', {id:this.id});
|
|
|
},
|
|
|
confirmUnLoading() {
|
|
|
@@ -400,44 +427,48 @@
|
|
|
uni.$u.route('/pages/order/confirmUnloading', {obj:JSON.stringify(item)});
|
|
|
},
|
|
|
confirmClick() {
|
|
|
- let that = this
|
|
|
- if (this.radiovalue1 == '其他' && !this.value2) {
|
|
|
- this.$refs.uToast.show({
|
|
|
- type: 'error',
|
|
|
- message: "请填写终止原因描述!",
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- let _terminationReason = ''
|
|
|
- if (this.radiovalue1 == '已与货主协商') {
|
|
|
- _terminationReason = 1
|
|
|
- } else if (this.radiovalue1 == '货主原因终止') {
|
|
|
- _terminationReason = 2
|
|
|
- } else if (this.radiovalue1 == '司机个人原因终止') {
|
|
|
- _terminationReason = 3
|
|
|
- } else if (this.radiovalue1 == '其他') {
|
|
|
- _terminationReason = 4
|
|
|
- }
|
|
|
- this.$request.baseRequest('post', '/orderInfo/api/end', {
|
|
|
- id: this.id,
|
|
|
- terminationReason: _terminationReason,
|
|
|
- terminationReasonDescription: this.value2,
|
|
|
- terminator:1
|
|
|
- }).then(res => {
|
|
|
- this.show=false
|
|
|
- this.isShowAlert = false
|
|
|
- // this.mescroll.resetUpScroll()
|
|
|
+ if(this.alertTitle == '尚未添加车辆！'){
|
|
|
+ uni.$u.route('/pages/mine/manageVehicles/index');
|
|
|
+ }else{
|
|
|
+ let that = this
|
|
|
+ if (this.radiovalue1 == '其他' && !this.value2) {
|
|
|
this.$refs.uToast.show({
|
|
|
- type: 'success',
|
|
|
- message: "提交成功！",
|
|
|
- complete() {
|
|
|
- that.getList()
|
|
|
- }
|
|
|
+ type: 'error',
|
|
|
+ message: "请填写终止原因描述!",
|
|
|
})
|
|
|
- })
|
|
|
- .catch(res => {
|
|
|
- uni.$u.toast(res.message);
|
|
|
- });
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let _terminationReason = ''
|
|
|
+ if (this.radiovalue1 == '已与货主协商') {
|
|
|
+ _terminationReason = 1
|
|
|
+ } else if (this.radiovalue1 == '货主原因终止') {
|
|
|
+ _terminationReason = 2
|
|
|
+ } else if (this.radiovalue1 == '司机个人原因终止') {
|
|
|
+ _terminationReason = 3
|
|
|
+ } else if (this.radiovalue1 == '其他') {
|
|
|
+ _terminationReason = 4
|
|
|
+ }
|
|
|
+ this.$request.baseRequest('post', '/orderInfo/api/end', {
|
|
|
+ id: this.id,
|
|
|
+ terminationReason: _terminationReason,
|
|
|
+ terminationReasonDescription: this.value2,
|
|
|
+ terminator:1
|
|
|
+ }).then(res => {
|
|
|
+ this.show=false
|
|
|
+ this.isShowAlert = false
|
|
|
+ // this.mescroll.resetUpScroll()
|
|
|
+ this.$refs.uToast.show({
|
|
|
+ type: 'success',
|
|
|
+ message: "提交成功！",
|
|
|
+ complete() {
|
|
|
+ that.getList()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ uni.$u.toast(res.message);
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
cancelClick() {
|
|
|
this.isShowAlert = false
|
|
|
@@ -446,12 +477,13 @@
|
|
|
let item = this.dataObj
|
|
|
// 货主接单
|
|
|
this.id = item.id
|
|
|
- if(item.orderStatus=='未装车'){
|
|
|
- if (item.orderStatusKey == 1) {
|
|
|
+ if (item.orderStatusKey == 1) {
|
|
|
this.isShowTerminationReason = false
|
|
|
} else {
|
|
|
this.isShowTerminationReason = true
|
|
|
}
|
|
|
+ if(item.orderStatus=='未装车'){
|
|
|
+
|
|
|
|
|
|
this.show = true
|
|
|
}else{
|
