Skip to content

J
jiedao-app-operator-master
Commit 3af5883f authored by houjn@hikoon.cn's avatar houjn@hikoon.cn
Browse files
Options

翻译

parent a71fe96f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2584 additions and 2553 deletions
src/i18n/languages/en_US.json
View file @ 3af5883f
...@@ -2261,8 +2261,8 @@ ...@@ -2261,8 +2261,8 @@
"修改配送管理": "Modify Shipping Management", "修改配送管理": "Modify Shipping Management",
"是否确认删除配送管理编号为": "Are you sure to delete the delivery management number is", "是否确认删除配送管理编号为": "Are you sure to delete the delivery management number is",
"是否确认导出所有配送管理数据项?": "Are you sure to export all shipping management data items?", "是否确认导出所有配送管理数据项?": "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,", "应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种": "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",
"实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率: 实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率,": "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.", "实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率": "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", "Incompatible receiver, ": "Incompatible receiver",
"最高分值": "Maximum Score", "最高分值": "Maximum Score",
"请输入最高分值": "Please enter the highest score", "请输入最高分值": "Please enter the highest score",
...@@ -2317,5 +2317,52 @@ ...@@ -2317,5 +2317,52 @@
"毛重(KGS)": "Gross weight (KGS)", "毛重(KGS)": "Gross weight (KGS)",
"立方数(CBM)": "Cubic number (CBM)", "立方数(CBM)": "Cubic number (CBM)",
"选取文件": "Select File", "选取文件": "Select File",
"查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": "Check Bill of Lading {selfNo} Container No.: {cubNo} Container type: {cabinetLabel}" "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": "Check Bill of Lading {selfNo} Container No.: {cubNo} Container type: {cabinetLabel}",
"剩余数量(个)": "Remaining quantity (piece)",
"放入数量(个)": "Quantity put in",
"历史放货记录": "Historical release record",
"提货数量": "Picking quantity",
"放货件数": "Number of delivery pieces",
"放货修改": "Release modification",
"查看提单": "View Bill of Lading",
"获取验证码": "Get verification code",
"保存协议": "Save Agreement",
"不能超过剩余箱数": "Cannot exceed the number of remaining cases",
"秒": "Seconds",
"请选择付款类型": "Please select a payment type",
"申请信息【订单信息】": "Application Information [Order Information]",
"申请说明": "Application Description",
"删除入仓": "Delete warehousing",
"区域": "Region",
"仓位": "Bin",
"提 交": "Submit",
"自定义": "Custom:,",
"价格更新时间": "Price update time",
"有无单证": "With or without documents",
"缺货箱数": "Number of out of stock containers",
"商品分类": "Commodity Classification",
"确定要取消此订单么？": "Are you sure you want to cancel this order?",
"确定要恢复此订单么？": "Are you sure you want to resume this order?",
"确定要删除此订单么？": "Are you sure you want to delete this order?",
"【": "【",
"】": "】",
"合计：": "Total:",
"需要仓库打包": "Warehouse packaging required",
"明佣佣金": "Commission on commission",
"运费不能为空": "Freight cannot be empty",
"、": "、",
"可修改": "Modifiable",
"是否备案": "Whether to file",
"箱数：": "Number of boxes:",
"体积：": "Volume:",
"重量：": "Weight:",
"请选择入仓时间": "Please select the warehousing time",
"添加新品名": "Add new product name",
"非填单货物": "Non filled goods",
"数量不能为空": "Quantity cannot be empty",
"无备案": "No filing",
"有备案": "Recorded",
"无牌价": "No price list",
"中性品牌价": "Neutral brand price",
"已过期": "Expired"
} }
\ No newline at end of file
src/views/ecw/order/batchSingleApplication.vue
View file @ 3af5883f
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<template v-slot="{row}"> <template v-slot="{row}">
{{row.channelName || '/'}}</template> {{row.channelName || '/'}}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>--> <!-- <el-table-column :label="$t('始发仓')" prop="startWarehouseName"></el-table-column>-->
<el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column> <el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column :label="$t('始发仓')" prop="startWarehouseName"> <el-table-column :label="$t('始发仓')" prop="startWarehouseName">
</el-table-column> </el-table-column>
......
src/views/ecw/order/cargoControl.vue
View file @ 3af5883f
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<el-form-item :label="$t('提单号')" prop="tidanNo"> <el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="发货人" prop="consignorId"> <el-form-item :label="$t('发货人')" prop="consignorId">
<el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('唛头')" prop="marks"> <el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('外部仓')" prop="number"> <el-form-item :label="$t('外部仓')" prop="number">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
......
src/views/ecw/order/cargoControlDetail.vue
View file @ 3af5883f
...@@ -73,34 +73,34 @@ ...@@ -73,34 +73,34 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div class="page-title">历史放货记录</div> <!-- <div class="page-title">{{ $t('历史放货记录') }}</div>
<el-table :data="[1]" border> <el-table :data="[1]" border>
<el-table-column label="序号" width="50px"> <el-table-column :label="$t('序号')" width="50px">
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column :label="$t('操作')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="申请原因"> <el-table-column :label="$t('申请原因')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="附件"> <el-table-column :label="$t('附件')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="申请时间"> <el-table-column :label="$t('申请时间')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="申请人"> <el-table-column :label="$t('申请人')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="审批时间"> <el-table-column :label="$t('审批时间')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="审批人"> <el-table-column :label="$t('审批人')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
<el-table-column label="备注"> <el-table-column :label="$t('备注')">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<fallback v-if="fallbackIndex !== null" :order="detail" :index="fallbackIndex" @close="fallbackIndex=null" @success="onFallbackSuccess" /> <fallback v-if="fallbackIndex !== null" :order="detail" :index="fallbackIndex" @close="fallbackIndex=null" @success="onFallbackSuccess" />
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
this.$confirm(this.$t('确定取消此申请么？')) this.$confirm(this.$t('确定取消此申请么？'))
.then(res => { .then(res => {
let approvalId = this.getApproval(id) let approvalId = this.getApproval(id)
return cancelApproval(approvalId, {reason: '无'}) return cancelApproval(approvalId, {reason: this.$t('无')})
}) })
.then(res => { .then(res => {
this.$message.success(this.$t('操作成功')) this.$message.success(this.$t('操作成功'))
......
src/views/ecw/order/components/BatchPickup.vue
View file @ 3af5883f
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<el-table :data="orderList"> <el-table :data="orderList">
<el-table-column label="提单号" prop="tidanNo"></el-table-column> <el-table-column :label="$t('提单号')" prop="tidanNo"></el-table-column>
<el-table-column label="提货数量" prop="tidanNo"> <el-table-column :label="$t('提货数量')" prop="tidanNo">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model.number="row.pickNum" placeholder=""></el-input> <el-input v-model.number="row.pickNum" placeholder=""></el-input>
</template> </template>
......
src/views/ecw/order/components/CargoControlDetail.vue
View file @ 3af5883f
...@@ -2,37 +2,37 @@ ...@@ -2,37 +2,37 @@
<template> <template>
<div v-if="order"> <div v-if="order">
<el-descriptions :column="3"> <el-descriptions :column="3">
<el-descriptions-item label="订单号">{{order.orderNo}}</el-descriptions-item> <el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" /> <dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出货方式"> <el-descriptions-item :label="$t('出货方式')">
{{channelName}} {{channelName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" /> <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="唛头">{{order.marks}}</el-descriptions-item> <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item label="始发仓">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item> <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item> <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<!-- 放货修改 --> <!-- 放货修改 -->
<el-descriptions-item label="放货件数" v-if="applyType == 7"> <el-descriptions-item :label="$t('放货件数')" v-if="applyType == 7">
【{{detail.pickNum}}】{{$t('改')}} {{detail.currentPickNum}} 【{{detail.pickNum}}】{{$t('改')}} {{detail.currentPickNum}}
</el-descriptions-item> </el-descriptions-item>
<!-- 反复核 --> <!-- 反复核 -->
<el-descriptions-item label="申请原因" v-if="applyType == 8"> <el-descriptions-item :label="$t('申请原因')" v-if="applyType == 8">
<dict-tag :type="DICT_TYPE.ECW_PICK_RECURRENT_NUCLEAR_TYPE" :value="detail.recurrentNuclearType" /> <dict-tag :type="DICT_TYPE.ECW_PICK_RECURRENT_NUCLEAR_TYPE" :value="detail.recurrentNuclearType" />
</el-descriptions-item> </el-descriptions-item>
<!-- 调货 --> <!-- 调货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 9"> <el-descriptions-item :label="$t('申请原因')" v-if="applyType == 9">
{{$l(detail, 'reason')}} {{$l(detail, 'reason')}}
</el-descriptions-item> </el-descriptions-item>
<!-- 取消放货 --> <!-- 取消放货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 10"> <el-descriptions-item :label="$t('申请原因')" v-if="applyType == 10">
<dict-tag :type="DICT_TYPE.ECW_CANCEL_PICK_TYPE" :value="detail.cancelPickType" /> <dict-tag :type="DICT_TYPE.ECW_CANCEL_PICK_TYPE" :value="detail.cancelPickType" />
</el-descriptions-item> </el-descriptions-item>
......
src/views/ecw/order/components/CargoControlEdit.vue
View file @ 3af5883f
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
}, },
computed:{ computed:{
title(){ title(){
let t = '放货修改' let t = this.$t('放货修改')
return t return t
}, },
info(){ info(){
......
src/views/ecw/order/components/LandingBillDetail.vue
View file @ 3af5883f
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
{{order.logisticsInfoDto.destAddressZh}} {{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button> <el-button type="primary" @click="ShowLandingBill=true">{{ $t('查看提单') }}</el-button>
<el-dialog title="查看提单" :visible.sync="ShowLandingBill" width="1000px"> <el-dialog :title="$t('查看提单')" :visible.sync="ShowLandingBill" width="1000px">
<div style="text-align:center; width: 960px; margin: auto" v-html="billContent" /> <div style="text-align:center; width: 960px; margin: auto" v-html="billContent" />
</el-dialog> </el-dialog>
</div> </div>
......
src/views/ecw/order/components/Release.vue
View file @ 3af5883f
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable class="w-150" ></el-input> <el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable class="w-150" ></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone"> <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<!-- <el-input v-model="formData.field109" placeholder="区号" clearable class="w-150"></el-input> --> <!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
<area-code-selector v-model="formData.consigneeCountryCode" class="w-150" /> <area-code-selector v-model="formData.consigneeCountryCode" class="w-150" />
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable class="w-150 ml-10"></el-input> <el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable class="w-150 ml-10"></el-input>
</el-form-item> </el-form-item>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('手机验证码')" prop="code"> <el-form-item :label="$t('手机验证码')" prop="code">
<el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable class="w-150 mr-10"></el-input> <el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable class="w-150 mr-10"></el-input>
<!-- <el-button type="success">获取验证码</el-button> --> <!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
<send-sms-code :order-id="detail.orderId" scene="5" /> <send-sms-code :order-id="detail.orderId" scene="5" />
</el-form-item> </el-form-item>
<el-form-item label="" style="margin-top:20px"> <el-form-item label="" style="margin-top:20px">
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<need-know ref="needKnow" keyname="control" /> <need-know ref="needKnow" keyname="control" />
<div style="margin-top:30px"> <div style="margin-top:30px">
<el-button type="primary" @click="agreement=true">{{$t('我同意')}}</el-button> <el-button type="primary" @click="agreement=true">{{$t('我同意')}}</el-button>
<!-- <el-button type="primary" @click="$refs.needKnow.download()">保存协议</el-button> --> <!-- <el-button type="primary" @click="$refs.needKnow.download()">{{ $t('保存协议') }}</el-button> -->
<el-button @click="closeDialog">{{$t('关闭')}}</el-button> <el-button @click="closeDialog">{{$t('关闭')}}</el-button>
</div> </div>
</div> </div>
...@@ -136,11 +136,11 @@ export default { ...@@ -136,11 +136,11 @@ export default {
rules(){ rules(){
return { return {
consigneeName: {required: true, message: this.$t('请填写收货人')}, consigneeName: {required: true, message: this.$t('请填写收货人')},
code: {required: true, message: '请填写验证码'}, code: {required: true, message: this.$t('请填写验证码')},
pickNum: { pickNum: {
type: 'number', type: 'number',
max: this.detail.sumNum - this.detail.releaseNum, max: this.detail.sumNum - this.detail.releaseNum,
message: "不能超过剩余箱数", message: this.$t("不能超过剩余箱数"),
trigger: 'change' trigger: 'change'
} }
} }
......
src/views/ecw/order/components/SendSmsCode.vue
View file @ 3af5883f
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
return this.$t('发送验证码') return this.$t('发送验证码')
} }
if(this.leftTime > 0){ if(this.leftTime > 0){
return this.leftTime + '秒' return this.leftTime + this.$t('秒')
} }
return this.$t('重新发送') return this.$t('重新发送')
} }
......
src/views/ecw/order/components/Transfer.vue
View file @ 3af5883f
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
rules:{ rules:{
name: [{required: true, message: this.$t('请输入控货人')}], name: [{required: true, message: this.$t('请输入控货人')}],
phone: [{required: true, message: this.$t('请输入控货人手机')}], phone: [{required: true, message: this.$t('请输入控货人手机')}],
// email: [{required: true, message: '请输入控货人'}], // email: [{required: true, message: this.$t('请输入控货人')}],
code: [{required: true, message: this.$t('验证码不能为空')}] code: [{required: true, message: this.$t('验证码不能为空')}]
} }
} }
......
src/views/ecw/order/components/ordeDetailsForm.vue
View file @ 3af5883f
<template> <template>
<div> <div>
<el-descriptions class="margin-top" border :column="4"> <el-descriptions class="margin-top" border :column="4">
<el-descriptions-item label="唛头">{{details.marks}}</el-descriptions-item> <el-descriptions-item :label="$t('唛头')">{{details.marks}}</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">{{details.sumNum || 0}}/{{details.costVO ? details.costVO.totalNum : 0}}</el-descriptions-item> <el-descriptions-item label="已到箱数/总箱数">{{details.sumNum || 0}}/{{details.costVO ? details.costVO.totalNum : 0}}</el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" /> <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="送货日期">{{details.deliveryDate}}</el-descriptions-item> <el-descriptions-item :label="$t('送货日期')">{{details.deliveryDate}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出货渠道"> <el-descriptions-item :label="$t('出货渠道')">
{{details.channelName || '/'}} {{details.channelName || '/'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发地">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item> <el-descriptions-item :label="$t('始发地')">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>
<el-descriptions-item label="目的地">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item> <el-descriptions-item :label="$t('目的地')">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人姓名">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item> <el-descriptions-item :label="$t('发货人姓名')">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人公司">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item> <el-descriptions-item :label="$t('发货人公司')">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人电话">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item> <el-descriptions-item :label="$t('发货人电话')">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item> <el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="收货人姓名">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item> <el-descriptions-item :label="$t('收货人姓名')">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item>
<el-descriptions-item label="收货人公司">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item> <el-descriptions-item :label="$t('收货人公司')">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item>
<el-descriptions-item label="收货人电话"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item> <el-descriptions-item :label="$t('收货人电话')"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item> <el-descriptions-item></el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
......
src/views/ecw/order/components/specialNeeds.vue
View file @ 3af5883f
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<div class="content"> <div class="content">
<h1>{{orderNo}} 特需</h1> <h1>{{orderNo}} 特需</h1>
<el-form label-width="180px" label-position="left"> <el-form label-width="180px" label-position="left">
<el-form-item label="特殊要求"> <el-form-item :label="$t('特殊要求')">
<el-checkbox-group v-model="advanceType" > <el-checkbox-group v-model="advanceType" >
<el-checkbox @click="change(item)" v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)" :label="item.value" >{{item.label}}</el-checkbox> <el-checkbox @click="change(item)" v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)" :label="item.value" >{{item.label}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="特殊要求备注"><el-input type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item> <el-form-item :label="$t('特殊要求备注')"><el-input type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
<el-form-item v-for="(item,index) in this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'"> <el-form-item v-for="(item,index) in this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'">
<el-input style="width: 300px;" v-model="specialNeedsList[index].transFee"> <el-input style="width: 300px;" v-model="specialNeedsList[index].transFee">
<div style="width: 100px;" slot="append" > <div style="width: 100px;" slot="append" >
...@@ -20,15 +20,15 @@ ...@@ -20,15 +20,15 @@
</div> </div>
</el-input> </el-input>
<div style="display: inline-block;margin-left: 20px;"> <div style="display: inline-block;margin-left: 20px;">
<span style="margin-right: 10px;">付款类型</span> <span style="margin-right: 10px;">{{ $t('付款类型') }}</span>
<dict-selector placeholder="请选择付款类型" v-model="specialNeedsList[index].payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector> <dict-selector :placeholder="$t('请选择付款类型')" v-model="specialNeedsList[index].payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">提交</el-button> <el-button type="primary" @click="submit">{{ $t('提交') }}</el-button>
<el-button @click="$emit('update:show',false)">取消</el-button> <el-button @click="$emit('update:show',false)">{{ $t('取消') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/ecw/order/components/warehouseDetails.vue
View file @ 3af5883f
<template> <template>
<div> <div>
<h1> <h1>{{ $t('申请信息【订单信息】') }}</h1>
申请信息【订单信息】
</h1>
<el-table :data="list" v-if="type === 1"> <el-table :data="list" v-if="type === 1">
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
label="订单编号"> :label="$t('订单编号')">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="marks" prop="marks"
label="唛头"> :label="$t('唛头')">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="已到箱数/总箱数"> label="已到箱数/总箱数">
...@@ -19,7 +17,7 @@ ...@@ -19,7 +17,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="下单统计"> :label="$t('下单统计')">
<template v-slot="{row}"> <template v-slot="{row}">
<div v-if="row.costVO"> <div v-if="row.costVO">
箱数：{{row.costVO.totalNum}} 箱数：{{row.costVO.totalNum}}
...@@ -29,7 +27,7 @@ ...@@ -29,7 +27,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="入仓统计"> :label="$t('入仓统计')">
<template v-slot="{row}"> <template v-slot="{row}">
<div>总箱数：{{row.totalNum}}</div> <div>总箱数：{{row.totalNum}}</div>
<div>体积：{{row.sumVolume}}CBM </div> <div>体积：{{row.sumVolume}}CBM </div>
...@@ -37,24 +35,24 @@ ...@@ -37,24 +35,24 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="入仓时间"> :label="$t('入仓时间')">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.rucangTime)}} {{parseTime(row.rucangTime)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="运输方式"> :label="$t('运输方式')">
<template v-slot = {row}> <template v-slot = {row}>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="出货渠道"> :label="$t('出货渠道')">
<template v-slot="{row}">{{row.channelName || '/'}}</template> <template v-slot="{row}">{{row.channelName || '/'}}</template>
</el-table-column> </el-table-column>
<el-table-column label="始发仓" prop="startWarehouseName"></el-table-column> <el-table-column :label="$t('始发仓')" prop="startWarehouseName"></el-table-column>
<el-table-column label="目的地" prop="objectiveName"></el-table-column> <el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column label="发货人"> <el-table-column :label="$t('发货人')">
<template v-slot="{row}"> <template v-slot="{row}">
<p> <p>
{{row.consignorName}} {{row.consignorName}}
...@@ -64,7 +62,7 @@ ...@@ -64,7 +62,7 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收货人"> <el-table-column :label="$t('收货人')">
<template v-slot="{row}"> <template v-slot="{row}">
<p> <p>
{{row.consigneeName}} {{row.consigneeName}}
...@@ -76,50 +74,48 @@ ...@@ -76,50 +74,48 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-descriptions v-else-if="type === 2" :column="4" border> <el-descriptions v-else-if="type === 2" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderBackVO.orderNo}}</el-descriptions-item> <el-descriptions-item :label="$t('订单号')">{{FeeDetails.orderBackVO.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.orderBackVO.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.orderBackVO.transportId"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出货方式"> <el-descriptions-item :label="$t('出货方式')">
{{selectChannel(FeeDetails.channelId)}} {{selectChannel(FeeDetails.channelId)}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.orderBackVO.abnormalState"></dict-tag> <dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.orderBackVO.abnormalState"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="唛头"> <el-descriptions-item :label="$t('唛头')">
{{FeeDetails.orderBackVO.marks}} {{FeeDetails.orderBackVO.marks}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.startWarehouse}}</el-descriptions-item> <el-descriptions-item :label="$t('始发仓')">{{FeeDetails.startWarehouse}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.destWarehouse}}</el-descriptions-item> <el-descriptions-item :label="$t('目的仓')">{{FeeDetails.destWarehouse}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions v-else-if="type === 3 || type === 4" :column="4" border> <el-descriptions v-else-if="type === 3 || type === 4" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderNo}}</el-descriptions-item> <el-descriptions-item :label="$t('订单号')">{{FeeDetails.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.transportId"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出货方式"> <el-descriptions-item :label="$t('出货方式')">
{{selectChannel(FeeDetails.channelId)}} {{selectChannel(FeeDetails.channelId)}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态"> <el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.abnormalState"></dict-tag> <dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.abnormalState"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="唛头"> <el-descriptions-item :label="$t('唛头')">
{{FeeDetails.marks}} {{FeeDetails.marks}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.logisticsInfoDto.startTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('始发仓')">{{FeeDetails.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.logisticsInfoDto.destTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('目的仓')">{{FeeDetails.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div v-if="type === 1"> <div v-if="type === 1">
<p> <p>{{ $t('申请说明') }}</p>
申请说明
</p>
<div > <div >
从 【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseOutId ? FeeDetails.details.warehouseOutId : '' )}}】 调到 从 【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseOutId ? FeeDetails.details.warehouseOutId : '' )}}】 调到
【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseInId ? FeeDetails.details.warehouseInId : '' )}}】 【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseInId ? FeeDetails.details.warehouseInId : '' )}}】
</div> </div>
</div> </div>
<div v-if="type === 2"> <div v-if="type === 2">
<p>申请理由</p> <p>{{ $t('申请理由') }}</p>
<div> <div>
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="FeeDetails.feeType" />， <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="FeeDetails.feeType" />，
{{FeeDetails.applicationFee}} {{FeeDetails.applicationFee}}
...@@ -130,19 +126,19 @@ ...@@ -130,19 +126,19 @@
</div> </div>
</div> </div>
<div v-if="type === 3"> <div v-if="type === 3">
<p>申请理由</p> <p>{{ $t('申请理由') }}</p>
<div> <div>
{{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}} {{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
</div> </div>
</div> </div>
<div v-if="type === 4"> <div v-if="type === 4">
<p>申请理由</p> <p>{{ $t('申请理由') }}</p>
<div> <div>
用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ prodName }}】信息： 用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ prodName }}】信息：
<ol> <ol>
<template v-for="item in FeeDetails.details.applyInfoVOList"> <template v-for="item in FeeDetails.details.applyInfoVOList">
<li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li> <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
<li v-else-if="item.newValue === undefined">删除入仓</li> <li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }}</li>
<li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li> <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
</template> </template>
</ol> </ol>
......
src/views/ecw/order/components/warehouseLocation.vue
View file @ 3af5883f
<template> <template>
<div> <div>
<el-dialog <el-dialog
title="选择储位" :title="$t('选择储位')"
:visible.sync="opened" :visible.sync="opened"
width="600px" width="600px"
:before-close="handleClose()" :before-close="handleClose()"
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}"> <el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}">
<el-tab-pane v-if="item.warehouseId === warehouseId" :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index"> <el-tab-pane v-if="item.warehouseId === warehouseId" :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index">
<div> <div>
<div style="text-align: center">区域</div> <div style="text-align: center">{{ $t('区域') }}</div>
<div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px"> <div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" v-for="warehouse in item.children" :key="warehouse.id"> <el-col :span="12" v-for="warehouse in item.children" :key="warehouse.id">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div> <div>
<div style="text-align: center">仓位</div> <div style="text-align: center">{{ $t('仓位') }}</div>
<div class="position-group"> <div class="position-group">
<div class="position" v-for="position in activeWarehouse.positionList" :key="position.id" @click="handleSelectPosition(position)"> <div class="position" v-for="position in activeWarehouse.positionList" :key="position.id" @click="handleSelectPosition(position)">
<template v-if="position.children"> <template v-if="position.children">
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<span slot="footer"> <span slot="footer">
<el-button @click="opened = false">关 闭</el-button> <el-button @click="opened = false">{{ $t('关 闭') }}</el-button>
<el-button type="primary" @click="handleSubmit()">提 交</el-button> <el-button type="primary" @click="handleSubmit()">{{ $t('提 交') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/ecw/order/detail.vue
View file @ 3af5883f
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}"> <el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}">
<el-descriptions-item :label="$t('付款人')"> <el-descriptions-item :label="$t('付款人')">
<el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">自定义</el-link> <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">{{ $t('自定义') }}</el-link>
<dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag> <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
...@@ -169,10 +169,10 @@ ...@@ -169,10 +169,10 @@
<template slot-scope="{row}"> <template slot-scope="{row}">
<template v-if="row.charging ==1"> <template v-if="row.charging ==1">
<template v-if="!row.seaFreight">未报价</template> <template v-if="!row.seaFreight">{{ $t('未报价') }}</template>
<el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link> <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
</template> </template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template> <template v-else-if="!row.seaFreight && !row.clearanceFreight">{{ $t('未报价') }}</template>
<template v-else> <template v-else>
<el-link type="primary" @click="showFeeDetail(row, 'freight')"> <el-link type="primary" @click="showFeeDetail(row, 'freight')">
{{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} {{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
...@@ -419,7 +419,7 @@ export default { ...@@ -419,7 +419,7 @@ export default {
const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
// 不是特价则显示其他字段 // 不是特价则显示其他字段
freightFields = [ freightFields = [
// {field: 'oneSeaFreight', label: '成交单价'}, // {field: 'oneSeaFreight', label: this.$t('成交单价')},
{field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')}, {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
// {field: 'brandFreightPrice', label: this.$t('品牌加价')}, // {field: 'brandFreightPrice', label: this.$t('品牌加价')},
{field: 'liquidFreightPrice', label: this.$t('液体加价')}, {field: 'liquidFreightPrice', label: this.$t('液体加价')},
...@@ -481,11 +481,11 @@ export default { ...@@ -481,11 +481,11 @@ export default {
freight.push({ freight.push({
label: '价格更新时间', label: this.$t('价格更新时间'),
value: parseTime(row.updateTime) value: parseTime(row.updateTime)
}) })
clearance.push({ clearance.push({
label: '价格更新时间', label: this.$t('价格更新时间'),
value: parseTime(row.updateTime) value: parseTime(row.updateTime)
}) })
this.feeDetail = {freight, clearance, charging: row.charging} this.feeDetail = {freight, clearance, charging: row.charging}
......
src/views/ecw/order/edit.vue
View file @ 3af5883f
...@@ -372,8 +372,8 @@ ...@@ -372,8 +372,8 @@
<el-form-item :label="$t('付款人')" prop="drawee"> <el-form-item :label="$t('付款人')" prop="drawee">
<dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" :disabled="false"/> <dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" :disabled="false"/>
<el-table :data="customDraweeList" v-if="form.drawee==3" > <el-table :data="customDraweeList" v-if="form.drawee==3" >
<el-table-column label="费用类型" prop="label" width="200px"></el-table-column> <el-table-column :label="$t('费用类型')" prop="label" width="200px"></el-table-column>
<el-table-column label="付款人" width="300px"> <el-table-column :label="$t('付款人')" width="300px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-selector :type="DICT_TYPE.DRAWEE" :filter="(e) => e.value == '1' || e.value == '2'" v-model="row.value" form-type="radio" :disabled="false"/> <dict-selector :type="DICT_TYPE.DRAWEE" :filter="(e) => e.value == '1' || e.value == '2'" v-model="row.value" form-type="radio" :disabled="false"/>
</template> </template>
...@@ -411,12 +411,12 @@ ...@@ -411,12 +411,12 @@
<el-form-item :label="$t('清关证书')"> <el-form-item :label="$t('清关证书')">
<dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" /> <dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
</el-form-item> </el-form-item>
<el-form-item label="清关证书备注" > <el-form-item :label="$t('清关证书备注')" >
<el-input v-model="form.remarks" :disabled="false"></el-input> <el-input v-model="form.remarks" :disabled="false"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-if="[3,4].indexOf(+form.transportId) > -1"> <div v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item label="是否拆包"> <el-form-item :label="$t('是否拆包')">
<dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" /> <dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
</el-form-item> </el-form-item>
</div> </div>
...@@ -480,8 +480,8 @@ ...@@ -480,8 +480,8 @@
<el-table-column :label="$t('件数')" prop="num"></el-table-column> <el-table-column :label="$t('件数')" prop="num"></el-table-column>
<el-table-column :label="$t('重量') + '(kg)'" prop="weight"></el-table-column> <el-table-column :label="$t('重量') + '(kg)'" prop="weight"></el-table-column>
<el-table-column :label="$t('体积') + '(m³)'" prop="volume"></el-table-column> <el-table-column :label="$t('体积') + '(m³)'" prop="volume"></el-table-column>
<!-- <el-table-column label="有无单证" prop="">// TODO</el-table-column> --> <!-- <el-table-column :label="$t('有无单证')" prop="">// TODO</el-table-column> -->
<!-- <el-table-column label="缺货箱数" prop="lessNum"></el-table-column> --> <!-- <el-table-column :label="$t('缺货箱数')" prop="lessNum"></el-table-column> -->
<el-table-column :label="$t('数量')" prop="quantity"></el-table-column> <el-table-column :label="$t('数量')" prop="quantity"></el-table-column>
<el-table-column :label="$t('材质')" prop="material"></el-table-column> <el-table-column :label="$t('材质')" prop="material"></el-table-column>
</el-table> </el-table>
......
src/views/ecw/order/exception/index.vue
View file @ 3af5883f
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<!-- <el-button icon="el-icon-refresh" @click="reset">重置</el-button> --> <!-- <el-button icon="el-icon-refresh" @click="reset">{{ $t('重置') }}</el-button> -->
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
......
src/views/ecw/order/index.vue
View file @ 3af5883f
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<el-form-item :label="$t('编号')" prop="orderNo"> <el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="唛头" prop="marks"> <!-- <el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品分类" prop="goodsType"> <!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
<selector v-model="queryParams.goodsType" :options="productAttrList" label-field="attrName" value-field="id"> <selector v-model="queryParams.goodsType" :options="productAttrList" label-field="attrName" value-field="id">
</selector> </selector>
</el-form-item> </el-form-item>
<el-form-item label="品名" prop="prodId"> <el-form-item :label="$t('品名')" prop="prodId">
<product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" /> <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brand"> <el-form-item :label="$t('品牌')" prop="brand">
<dict-selector v-model="queryParams.brand" :type="DICT_TYPE.ECW_IS_BRAND" formatter="bool" clearable <dict-selector v-model="queryParams.brand" :type="DICT_TYPE.ECW_IS_BRAND" formatter="bool" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<!--// 字段存疑--> <!--// 字段存疑-->
<dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/> <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="重货比" prop="weightRatio"> <!-- <el-form-item :label="$t('重货比')" prop="weightRatio">
<el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange" <el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange"
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
- -
...@@ -558,15 +558,15 @@ export default { ...@@ -558,15 +558,15 @@ export default {
let actions = { let actions = {
cancelOrder: { cancelOrder: {
callable: cancelOrder, callable: cancelOrder,
confirm: '确定要取消此订单么？' confirm: this.$t('确定要取消此订单么？')
}, },
recoveryOrder: { recoveryOrder: {
callable: recoveryOrder, callable: recoveryOrder,
confirm: '确定要恢复此订单么？' confirm: this.$t('确定要恢复此订单么？')
}, },
deleteOrder: { deleteOrder: {
callable: deleteOrder, callable: deleteOrder,
confirm: '确定要删除此订单么？' confirm: this.$t('确定要删除此订单么？')
} }
} }
let action = actions[type] let action = actions[type]
......
src/views/ecw/order/prepayDeal.vue
View file @ 3af5883f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<el-row> <el-row>
<el-form-item :label="$t('运输路线')+':'" > <el-form-item :label="$t('运输路线')+':'" >
<span v-if="orderData">【<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />】</span> <span v-if="orderData">{{ $t('【') }}<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />{{ $t('】') }}</span>
{{orderData?getRouterNameById():''}} {{orderData?getRouterNameById():''}}
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} --> <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}} {{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-form-item> </el-form-item>
<el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">新增收款单</el-button> <el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">{{ $t('新增收款单') }}</el-button>
</el-row> </el-row>
<el-row v-if="orderExceptionData.orderExceptionDetails"> <el-row v-if="orderExceptionData.orderExceptionDetails">
<el-form-item :label="$t('详细内容')+':'"> <el-form-item :label="$t('详细内容')+':'">
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<!--预付异常的备选需要根据接口数据过滤--> <!--预付异常的备选需要根据接口数据过滤-->
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'"> <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item :label="$t('处理结果')+':'" required> <el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable> <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"> <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) ==-1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/> <el-option :disabled="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) ==-1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template> </template>
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
</el-row> </el-row>
<el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'"> <el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
<el-form-item :label="$t('处理结果')+':'" required> <el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable> <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"> <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/> <el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template> </template>
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item :label="$t('处理结果')+':'" required v-if="handlerParams.orderExceptionStatus==2"> <el-form-item :label="$t('处理结果')+':'" required v-if="handlerParams.orderExceptionStatus==2">
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable> <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_don_result')" <el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_don_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
// 根据线路id显示线路名称 // 根据线路id显示线路名称
getRouterNameById(){ getRouterNameById(){
if(this.orderData.logisticsInfoDto) { if(this.orderData.logisticsInfoDto) {
return this.$t('从')+'【'+this.orderData.logisticsInfoDto.startTitleZh + '】'+this.$t('发往')+'【' + this.orderData.logisticsInfoDto.destTitleZh+'】' return this.$t('从')+this.$t('【')+this.orderData.logisticsInfoDto.startTitleZh + this.$t('】')+this.$t('发往')+this.$t('【') + this.orderData.logisticsInfoDto.destTitleZh+this.$t('】')
} }
return this.$t('无') return this.$t('无')
}, },
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
cancelAudit(){ cancelAudit(){
this.$prompt("请输入取消原因", { this.$prompt("请输入取消原因", {
inputPattern: /[\S]+/, inputPattern: /[\S]+/,
inputErrorMessage: '不能为空' inputErrorMessage: this.$t('不能为空')
}).then(({value}) => { }).then(({value}) => {
return cancelProcessInstance(this.orderExceptionData.bpmId, value) return cancelProcessInstance(this.orderExceptionData.bpmId, value)
}) })
......
src/views/ecw/order/singleApply.vue
View file @ 3af5883f
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="入仓货物属性" align="center"> <el-table-column :label="入仓货物属性" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>合计：</span> <span>{{ $t('合计：') }}</span>
<span>{{scope.row.mergedOrder.sumNum+'箱 '+scope.row.mergedOrder.sumVolume+'m³ '+scope.row.mergedOrder.sumWeight+'kg'}}</span> <span>{{scope.row.mergedOrder.sumNum+'箱 '+scope.row.mergedOrder.sumVolume+'m³ '+scope.row.mergedOrder.sumWeight+'kg'}}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" /> @pagination="getList" />
<!-- <el-row v-if="singleData.length>0"> <!-- <el-row v-if="singleData.length>0">
<el-checkbox v-model="checked">需要仓库打包</el-checkbox> <el-checkbox v-model="checked">{{ $t('需要仓库打包') }}</el-checkbox>
</el-row> --> </el-row> -->
</el-card> </el-card>
<work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow> <work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
......
src/views/ecw/order/special/Commission.vue
View file @ 3af5883f
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
<el-form-item :label="$t('英文名称')"> <el-form-item :label="$t('英文名称')">
<span>{{ orderItem.prodTitleEn }}</span> <span>{{ orderItem.prodTitleEn }}</span>
</el-form-item> </el-form-item>
<el-form-item :label="$t('线路')"> <el-form-item :label="$t('线路')">{{ $t('【') }}<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
{{ channel ? $l(channel, 'title') : '' }} {{ channel ? $l(channel, 'title') : '' }}
{{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}} {{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}}
</el-form-item> </el-form-item>
...@@ -43,13 +42,13 @@ ...@@ -43,13 +42,13 @@
</el-form-item> </el-form-item>
<!-- 明佣或者明佣+暗佣才显示 --> <!-- 明佣或者明佣+暗佣才显示 -->
<el-form-item label="明佣佣金" v-if="form.commissionType == 1 || form.commissionType == 3"> <el-form-item :label="$t('明佣佣金')" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-input v-model="form.lightCommissionAmount" type="number" placeholder="" class="w-100"></el-input> <el-input v-model="form.lightCommissionAmount" type="number" placeholder="" class="w-100"></el-input>
{{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item> </el-form-item>
<!-- 明佣+暗佣才显示 --> <!-- 明佣+暗佣才显示 -->
<el-form-item label="暗佣佣金" v-if="form.commissionType == 3" prop="shadeCommissionAmount" :rules="{validator: shadeCommissionValidator, message: '暗佣设置错误', trigger: 'blur'}"> <el-form-item :label="$t('暗佣佣金')" v-if="form.commissionType == 3" prop="shadeCommissionAmount" :rules="{validator: shadeCommissionValidator, message: '暗佣设置错误', trigger: 'blur'}">
<el-input v-model="form.shadeCommissionAmount" placeholder="" type="number" class="w-100"></el-input> <el-input v-model="form.shadeCommissionAmount" placeholder="" type="number" class="w-100"></el-input>
{{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item> </el-form-item>
...@@ -88,17 +87,17 @@ ...@@ -88,17 +87,17 @@
</div> </div>
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="commission_config" v-model="ccIdArr" /> <work-flow xmlkey="commission_config" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button> <el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)"> <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" /> <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button> </el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button> <el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">返回</el-button> <el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
...@@ -141,8 +140,8 @@ export default { ...@@ -141,8 +140,8 @@ export default {
type: 3 type: 3
}, },
rules:{ rules:{
seaFreight : {required: true, message: '运费不能为空'}, seaFreight : {required: true, message: this.$t('运费不能为空')},
clearanceFreight: {required: true, message: '清关费不能为空'} clearanceFreight: {required: true, message: this.$t('清关费不能为空')}
}, },
productType: null, productType: null,
channel: null, channel: null,
...@@ -168,7 +167,7 @@ export default { ...@@ -168,7 +167,7 @@ export default {
getChannelNameById(){ getChannelNameById(){
return channelId => { return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : '' return s ? this.$t('【') + s + this.$t('】') : ''
} }
}, },
currencyMap(){ currencyMap(){
......
src/views/ecw/order/special/Discount.vue
View file @ 3af5883f
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
<el-form-item :label="$t('英文名称')"> <el-form-item :label="$t('英文名称')">
<span>{{ orderItem.prodTitleEn }}</span> <span>{{ orderItem.prodTitleEn }}</span>
</el-form-item> </el-form-item>
<el-form-item :label="$t('线路')"> <el-form-item :label="$t('线路')">{{ $t('【') }}<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
{{ channel ? $l(channel, 'title') : '' }} {{ channel ? $l(channel, 'title') : '' }}
{{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}} {{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}}
</el-form-item> </el-form-item>
...@@ -55,17 +54,17 @@ ...@@ -55,17 +54,17 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" /> <work-flow xmlkey="special_apply" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button> <el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)"> <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" /> <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button> </el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button> <el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">返回</el-button> <el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
...@@ -118,8 +117,8 @@ export default { ...@@ -118,8 +117,8 @@ export default {
ccIdArr: [], ccIdArr: [],
form: { }, form: { },
rules:{ rules:{
freight : {required: true, message: '运费不能为空'}, freight : {required: true, message: this.$t('运费不能为空')},
clearanceFreight: {required: true, message: '清关费不能为空'} clearanceFreight: {required: true, message: this.$t('清关费不能为空')}
}, },
productType: null, productType: null,
channel: null channel: null
...@@ -186,7 +185,7 @@ export default { ...@@ -186,7 +185,7 @@ export default {
getChannelNameById(){ getChannelNameById(){
return channelId => { return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : '' return s ? this.$t('【') + s + this.$t('】') : ''
} }
}, },
currentMap(){ currentMap(){
......
src/views/ecw/order/special/Preferential.vue
View file @ 3af5883f
...@@ -20,18 +20,18 @@ ...@@ -20,18 +20,18 @@
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" /> <work-flow xmlkey="special_apply" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('提交') }}</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)"> <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" /> <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button> </el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button> <el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">返回</el-button> <el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
......
src/views/ecw/order/special/index.vue
View file @ 3af5883f
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="成本价"> :label="$t('成本价')">
<template v-slot="{row}"> <template v-slot="{row}">
<template v-if="!row.costSeaFreight">{{$t('未报价')}}</template> <template v-if="!row.costSeaFreight">{{$t('未报价')}}</template>
<template v-else-if="row.charging"> <template v-else-if="row.charging">
......
src/views/ecw/order/success.vue
View file @ 3af5883f
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="line">{{$t('商品列表')}}： <div class="line">{{$t('商品列表')}}：
<span v-for="(item, index) in order.orderItemVOList" :key="index"> <span v-for="(item, index) in order.orderItemVOList" :key="index">
{{item.prodTitleZh}} {{item.prodTitleZh}}
<template v-if="index < order.orderItemVOList.length - 1">、</template> <template v-if="index < order.orderItemVOList.length - 1">{{ $t('、') }}</template>
</span> </span>
</div> </div>
<div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div> <div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div>
......
src/views/ecw/order/transferWarehousing.vue
View file @ 3af5883f
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
}) })
let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg` let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg` let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
return ['合计：',text,text2] return [this.$t('合计：'),text,text2]
}, },
cancellationOfOrder(){ cancellationOfOrder(){
this.$prompt(this.$t('请输入取消调仓原因'), this.$t('提示'), { this.$prompt(this.$t('请输入取消调仓原因'), this.$t('提示'), {
......
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