Skip to content

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

Merge branch 'feature/order_edit' into release

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