Skip to content

J
jiedao-app-operator-master
Commit 8c80ed35 authored by huhaiqing's avatar huhaiqing
Browse files
Options

海运国际化补充

parent 696e7e80
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 65 deletions
src/components/FileUpload/index.vue
View file @ 8c80ed35
......@@ -15,7 +15,7 @@
ref="upload"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button>
<el-button size="mini" type="primary">{{$t('选取文件')}}</el-button>
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
......
src/i18n/languages/en_US.json
View file @ 8c80ed35
......@@ -2300,5 +2300,22 @@
"为了方便统计收款单核销比例，将所有银行收款明细中状态为已核销的实收金额，转换为核销基准币种的金额累加": "In order to facilitate the statistics of the write-off ratio of receipts, the actual received amount in the status of write-off in all bank receipt details is converted into the amount of write-off base currency",
"总核销比例": "Total write-off ratio",
"总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额": "Total write-off ratio = total written-off amount in base currency after write-off/total receivable amount in base currency after write-off",
"身份证审核状态": "ID card verification status"
"身份证审核状态": "ID card verification status",
"延迟时间": "delay",
"请输入 小": "Please enter small",
"请输入 大": "Please enter large",
"已实装箱数/总箱数": "Number of boxes already loaded/total number of boxes",
"下单统计：{orderSum} 箱 {orderV} m³ {orderW} kg 入仓统计：{leviteSum} 箱 {leviteV} m³ {leviteW} kg": "Order Statistics：{orderSum} box {orderV} m³ {orderW} kg Warehouse statistics：{leviteSum} box {leviteV} m³ {leviteW} kg",
"混合报关": "",
"VGM声明": "",
"请输入VGM重量": "",
"您确认提交全部退场审核吗？": "",
"您确认提交部分退场审核吗？": "",
"请输入费用": "",
"未审核": "",
"提单号M/BL NO.": "",
"毛重(KGS)": "",
"立方数(CBM)": "",
"选取文件": "",
"查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": ""
}
src/i18n/languages/zh_CN.json
View file @ 8c80ed35
......@@ -273,5 +273,22 @@
"您确认要全部核销吗":"您确认要全部核销吗",
"上传中":"上传中",
"上传失败":"上传失败",
"确定移除":"确定移除"
"确定移除":"确定移除",
"延迟时间": "延迟时间",
"请输入 小": "请输入 小",
"请输入 大": "请输入 大",
"已实装箱数/总箱数": "已实装箱数/总箱数",
"下单统计：{orderSum} 箱 {orderV} m³ {orderW} kg 入仓统计：{leviteSum} 箱 {leviteV} m³ {leviteW} kg": "下单统计：{orderSum} 箱 {orderV} m³ {orderW} kg 入仓统计：{leviteSum} 箱 {leviteV} m³ {leviteW} kg",
"混合报关": "混合报关",
"VGM声明": "VGM声明",
"请输入VGM重量": "请输入VGM重量",
"您确认提交全部退场审核吗？": "您确认提交全部退场审核吗？",
"您确认提交部分退场审核吗？": "您确认提交部分退场审核吗？",
"请输入费用": "请输入费用",
"未审核": "未审核",
"提单号M/BL NO.": "提单号M/BL NO.",
"毛重(KGS)": "毛重(KGS)",
"立方数(CBM)": "立方数(CBM)",
"选取文件": "选取文件",
"查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}"
}
src/views/ecw/box/editForm.vue
View file @ 8c80ed35
......@@ -3,7 +3,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item :label="$t('运输方式')" prop="transportType">
<el-radio-group v-model="form.transportType">
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'value')">{{dict.label}}</el-radio>
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'value')">{{$l(dict, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
......
src/views/ecw/box/indexSea.vue
View file @ 8c80ed35
......@@ -296,6 +296,7 @@ export default {
this.transportTypes = this.getDictDatas(
this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "1" || item.value == "2");
console.log(this.transportTypes)
getWarehouseList().then((res) => (this.warehouseList = res.data));
getCabinetPage(null).then((response) => {
this.cabinetList = response.data.list;
......
src/views/ecw/box/ladingBill/index.vue
View file @ 8c80ed35
......@@ -14,7 +14,7 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item, 'prodTitle')}}</p>
<p>{{$t('品牌')}}：【
<span v-if="item.feeType === 0">无品牌</span>
<dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
......@@ -27,7 +27,7 @@
</el-table-column>
<el-table-column :label="$t('控货')" align="center" prop="">
<template slot-scope="scope">
{{scope.row.isCargoControl ? '是' : '否' }}
{{scope.row.isCargoControl ? $t('是') : $t('否') }}
</template>
</el-table-column>
<el-table-column :label="$t('计划箱数')" align="center" prop="num">
......@@ -75,7 +75,7 @@
<el-row>
<el-col class="totle-info">
<div>{{$t('总计')}}：{{getSumData}}</div>
<div>容量：{{calcCapacity}}</div>
<div>{{$t('容量')}}：{{calcCapacity}}</div>
</el-col>
</el-row>
......@@ -243,7 +243,7 @@ export default {
computed: {
/* 总计 */
getSumData() {
return `${this.billData.totalNum ?? 0}箱 ${
return `${this.billData.totalNum ?? 0}${this.$t('箱')} ${
this.billData.totalVolume ?? 0
}m³ ${this.billData.totalWeight ?? 0}kg`;
},
......
src/views/ecw/box/regError.vue
View file @ 8c80ed35
......@@ -20,7 +20,7 @@
<el-form-item :label="$t('异常时间')" prop="arrivalTime" class="three-element">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<div class="delayTime">延迟时间：{{delayDay}}天</div>
<div class="delayTime">{{$t('延迟时间')}}：{{delayDay}}{{$t('天')}}</div>
</el-form-item>
<el-form-item :label="$t('通知人')">
......
src/views/ecw/box/shippingDetail.vue
View file @ 8c80ed35
......@@ -12,7 +12,7 @@
<el-descriptions-item :label="$t('柜型')">
{{cabinetLabel}}
</el-descriptions-item>
<el-descriptions-item label="体积/重量">
<el-descriptions-item :label="$t('体积/重量')">
{{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item>
<el-descriptions-item :label="$t('货柜状态')">
......
src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue
View file @ 8c80ed35
......@@ -6,7 +6,7 @@
</el-form-item>
<el-form-item :label="$t('仓库')">
<el-select v-model="cabinetObj.ldWarehouseType" :placeholder="$t('请选择仓库')" filterable>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="$l(warehouse,'title')" :value="warehouse.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
......@@ -56,7 +56,9 @@ export default {
cabinetObj: {},
// 校验
rules: {
ldBoxTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
ldBoxTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
},
};
},
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 8c80ed35
......@@ -9,11 +9,11 @@
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已实装箱数/总箱数">
<el-descriptions-item :label="$t('已实装箱数/总箱数')">
<span>{{currRow.installNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
{{orderData.status==99?'异常':'正常'}}
{{orderData.status==99? $t('异常'):$t('正常')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate}}
......@@ -181,37 +181,37 @@
<el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
<el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="100px">
<el-row>
<el-form-item label="中文品名:" prop="zhId">
<el-form-item :label="$t('中文品名')+'：'" prop="zhId">
<el-select v-model="shopForm.zhId" :placeholder="$t('请选择中文品名')" @change="changeProdTitleZh">
<el-option v-for="item in orderItems" :label="item.prodTitleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="英文品名:" prop="enId">
<el-form-item :label="$t('英文品名')+'：'" prop="enId">
<el-select v-model="shopForm.enId" :placeholder="$t('请选择英文品名')" @change="changeProdTitleEn">
<el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="剩余箱数:">
<el-form-item :label="$t('剩余箱数')+'：'">
{{shopForm.num||0}}
</el-form-item>
</el-col>
<el-col :span="12" v-show="isQuantity">
<el-form-item label="剩余数量(个):">
<el-form-item :label="$t('剩余数量(个)')+'：'">
{{shopForm.quantity||0}}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="放入箱数:">
<el-form-item :label="$t('放入箱数')+'：'">
{{shopForm.num||0}}
</el-form-item>
<el-form-item label="放入数量(个):" prop="putQuantity" v-show="isQuantity">
<el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="备注信息:">
<el-form-item :label="$t('备注信息')+'：'">
<el-input v-model="shopForm.remarks"></el-input>
</el-form-item>
</el-row>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 8c80ed35
......@@ -52,7 +52,7 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item,'prodTitle')}}</p>
<p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
</p>
......@@ -91,7 +91,7 @@
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">{{$t('移出')}}</el-button>
<el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder','拆单')">{{$t('拆单')}}</el-button>
<el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder', $t('拆单'))">{{$t('拆单')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -123,9 +123,9 @@
</div>
<!-- 操作 -->
<div v-if="!isUnderReview">
<el-button type="primary" @click="handlerClick('supplementOrder','补单')">{{$t('补单')}}</el-button>
<el-button type="primary" @click="handlerClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
<el-button type="primary" @click="applyCloseCabinet">{{$t('封柜申请')}}</el-button>
<el-button type="primary" @click="handlerClick('modifyCabinet','修改柜信息')">{{$t('修改柜信息')}}</el-button>
<el-button type="primary" @click="handlerClick('modifyCabinet',$t('修改柜信息'))">{{$t('修改柜信息')}}</el-button>
</div>
<div v-if="isUnderReview">
<el-button type="primary" @click="jumpReviewDetail">{{$t('封柜审核中')}}</el-button>
......@@ -150,7 +150,7 @@
<el-form ref="modifyForm" :rules="rules" :model="modifyCabinetObj" label-width="80px">
<el-form-item :label="$t('起运仓库')" prop="startWarehouseId">
<el-select v-model="modifyCabinetObj.startWarehouseId" :placeholder="$t('请选择仓库')" filterable>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="$l(warehouse, 'title')" :value="warehouse.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('预装日期')">{{preinstallDate}}</el-form-item>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
View file @ 8c80ed35
......@@ -66,7 +66,7 @@
</el-row>
<!-- 表格 -->
<el-scrollbar style="height:calc(100% - 124px)">
<el-scrollbar style="height:calc(100% - 164px)">
<el-row v-for="(item, index) in toBePreList" :key="index" class="toBePre-table">
<el-row class="table-title">
<div>{{item.orderNo}}</div>
......@@ -84,7 +84,11 @@
<div v-show="!item.fold">
<el-table v-loading="loading" :data="item.boxOrderItemList" border>
<el-table-column :label="$t('序号')" type="index" align="center" width="50" />
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" />
<el-table-column :label="$t('品名')" align="center" prop="" min-width="500">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120">
<template slot-scope="scope">
<template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
......
src/views/ecw/box/shippingSea/nodePage/cusClearance.vue
View file @ 8c80ed35
......@@ -46,8 +46,12 @@ export default {
cusClearanceObj: {},
// 校验
rules: {
clEstTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
clClearTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
clEstTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
clClearTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
},
// 弹窗配置
dialogVisible: false,
......@@ -76,10 +80,10 @@ export default {
getClAgent(type) {
const agentId = this.$attrs.shipmentObj.agentInfo.agentId;
if (type === "label") {
return (
this.$attrs.allSupplier.find((item) => item.id === agentId)
?.companyZh ?? agentId
const selected = this.$attrs.allSupplier.find(
(item) => item.id === agentId
);
return this.$l(selected, "company") ?? agentId;
}
return agentId;
},
......
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 8c80ed35
......@@ -16,12 +16,12 @@
<el-form-item :label="$t('货重')" prop="dcGoodsWgt">
<el-input v-model="cusDeclarationObj.dcGoodsWgt" :placeholder="$t('请输入货重')" clearable />
</el-form-item>
<el-form-item label="VGM重量">
<el-input v-model="cusDeclarationObj.dcVgmWgt" placeholder="请输入VGM重量" clearable />
<el-form-item :label="$t('VGM重量')">
<el-input v-model="cusDeclarationObj.dcVgmWgt" :placeholder="$t('请输入VGM重量')" clearable />
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType">
<el-select v-model="cusDeclarationObj.dcCustomsType" :placeholder="$t('请选择报关方式')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('正常报关订单')" v-show="isShowNormal">
......@@ -40,7 +40,7 @@
</el-form-item>
<el-form-item :label="$t('状态')" prop="dcCustomsStatus">
<el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || isCheckDeal('status')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{item.label}}</el-radio>
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -48,7 +48,7 @@
<div v-show="cusDeclarationObj.dcCustomsStatus === '3'">
<el-form-item :label="$t('查验')">
<el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview || isCheckDeal('check')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{item.label}}</el-radio>
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{$l(item, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
</div>
......@@ -317,7 +317,7 @@ export default {
},
getButtonLabel(documentInfo = []) {
const newList = Array.from(new Set(documentInfo));
return newList.length >= 2 ? "混合报关" : "VGM声明";
return newList.length >= 2 ? this.$t("混合报关") : this.$t("VGM声明");
},
submitCustomsCreate(operateType) {
customsCreate({
......@@ -366,10 +366,10 @@ export default {
// 退场审核状态,1-审核中，2-审核成功，3-审核失败，4-取消
if ([0, 2, 3, 4].includes(checkExamineStatus)) {
this.$modal
.confirm(
.confirm(this.$t(
`您确认提交${
dcCheckStatus === "1" ? "全部退场" : "部分退场"
}审核吗？`
}审核吗？`)
)
.then(() => {
customsCreate({
......@@ -393,7 +393,7 @@ export default {
/* 查询订单号 */
searchOrder() {
if (!this.orderNo) {
this.$message.error("请输入订单号");
this.$message.error(this.$t("请输入订单号"));
return;
}
extraCostOrder({
......@@ -422,7 +422,7 @@ export default {
/* 创建额外费用 */
createExtraCost(row) {
if (!row.fee) {
this.$message.error("请输入费用");
this.$message.error(this.$t("请输入费用"));
return;
}
extraCostCreate({
......@@ -439,7 +439,7 @@ export default {
/* 修改额外费用 */
updateExtraCost(row) {
if (!row.fee) {
this.$message.error("请输入费用");
this.$message.error(this.$t("请输入费用"));
return;
}
extraCostUpdate(row).then((res) => {
......@@ -620,7 +620,7 @@ export default {
? this.$t("审核通过，退场中")
: this.$t("审核通过，部分退场中");
}
return "未审核";
return this.$t("未审核");
},
/* 判断是否已处理 */
isCheckDeal() {
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 8c80ed35
......@@ -17,17 +17,17 @@
</el-form-item>
<el-form-item :label="$t('状态')" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" :placeholder="$t('请选择状态')" clearable size="small">
<el-option v-for="item in stateOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in stateOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('备案')" prop="productRecord">
<el-select v-model="queryParams.productRecord" :placeholder="$t('请选择备案')" clearable size="small">
<el-option v-for="item in filingOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in filingOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsType">
<el-select v-model="queryParams.customsType" :placeholder="$t('请选择报关方式')" clearable size="small">
<el-option v-for="item in declarationMethodOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in declarationMethodOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('待预装订单')" prop="toBePreOrderNo">
......@@ -40,10 +40,10 @@
<el-input v-model="queryParams.itemName" :placeholder="$t('请输入品名')" clearable />
</el-form-item>
<el-form-item :label="$t('重货比')" prop="weightRatioMax">
<el-input v-model="queryParams.weightRatioMax" placeholder="请输入 大" clearable />
<el-input v-model="queryParams.weightRatioMax" :placeholder="$t('请输入 大')" clearable />
</el-form-item>
<el-form-item label="" prop="weightRatioMin">
<el-input v-model="queryParams.weightRatioMin" placeholder="请输入 小" clearable />
<el-input v-model="queryParams.weightRatioMin" :placeholder="$t('请输入 小')" clearable />
</el-form-item>
<el-form-item>
......@@ -137,7 +137,11 @@
{{formatDate(scope.row.rucangTime)}}
</template>
</el-table-column>
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" width="120" />
<el-table-column :label="$t('品名')" align="center" prop="" width="120">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
<template slot-scope="scope">
......@@ -237,11 +241,16 @@
</el-row>
<el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
<el-table-column type="index" align="center" :label="$t('序号')" width="50" />
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('品名')" align="center" prop="">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
<template>{{row.brandName}}</template>
（<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />）
（
<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />）
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" />
......
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
View file @ 8c80ed35
......@@ -4,7 +4,7 @@
<el-form-item :label="$t('代理商AGENT')">
<supplierSelect v-model="subMaterialObj.agentId" :companyType="'1'" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item>
<el-form-item label="提单号M/BL NO." class="two-element">
<el-form-item :label="$t('提单号M/BL NO.')" class="two-element">
<el-input v-model="subMaterialObj.blMblNo" :placeholder="$t('请输入提单号')"></el-input>
<el-button type="primary">{{$t('提单确认件')}}</el-button>
</el-form-item>
......@@ -38,10 +38,10 @@
<el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="$l(unit, 'title')"></el-option>
</el-select>
</el-form-item>
<el-form-item label="毛重(KGS)">
<el-form-item :label="$t('毛重(KGS)')">
<el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入毛重') + '(KGS)'"></el-input>
</el-form-item>
<el-form-item label="立方数(CBM)">
<el-form-item :label="$t('立方数(CBM)')">
<el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
</el-form-item>
<el-form-item :label="$t('货物描述')">
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 8c80ed35
......@@ -38,7 +38,10 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop="prodTitleZh">
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop="">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
......
src/views/ecw/box/shippingSea/nodePage/trailer.vue
View file @ 8c80ed35
......@@ -3,7 +3,7 @@
<el-form ref="trailerForm" :rules="rules" :model="trailerObj" label-width="120px">
<el-form-item :label="$t('状态')">
<el-select v-model="trailerObj.tlContainerStatus" :placeholder="$t('请选择状态')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="type.label" :value="type.value"></el-option>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('拖车公司')">
......
src/views/ecw/box/shippingSea/nodePage/unloading/index.vue
View file @ 8c80ed35
......@@ -2,7 +2,7 @@
<div>
<el-form ref="unloadingForm" :model="unloadingObj" label-width="100px">
<el-form-item :label="$t('网点')">
<el-select filterable v-model="unloadingObj.ulOutletsId" clearable>
<el-select filterable v-model="unloadingObj.ulOutletsId" clearable :placeholder="$t('请选择')">
<el-option v-for="node in nodes" :key="node.id" :label="$l(node, 'title')" :value="node.id"></el-option>
</el-select>
</el-form-item>
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 8c80ed35
......@@ -38,7 +38,7 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item, 'prodTitle')}}</p>
<p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
</p>
......
src/views/ecw/box/shippingSea/seaProcess.vue
View file @ 8c80ed35
......@@ -294,6 +294,7 @@ export default {
align-items: center;
.node-div {
text-align: center;
margin-top: 10px;
cursor: pointer;
p {
......
src/views/ecw/box/shippingSea/seaStepDetail.vue
View file @ 8c80ed35
......@@ -111,6 +111,7 @@ export default {
height: 550px;
min-width: 1300px;
padding: 10px 10px;
overflow-x: auto;
p {
margin: 0;
......
src/views/ecw/box/shippingSea/shippingSea.vue
View file @ 8c80ed35
......@@ -105,7 +105,7 @@ export default {
/* 获取仓库 */
importCityName(id) {
var arr = this.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? arr[0].titleZh : "无";
return arr.length > 0 ? this.$l(arr[0], 'title') : "/";
},
// 出货
getBoxInfo() {
......
src/views/ecw/box/shippingSea/utils.js
View file @ 8c80ed35
......@@ -151,7 +151,7 @@ function seaBaseData() {
},
},
{
title: "配船",
title: i18n.$t("配船"),
imgSrc: {
start: require("@/assets/images/shipping/pc-start.png"),
wait: require("@/assets/images/shipping/pc-wait.png"),
......@@ -1340,7 +1340,7 @@ function getTotlContent(total, keys = ["num", "volume", "weight"]) {
let content = [];
for (const key of keys) {
if (key === "num") {
content.push(`${total?.num ?? 0}箱`);
content.push(`${total?.num ?? 0}${i18n.$t("箱")}`);
}
if (key === "volume") {
let volume = total?.volume ?? 0;
......@@ -1357,7 +1357,7 @@ function getTotlContent(total, keys = ["num", "volume", "weight"]) {
}
function getCapacity(capacity) {
return `${capacity?.name ?? ""}柜型 ${capacity?.volume ?? 0}m³ ${
return `${capacity?.name ?? ""}${i18n.$t("柜型")} ${capacity?.volume ?? 0}m³ ${
capacity?.weight ?? 0
}kg`;
}
......@@ -1415,7 +1415,7 @@ function serviceMsg(result, _vue) {
return new Promise((resolve, reject) => {
const { code, msg } = result;
if (code === 0) {
_vue.$message.success("操作成功");
_vue.$message.success(i18n.$t("操作成功"));
resolve();
} else {
_vue.$message.error(msg);
......
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