Skip to content

J
jiedao-app-operator-master
Commit 43798160 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/release2.2' into release2.2

parents 0d8eb8b1 aa867fbd
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 159 deletions
src/i18n/languages/en_US.json
View file @ 43798160
...@@ -3875,159 +3875,170 @@ ...@@ -3875,159 +3875,170 @@
"新增品名中文": "New product name in Chinese", "新增品名中文": "New product name in Chinese",
"新增品名英文": "New product name in English", "新增品名英文": "New product name in English",
"{prods}等商品拆单总数据跟主单不匹配": "The total data for the split order of {prods} products does not match the main order.", "{prods}等商品拆单总数据跟主单不匹配": "The total data for the split order of {prods} products does not match the main order.",
"入仓特性": "", "入仓特性": "Entry characteristics",
"剩余入仓方数": "", "剩余入仓方数": "Remaining number of warehouse entry parties",
"剩余收费方数": "", "剩余收费方数": "Number of remaining charging parties",
"剩余入仓重量": "", "剩余入仓重量": "Remaining warehousing weight",
"剩余收费重量": "", "剩余收费重量": "Remaining chargeable weight",
"是否需要一起预装?": "", "是否需要一起预装?": "Do you need to pre install it together?",
"请注意，预装反审后，全部提单需重新制作": "", "请注意，预装反审后，全部提单需重新制作": "Please note that after pre installation and review, all bills of lading need to be remade",
"请先处理完出货异常，再进行操作": "", "请先处理完出货异常，再进行操作": "Please handle the shipment exception first before proceeding with the operation",
"业绩类型": "", "业绩类型": "Performance type",
"普通订单": "", "普通订单": "Ordinary orders",
"收费统计": "", "收费统计": "Fee statistics",
"公司中文名称": "", "公司中文名称": "Chinese name of the company",
"展示": "", "展示": "show",
"无归属订单": "Unassigned Order", "无归属订单": "No ownership order",
"最多可放入{quantity}": "", "最多可放入{quantity}": "Up to {quantity} can be placed",
"可放入仓方数": "", "可放入仓方数": "Number of storage units that can be placed",
"可放入收费方数": "", "可放入收费方数": "Number of charging parties that can be placed",
"入仓方数": "", "入仓方数": "Number of parties entering the warehouse",
"收费方数": "", "收费方数": "Number of charging parties",
"可放入重量": "", "可放入重量": "Can be put into weight",
"可放入收费重量": "", "可放入收费重量": "Can accommodate chargeable weight",
"请选择提单制作状态": "", "请选择提单制作状态": "Please select the bill of lading production status",
"提单状态": "", "提单状态": "Bill of Lading Status",
"部分完成": "", "部分完成": "Partially completed",
"数量(个)": "", "数量(个)": "Quantity (pieces)",
"品名可拆数据": "", "品名可拆数据": "Product name detachable data",
"剩余货值": "", "剩余货值": "Remaining value",
"可拆入仓记录": "", "可拆入仓记录": "Removable warehouse records",
"已拆完": "", "已拆完": "Completed dismantling",
"已放入入仓记录": "", "已放入入仓记录": "Placed in warehouse entry record",
"放入货值": "", "放入货值": "Value of goods placed",
"请选择入仓记录": "", "{num}箱": "{num} box",
"暂无入仓记录": "", "长{boxGauge1}cm": "Length {boxGauge1} cm",
"请至少放入一条数据": "", "宽{boxGauge2}cm": "Width {boxGauge2} cm",
"确定要清空放入数据么?": "", "高{boxGauge3}cm": "Height {boxGauge3} cm",
"是否需要一起移出?": "", "方数{volume}m³": "Square {volume} m ³",
"币种1": "", "重量{weight}kg": "Weight {weight} kg",
"请选择币种": "", "数量{n}": "Quantity {n}",
"币种2": "", "快递{expressNo}": "Express {expressNo}",
"币种1 金额": "", "储位{location}": "Storage location",
"币种1金额兑换币种2汇率": "", "请选择入仓记录": "Please select a warehouse entry record",
"币种2金额": "", "暂无入仓记录": "There is currently no record of warehouse entry",
"最后修改人": "", "请至少放入一条数据": "Please place at least one piece of data",
"日志": "", "确定要清空放入数据么?": "Are you sure you want to clear the data?",
"例子：": "", "是否需要一起移出?": "Do you need to remove it together?",
"例子：1RMB = 0.138611USD": "", "币种1": "Currency 1",
"最后更新人": "", "请选择币种": "Please select a currency",
"修改前内容": "", "币种2": "Currency 2",
"币种1：": "", "币种1 金额": "Currency 1 Amount",
"币种2：": "", "币种1金额兑换币种2汇率": "Currency 1 Amount Exchange Currency 2 Exchange Rate",
"汇率：": "", "币种2金额": "Currency 2 Amount",
"币种1不能为空": "", "最后修改人": "Last modified by",
"原币种代码不能为空": "", "日志": "journal",
"币种2不能为空": "", "例子：": "Example:",
"目标种代码不能为空": "", "例子：1RMB = 0.138611USD": "Example: 1RMB=0.138611USD",
"汇率不能为空": "", "最后更新人": "Last updated by",
"是否确认删除汇率管理编号为": "", "修改前内容": "Content before modification",
"是否确认导出所有汇率管理数据项?": "", "币种1：": "Currency 1:",
"汇率不能为0，请输入正确的汇率": "", "币种2：": "Currency 2:",
"核销基准币种汇率不能为0，请输入正确的汇率": "", "汇率：": "Exchange rate:",
"期望收款汇率不能为0，请输入正确的汇率": "", "币种1不能为空": "Currency 1 cannot be empty",
"美元": "", "原币种代码不能为空": "The original currency code cannot be empty",
"目的国": "", "币种2不能为空": "Currency 2 cannot be empty",
"自编号状态": "", "目标种代码不能为空": "The target type code cannot be empty",
"结算时间": "", "汇率不能为空": "Exchange rate cannot be empty",
"是否结算": "", "是否确认删除汇率管理编号为": "Are you sure to delete the exchange rate management number as",
"No.柜号": "", "是否确认导出所有汇率管理数据项?": "Are you sure to export all exchange rate management data items?",
"应收款(Accounts receivable)": "", "汇率不能为0，请输入正确的汇率": "The exchange rate cannot be 0. Please enter the correct exchange rate",
"received in + 目的国国家(目的地实收)": "", "核销基准币种汇率不能为0，请输入正确的汇率": "The benchmark currency exchange rate for verification cannot be 0. Please enter the correct exchange rate",
"received in China(中国实收)": "", "期望收款汇率不能为0，请输入正确的汇率": "The expected collection exchange rate cannot be 0. Please enter the correct exchange rate",
"Discounts 折扣": "", "美元": "dollar",
"是否重泡货": "", "目的国": "Destination country",
"收费数据": "", "自编号状态": "Self numbered status",
"订单优惠金额": "", "结算时间": "Settlement time",
"实收总金额": "", "是否结算": "Settlement or not",
"已收总金额": "", "No.柜号": "Cabinet No",
"应收运费": "", "应收款(Accounts receivableAccounts receivable)": "Accounts receivable",
"运费优惠金额": "", "received in + 目的国国家Received in+items(目的地实收)": "Received in+Country of Destination Received in+Items",
"实收运费": "", "received in China(中国实收)": "Received in China",
"已收运费": "", "Discounts 折扣": "Discounts",
"应收清关费": "", "是否重泡货": "Do you want to re bubble the goods",
"实收清关费": "", "收费数据": "Fee data",
"清关费优惠金额": "", "订单优惠金额": "Order discount amount",
"已收清关费": "", "实收总金额": "Total amount received",
"应收额外费用": "", "已收总金额": "Total amount received",
"实收额外费用": "", "应收运费": "Freight receivable",
"额外费用优惠金额": "", "运费优惠金额": "Freight discount amount",
"已收额外费用": "", "实收运费": "Paid-up freight",
"是否全部核销": "", "已收运费": "Received shipping fee",
"订单入仓时间": "", "应收清关费": "Payable customs clearance fee",
"订单装柜时间": "", "实收清关费": "Paid-in customs clearance fee",
"上传新附件": "", "清关费优惠金额": "Discount amount for customs clearance fee",
"您最多上传10个附件": "", "已收清关费": "Customs clearance fee received",
"附件仅限doc/xls/ppt/txt/pdf/jpg/png/jpeg/docx/xlsx格式": "", "应收额外费用": "Additional fees receivable",
"上传成功": "", "实收额外费用": "Actual additional fees received",
"确定删除附件吗?": "", "额外费用优惠金额": "Additional fee discount amount",
"实收总额": "", "已收额外费用": "Additional fees received",
"已核销总金额": "", "是否全部核销": "Whether to write off all",
"是否重货": "", "订单入仓时间": "Order warehousing time",
"原收费数据": "", "订单装柜时间": "Order loading time",
"优惠重货标准": "", "上传新附件": "Upload a new attachment",
"实际收费数据": "", "您最多上传10个附件": "You can upload up to 10 attachments",
"入仓实测": "", "附件仅限doc/xls/ppt/txt/pdf/jpg/png/jpeg/docx/xlsx格式": "Attachment only in doc/xls/ppt/txt/pdf/jpg/png/jpeg/docx/xlsx format",
"是否重货/泡货": "", "上传成功": "Upload successful",
"应收数据": "", "确定删除附件吗?": "Are you sure to delete the attachment?",
"实收数据": "", "实收总额": "Total amount received",
"应收单价": "", "已核销总金额": "Total amount written off",
"优惠单价金额": "", "是否重货": "Heavy cargo or not",
"应收运费&清关费": "", "原收费数据": "Original fee data",
"收款单优惠金额": "", "优惠重货标准": "Preferential Heavy Duty Standard",
"总优惠金额": "", "实际收费数据": "Actual Charge Data",
"实收运费&清关费": "", "入仓实测": "Actual measurement during warehousing",
"特需类型": "", "是否重货/泡货": "Whether it is heavy or not",
"收款优惠金额": "", "应收数据": "Accounts receivable data",
"实收美元金额": "", "实收数据": "Paid-in data",
"优惠活动": "", "应收单价": "Receivable unit price",
"优惠ID": "", "优惠单价金额": "Discount unit price amount",
"优惠名称": "", "应收运费&清关费": "Receivable freight and customs clearance fees",
"运费优惠": "", "收款单优惠金额": "Discount amount on payment receipt",
"清关费优惠": "", "总优惠金额": "Total discount amount",
"特价折扣": "", "实收运费&清关费": "Paid-up shipping and customs clearance fees",
"请求备注": "", "特需类型": "Special type",
"请求内容": "", "收款优惠金额": "Collection discount amount",
"查看报关资料": "", "实收美元金额": "Paid-in USD amount",
"费用汇总": "", "优惠活动": "Promotional Activities",
"费用来源": "", "优惠ID": "Offer ID",
"请再次确认运费由您支付还是收货人支付?": "pay by sender or consignee?", "优惠名称": "Offer Name",
"测量方数汇总": "", "运费优惠": "Freight discount",
"收费方数汇总": "", "清关费优惠": "Customs clearance fee discount",
"重量汇总": "", "特价折扣": "Special discount",
"多个异常": "", "请求备注": "Request Comment",
"提货方式": "", "请求内容": "Request Content",
"入仓记录放入确认": "", "查看报关资料": "View customs declaration information",
"可拆出入仓记录": "", "费用汇总": "Cost aggregation ",
"可拆": "", "费用来源": "Source of expenses",
"新入仓记录": "", "请再次确认运费由您支付还是收货人支付?": "Please confirm again whether the shipping fee will be paid by you or by the consignee?",
"确定要删除该行入仓记录吗？": "", "测量方数汇总": "Summary of measurement quantities",
"请填写收费方数": "", "收费方数汇总": "Summary of charging parties",
"请填写收费重量": "", "重量汇总": "Weight Summary",
"请放入品名": "", "多个异常": "Multiple exceptions",
"放入箱数不能大于可拆箱数": "", "提货方式": "Delivery method",
"{field}最少为0.01": "", "入仓记录放入确认": "Confirmation of placement of warehouse entry records",
"暂无货物入库信息": "", "可拆出入仓记录": "Removable warehouse entry records",
"多了": "", "可拆": "Detachable",
"阶梯和价格设置不能留空": "", "m³": "M ³",
"目的港码头": "", "kg": "Kg",
"TIN NO./RC NO.": "", "新入仓记录": "New Entry Record",
"请输入TIN NO./RC NO.": "", "确定要删除该行入仓记录吗？": "Are you sure you want to delete the warehouse entry record for this row?",
"CTN证书": "", "请填写收费方数": "Please fill in the number of charging parties",
"COC证书": "", "请填写收费重量": "Please fill in the chargeable weight",
"SONCAP证书": "", "请放入品名": "Please include the product name",
"码头": "", "放入箱数不能大于可拆箱数": "The number of boxes placed cannot be greater than the number of detachable boxes",
"保费币种": "", "{field}最少为0.01": "{field} should be at least 0.01",
"是否支持控货": "", "暂无货物入库信息": "There is currently no information on goods entering the warehouse",
"默认送货上门": "" "多了": "Too much",
"阶梯和价格设置不能留空": "Ladder and price settings cannot be set",
"目的港码头": "Destination Port Terminal",
"TIN NO./RC NO.": "TIN NO./RC NO",
"请输入TIN NO./RC NO.": "Please enter TIN NO./RC NO",
"CTN证书": "CTN certificate",
"COC证书": "COC certificate",
"SONCAP证书": "SONCAP Certificate ",
"码头": "wharf",
"保费币种": "Premium Currency",
"是否支持控货": "Does it support controlling goods",
"默认送货上门": "Default door-to-door delivery"
} }
src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue
View file @ 43798160
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('装柜时间')" prop="ldBoxTime"> <el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
{{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}} <!-- {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}} -->
<!-- <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> --> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('出仓时间')"> <el-form-item :label="$t('出仓时间')">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
......
src/views/ecw/exchangeRate/index.vue
View file @ 43798160
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
:key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" /> :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="币种2" prop="targetCurrencyId"> <el-form-item :label="$t('币种2')" prop="targetCurrencyId">
<el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')"> <el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')">
<el-option :disabled="dict.status === 1" @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList" <el-option :disabled="dict.status === 1" @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList"
:key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" /> :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
......
src/views/ecw/warehouse/index.vue
View file @ 43798160
...@@ -324,7 +324,6 @@ ...@@ -324,7 +324,6 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('是否支持控货')"> <el-form-item :label="$t('是否支持控货')">
<el-radio-group v-model="lineform.controlStatus"> <el-radio-group v-model="lineform.controlStatus">
<el-radio :label="0">支持</el-radio> <el-radio :label="0">支持</el-radio>
<el-radio :label="1">不支持</el-radio> <el-radio :label="1">不支持</el-radio>
</el-radio-group> </el-radio-group>
...@@ -862,6 +861,8 @@ export default { ...@@ -862,6 +861,8 @@ export default {
this.serviceOpen = true; this.serviceOpen = true;
this.lineform.lineId = row.lineId; this.lineform.lineId = row.lineId;
this.lineform.transportType = row.transportType; this.lineform.transportType = row.transportType;
this.lineform.currencyUnit = row.currencyUnit === 0 ? '' : row.currencyUnit
this.lineform.controlStatus = row.controlStatus
}, },
submitLineForm() { submitLineForm() {
......
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