Commit 5ea56b38 authored by dragondean@qq.com's avatar dragondean@qq.com
parents 29e8e093 493f833a
......@@ -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">
请上传
......
......@@ -1158,7 +1158,6 @@
"待核销": "Pending write-off",
"已核销实收总金额": "Total amount received after verification",
"已核销基准币种总金额": "Total amount in base currency that has been written off",
"已核销比例\\\\n(已核销基准币种总金额/应收总金额)": "Written-off ratio\\\\n(total amount of base currency written off/total amount receivable)",
"全部核销": "All write-off",
"剩余应收金额": "Remaining Amount Receivable",
"收款账户不能为空": "The receiving account cannot be empty",
......@@ -2173,133 +2172,150 @@
"是否确认删除昵称为{nickname}的会员?": "Are you sure to delete the member whose nickname is {nickname}?",
"取消删除": "Cancel Delete",
"重货标准(CBM)": "Heavy cargo standard (CBM)",
"WEB端图片": "",
"APP端图片": "",
"WEB端广告图片(建议尺寸": "",
"请上传WEB端广告图片": "",
"APP端广告图片(建议尺寸": "",
"请上传APP端广告图片": "",
"web端广告图片不能为空": "",
"app端广告图片不能为空": "",
"禁用": "",
"添加广告设置": "",
"修改广告设置": "",
"是否确认删除广告设置编号为": "",
"是否确认导出所有广告设置数据项?": "",
"有效期开始时间": "",
"请输入有效期开始时间": "",
"有效期结束时间": "",
"请输入有效期结束时间": "",
"弹窗标题": "",
"弹窗时间": "",
"网页中文": "",
"网页英文": "",
"开始时间不能大于结束时间": "",
"结束时间不能小于开始时间": "",
"添加广告弹窗": "",
"修改广告弹窗": "",
"是否确认删除广告弹窗编号为": "",
"是否确认导出所有广告弹窗数据项?": "",
"已核销比例\\n(已核销基准币种总金额/应收总金额)": "",
"是否要删除昵称为": "",
"的会员": "",
"请输入标题中文": "",
"请输入标题英文": "",
"内容中文": "",
"内容英语": "",
"添加帮助文档": "",
"修改帮助文档": "",
"是否确认删除帮助文档编号为": "",
"是否确认导出所有帮助文档数据项?": "",
"请输入内容中文": "",
"请输入内容英语": "",
"添加对内帮助文档": "",
"修改对内帮助文档": "",
"是否确认删除对内帮助文档编号为": "",
"是否确认导出所有对内帮助文档数据项?": "",
"须知类型": "",
"请选择须知类型": "",
"添加须知": "",
"修改须知": "",
"是否确认删除须知编号为": "",
"是否确认导出所有须知数据项?": "",
"公告标题": "",
"请输入公告标题": "",
"操作人员": "",
"请输入操作人员": "",
"公告类型": "",
"有效日期": "",
"创建者": "",
"内容英文": "",
"公告标题不能为空": "",
"公告类型不能为空": "",
"添加公告": "",
"修改公告": "",
"是否确认删除公告编号为": "",
"中文名称": "",
"港口类型": "",
"省": "",
"城市": "",
"码头编号": "",
"码头类型": "",
"请输入中文名称": "",
"请输入码头编号": "",
"请输入码头类型": "",
"中文名称不能为空": "",
"添加码头信息": "",
"修改码头信息": "",
"是否确认删除码头信息编号为": "",
"是否确认导出所有码头信息数据项?": "",
"快递公司名称": "",
"请输入快递公司名称": "",
"请输入账户名称": "",
"查件key": "",
"请输入查件key": "",
"查询url": "",
"请输入查询url": "",
"快递公司名称不能为空": "",
"添加配送管理": "",
"修改配送管理": "",
"是否确认删除配送管理编号为": "",
"是否确认导出所有配送管理数据项?": "",
"应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种": "应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种",
"实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率": "实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率",
"Incompatible receiver, ": "",
"最高分值": "",
"请输入最高分值": "",
"最低分值": "",
"请输入最低分值": "",
"最大分值不能为空": "",
"最小分值不能为空": "",
"添加信用等级": "",
"修改信用等级": "",
"是否确认删除信用等级编号为": "",
"是否确认导出所有信用等级数据项?": "",
"请输入规则名称": "",
"请选择规则分类": "",
"请输入规则得分": "",
"规则名称不能为空": "",
"规则分类不能为空": "",
"规则得分不能为空": "",
"添加信用规则": "",
"修改信用规则": "",
"是否确认删除信用规则编号为": "",
"是否确认导出所有信用规则数据项?": "",
"添加客户等级": "",
"修改客户等级": "",
"是否确认删除客户等级编号为": "",
"是否确认导出所有客户等级数据项?": "",
"添加客户等级规则": "",
"修改客户等级规则": "",
"是否确认删除客户等级规则编号为": "",
"是否确认导出所有客户等级规则数据项?": "",
"应核销总金额": "",
"导出账单给客户时显示的收款金额与币种": "",
"实收已核销总金额": "",
"所有银行收款明细中状态为已核销的实收金额,币种根据实收币种分类统计": "",
"核销基准币种已核销总金额": "",
"为了方便统计收款单核销比例,将所有银行收款明细中状态为已核销的实收金额,转换为核销基准币种的金额累加": "",
"总核销比例": "",
"总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额": "",
"身份证审核状态": ""
"WEB端图片": "WEB image",
"APP端图片": "APP image",
"WEB端广告图片(建议尺寸": "WEB advertising image (recommended size",
"请上传WEB端广告图片": "Please upload the advertisement picture on the WEB side",
"APP端广告图片(建议尺寸": "Advertising image on APP (recommended size",
"请上传APP端广告图片": "Please upload the APP side advertisement image",
"web端广告图片不能为空": "The web advertisement image cannot be empty",
"app端广告图片不能为空": "App image cannot be empty",
"禁用": "Disabled",
"添加广告设置": "Add Ad Settings",
"修改广告设置": "Edit Ad Settings",
"是否确认删除广告设置编号为": "Are you sure to delete the ad setting number is",
"是否确认导出所有广告设置数据项?": "Are you sure to export all ad settings data items?",
"有效期开始时间": "Validity Start Time",
"请输入有效期开始时间": "Please enter the validity period start time",
"有效期结束时间": "Validity End Time",
"请输入有效期结束时间": "Please enter the expiration date",
"弹窗标题": "Popup window title",
"弹窗时间": "Popup time",
"网页中文": "Webpage Chinese",
"网页英文": "Webpage English",
"开始时间不能大于结束时间": "Start time cannot be greater than end time",
"结束时间不能小于开始时间": "End time cannot be less than start time",
"添加广告弹窗": "Add Ad Popup",
"修改广告弹窗": "Modify Ad Popup",
"是否确认删除广告弹窗编号为": "Are you sure to delete the advertisement pop-up number is",
"是否确认导出所有广告弹窗数据项?": "Are you sure to export all pop-up window data items?",
"已核销比例\\\\n(已核销基准币种总金额/应收总金额)": "Written-off ratio\\\\n(total amount of base currency written off/total amount receivable)",
"是否要删除昵称为": "Do you want to delete the nickname as ",
"的会员": "Members",
"请输入标题中文": "Please enter the title in Chinese",
"请输入标题英文": "Please enter the title in English",
"内容中文": "Content Chinese",
"内容英语": "Content English",
"添加帮助文档": "Add help document",
"修改帮助文档": "Modify help document",
"是否确认删除帮助文档编号为": "Are you sure to delete the help document number",
"是否确认导出所有帮助文档数据项?": "Are you sure to export all help document data items?",
"请输入内容中文": "Please enter the content in Chinese",
"请输入内容英语": "Please enter the content in English",
"添加对内帮助文档": "Add internal help document",
"修改对内帮助文档": "Modify internal help documentation",
"是否确认删除对内帮助文档编号为": "Are you sure to delete the internal help document number",
"是否确认导出所有对内帮助文档数据项?": "Are you sure to export all internal help document data items?",
"须知类型": "Note Type",
"请选择须知类型": "Please select notice type",
"添加须知": "Add notice",
"修改须知": "Modification Notice",
"是否确认删除须知编号为": "Are you sure to delete the note number is",
"是否确认导出所有须知数据项?": "Are you sure to export all required data items?",
"公告标题": "Announcement title",
"请输入公告标题": "Please enter the title of the announcement",
"操作人员": "operator",
"请输入操作人员": "Please enter the operator",
"公告类型": "Announcement Type",
"有效日期": "Effective date",
"创建者": "creator",
"内容英文": "Content English",
"公告标题不能为空": "Announcement title cannot be empty",
"公告类型不能为空": "Announcement type cannot be empty",
"添加公告": "Add Announcement",
"修改公告": "Modification Announcement",
"是否确认删除公告编号为": "Are you sure to delete the announcement number is",
"中文名称": "Chinese name",
"港口类型": "Port Type",
"省": "Province",
"城市": "city",
"码头编号": "Dock Number",
"码头类型": "Dock Type",
"请输入中文名称": "Please enter the Chinese name",
"请输入码头编号": "Please enter the terminal number",
"请输入码头类型": "Please enter the terminal type",
"中文名称不能为空": "Chinese name cannot be empty",
"添加码头信息": "Add terminal information",
"修改码头信息": "Modify dock information",
"是否确认删除码头信息编号为": "Are you sure to delete the terminal information number is",
"是否确认导出所有码头信息数据项?": "Are you sure to export all dock information data items?",
"快递公司名称": "Express company name",
"请输入快递公司名称": "Please enter the courier company name",
"请输入账户名称": "Please enter account name",
"查件key": "Check key",
"请输入查件key": "Please enter the check key",
"查询url": "query url",
"请输入查询url": "Please enter the query url",
"快递公司名称不能为空": "Express company name cannot be empty",
"添加配送管理": "Add Shipping Management",
"修改配送管理": "Modify Shipping Management",
"是否确认删除配送管理编号为": "Are you sure to delete the delivery management number is",
"是否确认导出所有配送管理数据项?": "Are you sure to export all shipping management data items?",
"应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种: 应收可能出现多个币种的情况,多个币种没法计算整个收款单的核销比例,所以增加一个中间币种,如果应收只有一个币种就使用应收币种,如果有多个币种就以美元为核销基准币种,": "There may be multiple currencies in receivables. Multiple currencies cannot calculate the write-off ratio of the entire collection note, so add an intermediate currency. If there is only one currency in receivables, use the receivable currency. If If there are multiple currencies, US dollars will be used as the base currency for write-off: There may be multiple currencies in receivables, and multiple currencies cannot calculate the write-off ratio of the entire receipt, so add an intermediate currency , if the receivable has only one currency, use the receivable currency, and if there are multiple currencies, use the US dollar as the write-off base currency,",
"实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率: 实收币种与核销基准币种一样时,无需填写汇率,不一样需要填写汇率,": "When the currency actually received is the same as the base currency for verification, you do not need to fill in the exchange rate. If it is different, you need to fill in the exchange rate.",
"Incompatible receiver, ": "Incompatible receiver",
"最高分值": "Maximum Score",
"请输入最高分值": "Please enter the highest score",
"最低分值": "Minimum Score",
"请输入最低分值": "Please enter a minimum score",
"最大分值不能为空": "The maximum score cannot be empty",
"最小分值不能为空": "Minimum score cannot be empty",
"添加信用等级": "Add credit rating",
"修改信用等级": "Modify credit rating",
"是否确认删除信用等级编号为": "Are you sure to delete the credit rating number is",
"是否确认导出所有信用等级数据项?": "Are you sure to export all credit rating data items?",
"请输入规则名称": "Please enter a rule name",
"请选择规则分类": "Please select a rule category",
"请输入规则得分": "Please enter rule score",
"规则名称不能为空": "Rule name cannot be empty",
"规则分类不能为空": "Rule classification cannot be empty",
"规则得分不能为空": "Rule score cannot be empty",
"添加信用规则": "Add credit rule",
"修改信用规则": "Modify Credit Rules",
"是否确认删除信用规则编号为": "Are you sure to delete the credit rule number is",
"是否确认导出所有信用规则数据项?": "Are you sure to export all credit rule data items?",
"添加客户等级": "Add customer level",
"修改客户等级": "Modify customer level",
"是否确认删除客户等级编号为": "Are you sure to delete the customer level number",
"是否确认导出所有客户等级数据项?": "Are you sure to export all customer level data items?",
"添加客户等级规则": "Add customer level rule",
"修改客户等级规则": "Modify customer level rules",
"是否确认删除客户等级规则编号为": "Are you sure to delete the customer level rule number",
"是否确认导出所有客户等级规则数据项?": "Are you sure to export all customer level rule data items?",
"应核销总金额": "Total amount to be written off",
"导出账单给客户时显示的收款金额与币种": "Receipt amount and currency displayed when exporting bills to customers",
"实收已核销总金额": "Total amount received and written off",
"所有银行收款明细中状态为已核销的实收金额,币种根据实收币种分类统计": "The paid-in amount whose status is written off in all bank receipt details, and the currency is classified and counted according to the received currency",
"核销基准币种已核销总金额": "Total amount written off in base currency",
"为了方便统计收款单核销比例,将所有银行收款明细中状态为已核销的实收金额,转换为核销基准币种的金额累加": "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",
"延迟时间": "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",
"混合报关": "Mixed customs declaration",
"VGM声明": "VGM Statement",
"请输入VGM重量": "Please enter VGM weight",
"您确认提交全部退场审核吗?": "Are you sure to submit all exit reviews?",
"您确认提交部分退场审核吗?": "Are you sure to submit partial exit review?",
"请输入费用": "Please enter the fee",
"未审核": "Unapproved",
"提单号M/BL NO.": "B/L No. M/BL NO.",
"毛重(KGS)": "Gross weight (KGS)",
"立方数(CBM)": "Cubic number (CBM)",
"选取文件": "Select File",
"查看提单 {selfNo} 柜号:{cubNo} 柜型:{cabinetLabel}": "Check Bill of Lading {selfNo} Container No.: {cubNo} Container type: {cabinetLabel}"
}
......@@ -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}"
}
......@@ -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>
......
......@@ -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;
......
......@@ -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>
......@@ -235,7 +235,7 @@ export default {
downloadFile(
"zipDownload",
{ shipmentId: this.shipmentObj.id },
this.$t("打包文件") + ".zip",
this.shipmentObj.selfNo + ".zip",
"zip"
);
},
......@@ -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`;
},
......
......@@ -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('通知人')">
......
......@@ -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('货柜状态')">
......
......@@ -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" },
],
},
};
},
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
},
......
......@@ -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() {
......
......@@ -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" />
......
......@@ -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('货物描述')">
......
......@@ -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}">
......
......@@ -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('拖车公司')">
......
......@@ -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>
......
......@@ -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>
......
......@@ -294,6 +294,7 @@ export default {
align-items: center;
.node-div {
text-align: center;
margin-top: 10px;
cursor: pointer;
p {
......
......@@ -111,6 +111,7 @@ export default {
height: 550px;
min-width: 1300px;
padding: 10px 10px;
overflow-x: auto;
p {
margin: 0;
......
......@@ -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() {
......
......@@ -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);
......
const fs = require('fs');
const root = "./src/views"
let allFiles = []
function getFiles(dir){
let files = fs.readdirSync(dir)
files.forEach(file => {
let path = dir + '/' + file
if(fs.lstatSync(path).isDirectory()){
getFiles(path)
}else if(path.split('.').reverse()[0] === 'vue') {
allFiles.push(path)
}
})
}
getFiles(root)
// allFiles = [
// // 'src/views/system/user/index.vue',
// 'src/views/bpm/model/index.vue'
// // 'src/views/ecw/financial/receiptDetail.vue'
// ]
console.log(allFiles)
allFiles.forEach(file => {
setTimeout(() => {
let data = fs.readFileSync(file, {encoding: 'utf-8'})
console.log('开始翻译:' + file)
// 找到 <template>([\w\W]*)<\/template>
data = data.replace(/<template>([\w\W]*)<\/template>/g, (template) => {
// 匹配标签属性 placeholder="请输入部门名称" 并替换为 :placeholder="$t('请输入部门名称')"
return template.replace(/ \w+="[^\x00-\xff]+"/g, (word) => {
const wordList = word.split('=')
return ' :' + wordList[0].substring(1) + '="$t(\'' + wordList[1].substring(1, wordList[1].length - 1) + '\')"'
})
// 匹配标签值 <el-button>取 消</el-button> 并替换为 <el-button>{{ $t('取 消') }}</el-button>
.replace(/>(\s*[^\x00-\xff]+\s*)+</g, (word) => {
return '>{{ $t(\'' + word.substring(1, word.length - 1).trim() + '\') }}<'
})
})
// 找到 <script>([\w\W]*)<\/script>
.replace(/<script>([\w\W]*)<\/script>/g, (script) => {
// 单引号字符串 \'(\s*[^\x00-\xff]+\s*)+\' ,其中(?<!([(=]))和(?!\))表示前后没有括号和前=用于防止重复转换
let s = script.replace(/(?<!([(=]))(?<!(\$t\())'[^\x00-\xff]+'(?!\))/g, s => {
return 'this.$t(' + s + ')'
})
// 双引号字符串 \"(\s*[^\x00-\xff]+\s*)+\"
s = s.replace(/(?<!([(=]))"[^\x00-\xff]+"(?!\))/g, s => {
return 'this.$t(' + s + ')'
})
// `字符串 \`(\s*[^\x00-\xff]+\s*)+\`
s = s.replace(/(?<!([(=]))`[^\x00-\xff]+`(?!\))/g, s => {
return 'this.$t(' + s + ')'
})
return s
})
console.log('准备保存:' + file)
fs.writeFileSync(file, data)
console.log('已翻译:' + file)
}, 0)
})
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