|
|
@@ -44,6 +44,7 @@
|
|
|
</u-button>
|
|
|
<u-button class="btn" text="确认卸车" @click="confirmUnLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
|
|
|
</u-button>
|
|
|
+ <u-button class="btn" text="确认运费" @click="freightOk()" v-if="dataObj.cargoOwnerStatus=='司机驳回运费信息'"></u-button>
|
|
|
<!-- <u-button class="btn" text="确认卸车" @click="confirmLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
|
|
|
</u-button> -->
|
|
|
<u-button class="btn" text="付款" @click="closed"
|
|
|
@@ -188,7 +189,7 @@
|
|
|
<view class='row-between'>
|
|
|
<view class="row-left-text gray">合计应付运费</view>
|
|
|
<view class="row-right-text">
|
|
|
- {{dataObj.hyCarrierInfo.totalFreight}}{{dataObj.hyCarrierInfo.totalFreight?"元":""}}
|
|
|
+ <u--input placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='row-between'>
|
|
|
@@ -286,9 +287,27 @@
|
|
|
</u--textarea>
|
|
|
<view class='termination' :class="{'active':value2.length>0}" @click='termination'>终止</view>
|
|
|
</view>
|
|
|
-
|
|
|
</u-popup>
|
|
|
<u-toast ref="uToast"></u-toast>
|
|
|
+ <!-- <u-popup :show="moneyShow" mode="center" @close="close" @open="open">
|
|
|
+ <view class="freight">
|
|
|
+ <view class="freight_text">
|
|
|
+ 合计运费
|
|
|
+ </view>
|
|
|
+ <u--input v-model="totalFreight" placeholder="请输入合计运费"></u--input>
|
|
|
+ <view class="freight_up">
|
|
|
+ <view class="freight_item">取消</view>
|
|
|
+ <view class="freight_item">确定</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </u-popup> -->
|
|
|
+ <u-modal :show="moneyShow" title="合计运费" showCancelButton @confirm="moneyClick" @close="moneyclose"
|
|
|
+ @cancel="moneyclose">
|
|
|
+ <view class="slot-content">
|
|
|
+ <u--input v-model="totalFreight" type="number" placeholder="请输入合计运费"></u--input>
|
|
|
+ </view>
|
|
|
+ </u-modal>
|
|
|
<!-- <view v-if="lookAlert" class="look-contract" @click="lookAlert==false">
|
|
|
<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
|
|
|
<u-button class="btn" text="签名"></u-button>
|
|
|
@@ -374,6 +393,8 @@
|
|
|
selectColor: 'black',
|
|
|
lineColor: '#1A1A1A', // 颜色
|
|
|
lineSize: 5, // 笔记倍数
|
|
|
+ moneyShow:false,
|
|
|
+ totalFreight:""
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -395,9 +416,33 @@
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ moneyClick(){
|
|
|
+ this.moneyShow = false
|
|
|
+ if(this.dataObj.cargoOwnerStatus == "司机驳回运费信息"){
|
|
|
+ this.$request.baseRequest('post', '/orderInfo/api/confirmFreight', {
|
|
|
+ id: this.dataObj.id,
|
|
|
+ typeFlag:1,
|
|
|
+ totalFreight:this.totalFreight
|
|
|
+ }).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$refs.uToast.show({
|
|
|
+ type: 'success',
|
|
|
+ message: "确认成功",
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ moneyclose(){
|
|
|
+ this.moneyShow = false
|
|
|
+ this.totalFreight = ""
|
|
|
+ },
|
|
|
+ freightOk(){
|
|
|
+ this.moneyShow = true
|
|
|
+ },
|
|
|
radioChange(n) {
|
|
|
console.log('radioChange', n);
|
|
|
-
|
|
|
},
|
|
|
closepopup(){
|
|
|
this.show=false
|
|
|
@@ -516,9 +561,13 @@
|
|
|
confirmUnLoading(type) {
|
|
|
this.type=type
|
|
|
if(type == 4){
|
|
|
- this.alertTitle = '确认卸车？'
|
|
|
- this.confirmText = '确定'
|
|
|
- this.isShowAlert = true
|
|
|
+ if(this.totalFreight){
|
|
|
+ this.alertTitle = '确认卸车？'
|
|
|
+ this.confirmText = '确定'
|
|
|
+ this.isShowAlert = true
|
|
|
+ }else{
|
|
|
+ this.moneyShow = true
|
|
|
+ }
|
|
|
}else if(type == 6){
|
|
|
this.alertTitle = '确定驳回卸车信息？'
|
|
|
this.confirmText = '确定'
|
|
|
@@ -573,9 +622,11 @@
|
|
|
if (this.type == 3) _flag = 1
|
|
|
if (this.type == 4) _flag = 2
|
|
|
this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
|
|
|
- id: this.dataObj.id,
|
|
|
+ orderId: this.dataObj.id,
|
|
|
+ id: this.dataObj.hyCarrierInfo.id,
|
|
|
loadingFlag: _flag,
|
|
|
- flag: 1
|
|
|
+ flag: 1,
|
|
|
+ totalFreight:this.totalFreight,
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$refs.uToast.show({
|
|
|
@@ -773,10 +824,13 @@
|
|
|
getList() {
|
|
|
this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
|
|
|
id: this.id,
|
|
|
-
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.dataObj = res.data
|
|
|
+ if(this.dataObj.hyCarrierInfo.totalFreight){//货主确定卸车输入的 合计运费
|
|
|
+ this.totalFreight = this.dataObj.hyCarrierInfo.totalFreight
|
|
|
+ }
|
|
|
+
|
|
|
// 承运信息显示
|
|
|
if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
|
|
|
.cargoOwnerStatus != "已终止") {
|
|
|
@@ -1189,4 +1243,23 @@
|
|
|
background: #2772FB;
|
|
|
color: white;
|
|
|
}
|
|
|
+ .freight{
|
|
|
+ .freight_text{
|
|
|
+ font-size: 34rpx;
|
|
|
+ font-weight: 600;
|
|
|
+ margin-bottom: 20rpx;
|
|
|
+ }
|
|
|
+ .freight_up{
|
|
|
+ display: flex;
|
|
|
+ border-top: 1px solid #EEEEEE;
|
|
|
+ height: 60rpx;
|
|
|
+ background: red;
|
|
|
+ margin-top: 10px;
|
|
|
+ }
|
|
|
+ .freight_item{
|
|
|
+ width: 50%;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 50rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
zhongtianhaoyuan
