Commit 243462d2 authored by zhengyi's avatar zhengyi

国际化配置补充

parent 69f82761
...@@ -54,6 +54,7 @@ export default { ...@@ -54,6 +54,7 @@ export default {
route: { route: {
dashboard: "home page", dashboard: "home page",
profile: "profile", profile: "profile",
personalCenter: "Personal Center",
setting: "setting", setting: "setting",
advice: "advice", advice: "advice",
help: "help", help: "help",
...@@ -603,7 +604,7 @@ export default { ...@@ -603,7 +604,7 @@ export default {
no: "no", no: "no",
warehouseNum: "warehouseNum", warehouseNum: "warehouseNum",
entry: "receipt data ", entry: "receipt data ",
warehouseType: "warehouseType", warehouseType: "Type of warehouse entry",
customsType: "Customs declaration", customsType: "Customs declaration",
isCollection: "collection", isCollection: "collection",
activeFirst: "Details of the goods", activeFirst: "Details of the goods",
...@@ -626,6 +627,8 @@ export default { ...@@ -626,6 +627,8 @@ export default {
hiddenText: "Show", hiddenText: "Show",
showText: "Hide", showText: "Hide",
transInfo: "Transportation information", transInfo: "Transportation information",
packageType: 'special requirements',
packageRemarks: 'Special Requirements Remarks',
own: "selp pickup", own: "selp pickup",
toRoom: "to door", toRoom: "to door",
typeName: "value-added services", typeName: "value-added services",
...@@ -639,15 +642,21 @@ export default { ...@@ -639,15 +642,21 @@ export default {
tiedanPrice: "Does the bill of lading display the price", tiedanPrice: "Does the bill of lading display the price",
warehouseName: "Warehouse", warehouseName: "Warehouse",
externalWarehouse: "External warehouse", externalWarehouse: "External warehouse",
ownWarehouse: "Own warehouse",
estLoading: "Loading time", estLoading: "Loading time",
loadingAddress: "Loading address", loadingAddress: "Loading address",
creator: "creator", creator: "Creator",
customerManage: "Customer Manager", customerManage: "Customer Manager",
prodTitle: "item name", prodTitle: "item name",
inWarehouseInfo: "Warehouse entry information", inWarehouseInfo: "Warehouse entry information",
packing: "packing", packing: "packing",
expressNO: "express no",
tiandanExpressNO: "prefill express tracking number", tiandanExpressNO: "prefill express tracking number",
feeData: "Fee data", feeData: "Fee data",
member: "Member",
admin: "Admin",
createTime: "Create Time",
customerService: "Customer service",
}, },
customer: { customer: {
none: "none", none: "none",
...@@ -736,6 +745,8 @@ export default { ...@@ -736,6 +745,8 @@ export default {
refundWarehouse: "Return warehouse", refundWarehouse: "Return warehouse",
abnormal: "abnormal", abnormal: "abnormal",
edit: "edit", edit: "edit",
copy: "copy",
delete: "delete",
cancel: "cancel", cancel: "cancel",
refundOrderNo: "Return OrderNo", refundOrderNo: "Return OrderNo",
refundReason: "Return Reason", refundReason: "Return Reason",
......
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
route: { route: {
dashboard: "首页", dashboard: "首页",
profile: "个人中心", profile: "个人中心",
personalCenter: "个人中心",
setting: "个人设置", setting: "个人设置",
advice: "咨询建议", advice: "咨询建议",
help: "帮助", help: "帮助",
...@@ -606,6 +607,8 @@ export default { ...@@ -606,6 +607,8 @@ export default {
hiddenText: "隐藏", hiddenText: "隐藏",
showText: "展示", showText: "展示",
transInfo: "运输信息", transInfo: "运输信息",
packageType: '特殊要求',
packageRemarks: '特殊要求备注',
own: "自提", own: "自提",
toRoom: "送货上门", toRoom: "送货上门",
typeName: "增值服务", typeName: "增值服务",
...@@ -618,7 +621,8 @@ export default { ...@@ -618,7 +621,8 @@ export default {
customerUndertakes: "客户承接", customerUndertakes: "客户承接",
tiedanPrice: "提单是否显示价格", tiedanPrice: "提单是否显示价格",
warehouseName: "仓库", warehouseName: "仓库",
externalWarehouse: "外部仓", externalWarehouse: "外部仓库",
ownWarehouse: "自有仓",
estLoading: "装柜时间", estLoading: "装柜时间",
loadingAddress: "装柜地址", loadingAddress: "装柜地址",
creator: "创建人", creator: "创建人",
...@@ -626,8 +630,13 @@ export default { ...@@ -626,8 +630,13 @@ export default {
prodTitle: "品名", prodTitle: "品名",
inWarehouseInfo: "入仓信息", inWarehouseInfo: "入仓信息",
packing: "包装", packing: "包装",
expressNO: "快递单号",
tiandanExpressNO: "填单快递单号", tiandanExpressNO: "填单快递单号",
feeData: "收费数据", feeData: "收费数据",
member: "会员",
admin: "后台用户",
createTime: "创建时间",
customerService: "客户经理",
}, },
customer: { customer: {
none: "", none: "",
...@@ -716,6 +725,8 @@ export default { ...@@ -716,6 +725,8 @@ export default {
refundWarehouse: "申请退仓", refundWarehouse: "申请退仓",
abnormal: "处理", abnormal: "处理",
edit: "编辑", edit: "编辑",
copy: "复制",
delete: "删除",
cancel: "取消订单", cancel: "取消订单",
refundOrderNo: "退仓订单号", refundOrderNo: "退仓订单号",
refundReason: "退仓原因", refundReason: "退仓原因",
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
line-height: 42px; line-height: 42px;
margin-left: 5px; margin-left: 5px;
" "
>{{ $t("个人中心") }}</span >{{ $t("route.personalCenter") }}</span
> >
</div> </div>
</div> </div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:label="item.label" :label=" isChinese ? item.labelZh : item.labelEn "
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
...@@ -77,6 +77,12 @@ export default { ...@@ -77,6 +77,12 @@ export default {
] ]
} }
}, },
computed: {
isChinese() {
this.getCode = this.$t("login.getCode");
return this.$i18n.locale === "zh_CN";
},
},
created() { created() {
this.getList() this.getList()
}, },
......
...@@ -120,19 +120,19 @@ ...@@ -120,19 +120,19 @@
<el-descriptions-item v-else label=""> <el-descriptions-item v-else label="">
<!--占位--> <!--占位-->
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求')"> <el-descriptions-item :label="$t('orderdetail.packageType')">
<template v-if="order.packageType"> <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" /> <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> </template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求备注')"> <el-descriptions-item :label="$t('orderdetail.packageRemarks')">
{{ order.packageRemarks }} {{ order.packageRemarks }}
</el-descriptions-item> </el-descriptions-item>
<template v-if="showMore"> <template v-if="showMore">
<el-descriptions-item :label="$t('送货时间')"> <el-descriptions-item :label="$t('orderdetail.deliveryDate')">
{{ order.deliveryDate }} {{ order.deliveryDate }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')"> <el-descriptions-item :label="$t('orderdetail.warehouseType')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" /> <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
</el-descriptions-item> </el-descriptions-item>
...@@ -152,32 +152,32 @@ ...@@ -152,32 +152,32 @@
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }} {{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('代收货款')"> <el-descriptions-item :label="$t('orderdetail.isCollection')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template> <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('提单是否显示价格')"> <el-descriptions-item :label="$t('delivery.displayBillLading')">
{{order.displayBillLadingPrice ? $t('是') : $t('否')}} {{order.displayBillLadingPrice ? $t('orderdetail.is'):$t('orderdetail.no')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('仓库')"> <el-descriptions-item :label="$t('orderdetail.warehouseName')">
{{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }} {{order.isExternalWarehouse ? $t('orderdetail.externalWarehouse') : $t('orderdetail.ownWarehouse') }}
<template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" > <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
<div v-if="item.estLoadingTime || item.loadingAddress" :key="index"> <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
{{$t('装柜时间')}}{{item.estLoadingTime}} {{$t('orderdetail.estLoading')}}{{item.estLoadingTime}}
{{$t('装柜地址')}}{{item.loadingAddress}} {{$t('orderdetail.loadingAddress')}}{{item.loadingAddress}}
</div> </div>
</template> </template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('快递单号')"> <el-descriptions-item :label="$t('orderdetail.expressNO')">
{{order.number}} {{order.number}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('创建人')"> <el-descriptions-item :label="$t('orderdetail.creator')">
{{order.creatorName}} ({{order.userType == 1 ? $t('会员') : $t('后台用户')}}) {{order.creatorName}} ({{order.userType == 1 ? $t('orderdetail.member') : $t('orderdetail.admin')}})
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')"> <el-descriptions-item :label="$t('orderdetail.createTime')">
{{order.createTime|parseTime}} {{order.createTime|parseTime}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')"> <el-descriptions-item :label="$t('orderdetail.customerService')">
{{order.salesmanName}} {{order.salesmanName}}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<el-button v-if="scope.row.status == 2" size="mini" type="text" icon="el-icon-delete" @click="oprateOrder(scope.row.orderId)">{{ $t('postorder.cancel') }}</el-button> <el-button v-if="scope.row.status == 2" size="mini" type="text" icon="el-icon-delete" @click="oprateOrder(scope.row.orderId)">{{ $t('postorder.cancel') }}</el-button>
<el-button v-if="scope.row.status == 5" size="mini" type="text" icon="el-icon-edit" @click="refundWarehouse(scope.row)">{{ $t('postorder.refundWarehouse') }}</el-button> <el-button v-if="scope.row.status == 5" size="mini" type="text" icon="el-icon-edit" @click="refundWarehouse(scope.row)">{{ $t('postorder.refundWarehouse') }}</el-button>
<el-button v-if="scope.row.abnormalState>1&&scope.row.status!=88" size="mini" type="text" icon="el-icon-edit" @click="handleAbnormal(scope.row.orderId)">{{ $t('postorder.abnormal') }}</el-button> <el-button v-if="scope.row.abnormalState>1&&scope.row.status!=88" size="mini" type="text" icon="el-icon-edit" @click="handleAbnormal(scope.row.orderId)">{{ $t('postorder.abnormal') }}</el-button>
<el-button v-if="scope.row.status == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row.orderId)">{{ $t('删除') }}</el-button> <el-button v-if="scope.row.status == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row.orderId)">{{ $t('postorder.delete') }}</el-button>
<el-button v-if="scope.row.customsType == 2" size="mini" type="text" icon="el-icon-edit" @click.native="declarationOrderId=scope.row.orderId;declarationOrderNo=scope.row.orderNo">{{ $t('common.uploadDeclaration') }}</el-button> <el-button v-if="scope.row.customsType == 2" size="mini" type="text" icon="el-icon-edit" @click.native="declarationOrderId=scope.row.orderId;declarationOrderNo=scope.row.orderNo">{{ $t('common.uploadDeclaration') }}</el-button>
<el-button <el-button
v-if=" v-if="
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
@click.native="printTagOrderId=scope.row.orderId" @click.native="printTagOrderId=scope.row.orderId"
>{{ $t('打印标签') }} >{{ $t('打印标签') }}
</el-button> </el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)">{{ $t('复制') }}</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)">{{ $t('postorder.copy') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
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