Skip to content

J
jiedao-web-master
Commit 0dc772a6 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

修复部分bug

parent 41a0d114
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 85 deletions
src/views/jiedao/profile/delivery.vue
View file @ 0dc772a6
...@@ -813,7 +813,7 @@ ...@@ -813,7 +813,7 @@
</el-descriptions-item> </el-descriptions-item>
<!--付款人--> <!--付款人-->
<el-descriptions-item :label="$t('delivery.drawee')" :span="2"> <el-descriptions-item :label="$t('delivery.drawee')">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t("delivery.drawee") }}</span> ><span style="color: red">*</span>{{ $t("delivery.drawee") }}</span>
...@@ -827,7 +827,6 @@ ...@@ -827,7 +827,6 @@
<dict-selector <dict-selector
v-model="form.drawee" v-model="form.drawee"
:type="DICT_TYPE.DRAWEE" :type="DICT_TYPE.DRAWEE"
:filter="(e) => e.value == '1' || e.value == '2'"
defaultable defaultable
form-type="radio" form-type="radio"
/> />
...@@ -847,6 +846,15 @@ ...@@ -847,6 +846,15 @@
</template> </template>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('提单是否显示价格')" >
<el-form-item prop="displayBillLadingPrice">
<el-radio-group v-model="form.displayBillLadingPrice">
<el-radio :label="true">{{$t('显示')}}</el-radio>
<el-radio :label="false">{{$t('不显示')}}</el-radio>
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<!--入仓类型--> <!--入仓类型-->
<el-descriptions-item :label="$t('delivery.warehouseType')"> <el-descriptions-item :label="$t('delivery.warehouseType')">
<span <span
...@@ -1199,7 +1207,7 @@ ...@@ -1199,7 +1207,7 @@
@click="submitForm(2, false)" @click="submitForm(2, false)"
:disabled="isOverSeaWareHouse" :disabled="isOverSeaWareHouse"
>{{ $t("提交") }}</el-button> >{{ $t("提交") }}</el-button>
<el-button @click="$router.back()">{{ $t("common.cancel") }}</el-button> <el-button @click="handleCancel">{{ $t("common.cancel") }}</el-button>
</el-form-item> </el-form-item>
<div style="padding-bottom: 20px; font-size: 12px; color: red" v-if="isOverSeaWareHouse"> <div style="padding-bottom: 20px; font-size: 12px; color: red" v-if="isOverSeaWareHouse">
{{$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'})}} {{$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'})}}
...@@ -1625,6 +1633,7 @@ export default { ...@@ -1625,6 +1633,7 @@ export default {
destCountryId: null, destCountryId: null,
countryCode: '86', countryCode: '86',
objectiveId: '', objectiveId: '',
departureId: '',
status: 0, status: 0,
consigneeName: '', consigneeName: '',
consigneePhone: '', consigneePhone: '',
...@@ -1640,7 +1649,8 @@ export default { ...@@ -1640,7 +1649,8 @@ export default {
drawee: 2, drawee: 2,
type: [], type: [],
orderItemVOList: [], orderItemVOList: [],
externalWarehouseDtoList:[] externalWarehouseDtoList:[],
displayBillLadingPrice: true
}, },
// 总条数 // 总条数
total: 0, total: 0,
...@@ -1963,8 +1973,8 @@ export default { ...@@ -1963,8 +1973,8 @@ export default {
console.log(harvestMethod) console.log(harvestMethod)
}, },
// 服务 // 服务
'form.type'(type){ 'form.type'(type, oldType){
if(type.indexOf('2') > -1){ if(type.indexOf('2') > -1 && oldType?.indexOf('2') == -1){
this.$alert(this.$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'})) this.$alert(this.$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'}))
} }
}, },
...@@ -2568,8 +2578,7 @@ export default { ...@@ -2568,8 +2578,7 @@ export default {
item.channelIds = Array.from(item.channelIdSet).join(',') item.channelIds = Array.from(item.channelIdSet).join(',')
} }
}) })
this.form.type = this.form.type = this.form.type?.join(",")
this.form.type.length > 0 ? this.form.type.toString : ''
this.form.status = status this.form.status = status
// 修改的提交 // 修改的提交
if (this.form.orderId) { if (this.form.orderId) {
...@@ -2620,6 +2629,10 @@ export default { ...@@ -2620,6 +2629,10 @@ export default {
this.$bus.$emit('reload') this.$bus.$emit('reload')
}) })
}) })
},
async handleCancel(){
await this.$confirm(this.$t("是否需要返回?"))
this.$router.back()
} }
} }
} }
......
src/views/jiedao/profile/orderdetail.vue
View file @ 0dc772a6
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
<div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" /> <div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" />
<span style="font-size: 18px;font-weight: 500;color: #333;line-height: 26px;margin-left: 5px;">{{ $t('orderdetail.consignorName') }}</span> <span style="font-size: 18px;font-weight: 500;color: #333;line-height: 26px;margin-left: 5px;">{{ $t('orderdetail.consignorName') }}</span>
</div> </div>
<el-descriptions class="margin-top" border :column="2" :content-style="{width:'130px'}"> <el-descriptions class="margin-top" border :column="2">
<el-descriptions-item :label="$t('orderdetail.consignorName')" label-style="width:150px">{{ order.consignorVO.name }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorName')" label-style="width:120px">{{ order.consignorVO.name }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorPhone')" label-style="width:150px">+{{ order.consignorVO.countryCode }} {{ order.consignorVO.phone }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorPhone')" label-style="width:120px">+{{ order.consignorVO.countryCode }} {{ order.consignorVO.phone }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions v-if="showMore" border :column="3" :content-style="{width:'130px'}"> <el-descriptions v-if="showMore" border :column="3" :content-style="{width:'100px'}">
<el-descriptions-item :label="$t('orderdetail.consignorNameEn')" label-style="width:150px">{{ order.consignorVO.nameEn }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorNameEn')" label-style="width:120px">{{ order.consignorVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorCompany')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consignorCompany')" label-style="width:120px">
{{ order.consignorVO.company }} {{ order.consignorVO.company }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorCompanyEn')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consignorCompanyEn')" label-style="width:120px">
{{ order.consignorVO.companyEn }} {{ order.consignorVO.companyEn }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorEmail')" label-style="width:150px">{{ order.consignorVO.email }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorEmail')" label-style="width:120px">{{ order.consignorVO.email }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -38,28 +38,28 @@ ...@@ -38,28 +38,28 @@
</div> </div>
<span style="color:#409EFF;margin-left:100px;font-size:16px" @click="consigneeChange">{{ consigneeText }}</span> <span style="color:#409EFF;margin-left:100px;font-size:16px" @click="consigneeChange">{{ consigneeText }}</span>
</div> </div>
<el-descriptions class="margin-top" border :column="2" :content-style="{width:'130px'}"> <el-descriptions class="margin-top" border :column="2">
<el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:150px">{{ consigneeVO.name }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:120px">{{ consigneeVO.name }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:120px">
<template v-if="consigneeVO.countryCode"> <template v-if="consigneeVO.countryCode">
+{{ consigneeVO.countryCode }} +{{ consigneeVO.countryCode }}
</template> </template>
{{ consigneeVO.phone }} {{ consigneeVO.phone }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}"> <el-descriptions class="margin-top" border :column="3">
<el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:150px">{{consigneeVO?(consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item> <el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:120px">{{consigneeVO?(consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.deliveryaddress')" label-style="width:150px">{{ addressName }}</el-descriptions-item> <el-descriptions-item :label="$t('delivery.deliveryaddress')" label-style="width:120px">{{ addressName }}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{consigneeVO?consigneeVO.address:''}}</el-descriptions-item> <el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{consigneeVO?consigneeVO.address:''}}</el-descriptions-item>
<template v-if="showMore"> <template v-if="showMore">
<el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ consigneeVO.nameEn }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:120px">{{ consigneeVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:120px">
{{ consigneeVO.company }} {{ consigneeVO.company }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:120px">
{{ consigneeVO.companyEn }} {{ consigneeVO.companyEn }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ consigneeVO.email }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:120px">{{ consigneeVO.email }}</el-descriptions-item>
</template> </template>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
...@@ -91,70 +91,99 @@ ...@@ -91,70 +91,99 @@
<div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" /> <div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" />
<span style="font-size: 18px;font-weight: 500;color: #333;line-height: 26px;margin-left: 5px;">{{ $t('orderdetail.baseInfo') }}</span> <span style="font-size: 18px;font-weight: 500;color: #333;line-height: 26px;margin-left: 5px;">{{ $t('orderdetail.baseInfo') }}</span>
</div> </div>
<el-row> <el-descriptions class="margin-top" border :column="2">
<el-col> <el-descriptions-item :label="$t('orderdetail.marks')">{{ order.marks }}</el-descriptions-item>
<el-descriptions class="margin-top" border :column="2"> <el-descriptions-item :label="$t('orderdetail.costVO')">
<el-descriptions-item :label="$t('orderdetail.marks')">{{ order.marks }}</el-descriptions-item> {{ order.costVO.totalNum }}{{ $t('orderdetail.box') }} {{ order.costVO.totalWeight }}Kg {{ order.costVO.totalVolume }}m³ {{ order.costVO.totalQuantity }}{{ $t('price.one') }}
<el-descriptions-item :label="$t('orderdetail.costVO')"> </el-descriptions-item>
{{ order.costVO.totalNum }}{{ $t('orderdetail.box') }} {{ order.costVO.totalWeight }}Kg {{ order.costVO.totalVolume }}m³ {{ order.costVO.totalQuantity }}{{ $t('price.one') }} <el-descriptions-item :label="$t('orderdetail.warehouseNum')">
</el-descriptions-item> {{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.sumVolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }}
<el-descriptions-item :label="$t('orderdetail.warehouseNum')"> </el-descriptions-item>
{{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.sumVolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }} <el-descriptions-item :label="$t('orderdetail.entry')">
</el-descriptions-item> {{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.wvolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }}
<el-descriptions-item :label="$t('orderdetail.entry')"> </el-descriptions-item>
{{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.wvolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }} <el-descriptions-item :label="$t('prepayDeal.drawee')">
</el-descriptions-item> <span v-if="order.drawee==1">{{ $t('orderdetail.consignor') }}</span>
<el-descriptions-item :label="$t('prepayDeal.drawee')"> <span v-else-if="order.drawee==2">{{ $t('orderdetail.consignee') }}</span>
<span v-if="order.drawee==1">{{ $t('orderdetail.consignor') }}</span> <span v-else>{{order.customDraweeVOList?order.customDraweeVOList[0].name:''}}</span>
<span v-else-if="order.drawee==2">{{ $t('orderdetail.consignee') }}</span> </el-descriptions-item>
<span v-else>{{order.customDraweeVOList?order.customDraweeVOList[0].name:''}}</span>
</el-descriptions-item>
<!--单证报关--> <!--单证报关-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('orderdetail.customsType')"> <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('orderdetail.customsType')">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-else label=""> <el-descriptions-item v-else label="">
<!--占位--> <!--占位-->
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.isCargoControl')">{{ order.isCargoControl?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.isCargoControl')">{{ order.isCargoControl?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.objectport')">{{ order.productRecord==1? $t('orderdetail.ourUndertakes'):$t('orderdetail.customerUndertakes')}}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.objectport')" v-if="[3, 4].indexOf(+order.transportId) > -1">
<el-descriptions-item :label="$t('特殊要求')"> {{ order.productRecord==1? $t('orderdetail.ourUndertakes'):$t('orderdetail.customerUndertakes')}}
<template v-if="order.packageType"> </el-descriptions-item>
<dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" :key="packageType" class="mr-10" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" /> <el-descriptions-item v-else label="">
</template> <!--占位-->
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求备注')"> <el-descriptions-item :label="$t('特殊要求')">
{{ order.packageRemarks }} <template v-if="order.packageType">
</el-descriptions-item> <dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" :key="packageType" class="mr-10" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
</template>
</el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求备注')">
{{ order.packageRemarks }}
</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('delivery.issuingMethod')"> <el-descriptions-item :label="$t('送货时间')">
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" /> {{ order.deliveryDate }}
</el-descriptions-item> --> </el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('关联报价单')"> <!--下面几个是空运特有字段-->
{{ offerNumber }} <!--清关证书-->
</el-descriptions-item> --> <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
</el-descriptions> <!--清关证书备注-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')">
{{ order.clearCertRemark }}
</el-descriptions-item>
<!--是否拆包-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')">
{{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--单票立刻转运-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')">
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--下面几个是空运特有字段--> <el-descriptions-item :label="$t('代收货款')">
<!--清关证书--> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item> <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
<!--清关证书备注--> </el-descriptions-item>
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')"> <el-descriptions-item :label="$t('提单是否显示价格')">
{{ order.clearCertRemark }} {{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item> </el-descriptions-item>
<!--是否拆包--> <el-descriptions-item :label="$t('仓库')">
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')"> {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
{{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }} <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
</el-descriptions-item> <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
<!--单票立刻转运--> {{$t('装柜时间')}}： {{item.estLoadingTime}}
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')"> {{$t('装柜地址')}}：{{item.loadingAddress}}
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }} </div>
</el-descriptions-item> </template>
</el-col> </el-descriptions-item>
</el-row> <el-descriptions-item :label="$t('快递单号')">
{{order.number}}
</el-descriptions-item>
<el-descriptions-item :label="$t('创建人')">
{{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">
{{order.salesmanName}}
</el-descriptions-item>
</el-descriptions>
<!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;"> <!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;">
<div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" /> <div style="width: 6px;height: 26px;background: #659FD5;border-radius: 0px 6px 6px 0px;" />
......
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