Commit 779437d3 authored by Smile's avatar Smile Committed by wux

bug312 APP/WEB控货订单下载提单添加限制条件 ,添加分批放货提示语

parent b94a8fe7
...@@ -659,7 +659,8 @@ export default { ...@@ -659,7 +659,8 @@ export default {
member: 'Member', member: 'Member',
admin: 'Admin', admin: 'Admin',
createTime: 'Create Time', createTime: 'Create Time',
customerService: 'Customer service' customerService: 'Customer service',
noSeeBillLading: 'This order will be released in batches. Please contact the shipper to obtain the Bill of Lading (B/L).'
}, },
customer: { customer: {
none: 'none', none: 'none',
......
...@@ -637,7 +637,8 @@ export default { ...@@ -637,7 +637,8 @@ export default {
member: '会员', member: '会员',
admin: '后台用户', admin: '后台用户',
createTime: '创建时间', createTime: '创建时间',
customerService: '客户经理' customerService: '客户经理',
noSeeBillLading: '此订单分批放货,请与发货人联系获取提单。'
}, },
customer: { customer: {
none: '', none: '',
......
...@@ -303,7 +303,12 @@ ...@@ -303,7 +303,12 @@
<el-tab-pane :label="$t('orderdetail.activeThree')" name="three"> <el-tab-pane :label="$t('orderdetail.activeThree')" name="three">
<el-button type="text" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0" @click="showWarehouseReceipt=true">{{ $t('orderdetail.showWarehouseReceipt') }}</el-button> <el-button type="text" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0" @click="showWarehouseReceipt=true">{{ $t('orderdetail.showWarehouseReceipt') }}</el-button>
<el-button type="text" :disabled="!orderShowLadingStateStatus||(!order.tidanNo || order.ladingState==false)" @click.native="showLadingBill=true">{{ $t('orderdetail.showLadingBill') }}</el-button> <el-tooltip class="item" effect="dark" :content="$t('orderdetail.noSeeBillLading')" placement="top">
<span>
<el-button type="text" :disabled="!orderShowLadingStateStatus||(!order.tidanNo || order.ladingState==false)"
@click.native="showLadingBill=true">{{ $t('orderdetail.showLadingBill') }}</el-button>
</span>
</el-tooltip>
<el-button type="text" @click.native="declarationOrderId=order.orderId">{{ $t('common.seeDeclaration') }}</el-button> <el-button type="text" @click.native="declarationOrderId=order.orderId">{{ $t('common.seeDeclaration') }}</el-button>
<!-- <el-button :disabled="true" type="text">{{$t('orderdetail.装箱单未上传')}}</el-button> --> <!-- <el-button :disabled="true" type="text">{{$t('orderdetail.装箱单未上传')}}</el-button> -->
</el-tab-pane> </el-tab-pane>
......
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