Commit 034e4738 authored by honghy's avatar honghy Committed by 332784038@qq.com

修复

parent 74dea3c3
<template> <template>
<el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px"> <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
<el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px" > <el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('订单号')"> <el-form-item :label="$t('订单号')">
{{detail.orderNo}} {{ detail.orderNo }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('体积')"> <el-form-item :label="$t('体积')">
{{detail.sumVolume }} {{ detail.sumVolume }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('重量')"> <el-form-item :label="$t('重量')">
{{detail.sumWeight }}kg {{ detail.sumWeight }}kg
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('总箱数')"> <el-form-item :label="$t('总箱数')">
{{detail.sumNum }} {{ detail.sumNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('总控货箱数')"> <el-form-item :label="$t('总控货箱数')">
{{detail.sumNum}} {{ detail.sumNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('剩余放货箱数')"> <el-form-item :label="$t('剩余放货箱数')">
{{ detail.sumNum - detail.releaseNum }} {{ detail.sumNum - detail.releaseNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('到仓日期/卸柜日期')"> <el-form-item :label="$t('到仓日期/卸柜日期')">
{{detail.unloadTime|| '-'}} {{ detail.unloadTime || '-'}}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('放货锁定收货人到期')"> <el-form-item :label="$t('放货锁定收货人到期')">
{{ detail.lockConsigneeTime || '-' }} {{ detail.lockConsigneeTime || '-' }}
</el-form-item> </el-form-item>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<el-form-item :label="$t('收货人电话')" prop="consigneePhone"> <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> --> <!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
<div class="flex"> <div class="flex">
<area-code-selector v-model="formData.consigneeCountryCode" class="w-80" :disabled="disableUpdateCongsignee"/> <area-code-selector v-model="formData.consigneeCountryCode" class="w-80" :disabled="disableUpdateCongsignee"/>
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable :disabled="disableUpdateCongsignee" <el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable :disabled="disableUpdateCongsignee"
class="w-120 flex-1 ml-5"></el-input> class="w-120 flex-1 ml-5"></el-input>
</div> </div>
...@@ -131,20 +131,13 @@ ...@@ -131,20 +131,13 @@
<el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable <el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable
class="w-150 mr-10"></el-input> class="w-150 mr-10"></el-input>
<!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> --> <!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
<send-sms-code :form="{ <send-sms-code :order-id="detail.orderId" scene="5"/>
orderId: detail.orderId, </el-form-item>
nodeValue: 'delivery-verification-sms', <el-form-item label="" style="margin-top:20px">
isTransport: 0, <el-button type="success" @click="submit">{{ $t('确认提货') }}</el-button>
transportId: 0, <el-button type="default" @click="closeDialog">{{ $t('关闭') }}</el-button>
isOrders: 0, </el-form-item>
}" </el-form>
/>
</el-form-item>
<el-form-item label="" style="margin-top:20px">
<el-button type="success" @click="submit">{{$t('确认提货')}}</el-button>
<el-button type="default" @click="closeDialog">{{$t('关闭')}}</el-button>
</el-form-item>
</el-form>
<div v-else> <div v-else>
<!-- <release-agreement /> --> <!-- <release-agreement /> -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment