Commit 9480a718 authored by zhengyi's avatar zhengyi

控货订单放货业务修改

parent acce30d2
...@@ -15,41 +15,72 @@ ...@@ -15,41 +15,72 @@
label-width="100px" label-width="100px"
> >
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('release.orderNo')"> <el-form-item :label="$t('release.orderNo')">
{{ detail.orderNo }} {{ detail.orderNo }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('release.sumNum')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('release.sumVolume')"> {{ detail.sumVolume }}</el-form-item> <el-form-item :label="$t('release.sumVolume')"> {{ detail.sumVolume }}</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('release.sumWeight')"> {{ detail.sumWeight }}kg </el-form-item> <el-form-item :label="$t('release.sumWeight')"> {{ detail.sumWeight }}kg </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('release.sumNum')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('release.sumConNum')"> <el-form-item :label="$t('release.sumConNum')">
{{ detail.sumNum }} {{ detail.sumNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item :label="$t('release.remainNum')"> <el-form-item :label="$t('release.remainNum')">
{{ detail.sumNum - detail.releaseNum }} {{ detail.sumNum - detail.releaseNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item :label="$t('release.unloadTime')">
{{ detail.unloadTime || '-'}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('release.lockConsigneeTime')">
{{ detail.lockConsigneeTime || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('release.limitUpdateConsignee')">
{{ detail.isLimitUpdateConsignee ? $t("release.yes") : $t("release.no") }}
</el-form-item>
</el-col>
</el-row> </el-row>
<div class="title">{{ $t('release.releaseNotice') }}</div> <div class="title flex">
<div>
{{ $t('release.releaseNotice') }}
</div>
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() <= (new Date(detail.lockConsigneeTime)).getTime()">
{{$t('release.releaseNotesOne')}}
</div>
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() > (new Date(detail.lockConsigneeTime)).getTime()">
{{$t('release.releaseNotesTwo')}}
</div>
<div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && !detail.unloadTime">
{{$t('release.releaseNotesThree')}}
</div>
<div class="ml-20 red" v-if="!detail.isLimitUpdateConsignee">
{{$t('release.releaseNotesFour')}}
</div>
</div>
<div class="flex"> <div class="flex">
<el-form-item :label="$t('release.consigneeName')" prop="consigneeName"> <el-form-item :label="$t('release.consigneeName')" prop="consigneeName">
<el-input <el-input
v-model="formData.consigneeName" v-model="formData.consigneeName"
:placeholder="$t('release.consigneeNameNotice')" :placeholder="$t('release.consigneeNameNotice')"
clearable clearable
:disabled="isSuccess" :disabled="disableUpdateCongsignee || isSuccess"
class="w-150" class="w-150"
/> />
</el-form-item> </el-form-item>
...@@ -58,7 +89,7 @@ ...@@ -58,7 +89,7 @@
v-model="formData.consigneePhone" v-model="formData.consigneePhone"
:placeholder="$t('release.consigneePhoneNotice')" :placeholder="$t('release.consigneePhoneNotice')"
clearable clearable
:disabled="isSuccess" :disabled="disableUpdateCongsignee || isSuccess"
class="w-250 ml-10" class="w-250 ml-10"
> >
<el-select slot="prepend" v-model="formData.consigneeCountryCode" placeholder="" style="width:100px"> <el-select slot="prepend" v-model="formData.consigneeCountryCode" placeholder="" style="width:100px">
...@@ -70,7 +101,7 @@ ...@@ -70,7 +101,7 @@
v-model="formData.consigneeEmail" v-model="formData.consigneeEmail"
:placeholder="$t('release.consigneeEmailNotice')" :placeholder="$t('release.consigneeEmailNotice')"
clearable clearable
:disabled="isSuccess" :disabled="disableUpdateCongsignee || isSuccess"
class="w-150" class="w-150"
/> />
</el-form-item> </el-form-item>
...@@ -204,6 +235,14 @@ export default { ...@@ -204,6 +235,14 @@ export default {
t = this.$t('release.releaseSuccess') t = this.$t('release.releaseSuccess')
} }
return t return t
},
disableUpdateCongsignee(){
if(!this.detail?.isLimitUpdateConsignee) return false
// 锁定且过期了返回false,其他情况全部是true
if(this.detail.isLimitUpdateConsignee && this.detail.lockConsigneeTime && new Date(this.detail.lockConsigneeTime).getTime() < Date.now()){
return false
}
return true
} }
}, },
created() { created() {
......
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