Commit 8eb28edf authored by dcy's avatar dcy

入仓国际化

parent 8014b344
......@@ -5,60 +5,60 @@
<order-base-info :order="order"></order-base-info>
<div style="margin-top: 20px">
<span>储位{{ ($refs.area ? $refs.area.selected : []).join(',') }}</span>
<el-button type="primary" size="mini" @click="areaVisible = true" style="margin-left: 15px">选择</el-button>
<span>{{$t('储位')}}{{ ($refs.area ? $refs.area.selected : []).join(',') }}</span>
<el-button type="primary" size="mini" @click="areaVisible = true" style="margin-left: 15px">{{$t('选择')}}</el-button>
</div>
<h2>货物信息</h2>
<h2>{{$t('货物信息')}}</h2>
<el-table
:data="order.orderItemVOList || []"
style="width: 100%">
<el-table-column
type="index"
width="50"
label="序号">
:label="$t('序号')">
</el-table-column>
<el-table-column
prop="prodTitleZh"
label="品名">
:label="$t('品名')">
<template v-slot="{row}">
{{ row.prodTitleZh }}<br>
{{ row.prodTitleEn }}
</template>
</el-table-column>
<el-table-column
label="填单货物属性">
:label="$t('填单货物属性')">
<template v-slot="{row}">
<span v-if="row.isWarehouseInAdd">非填单货物信息</span>
<span v-if="row.isWarehouseInAdd">{{$t('非填单货物信息')}}</span>
<template v-else>
品牌:{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
箱数{{ row.num }}<br>
体积{{ row.volume }}<br>
重量{{ row.weight }}Kg
{{$t('品牌')}}{{ [$t('无牌'), $t('有牌'), $t('中性')][row.brandType] }}<br>
{{$t('箱数')}}{{ row.num }}<br>
{{$t('体积')}}{{ row.volume }}<br>
{{$t('重量')}}{{ row.weight }}Kg
</template>
</template>
</el-table-column>
<el-table-column
label="入库货物属性">
:label="$t('入库货物属性')">
<template v-slot="{row}">
<template v-if="row.warehouseInInfoVO">
品牌:{{ ['无牌', '有牌', '中性'][row.feeType] }}<br>
箱数{{ row.warehouseInInfoVO.cartonsNum }}<br>
体积{{ row.warehouseInInfoVO.volume }}<br>
重量{{ row.warehouseInInfoVO.weight }}Kg
{{$t('品牌')}}{{ [$t('无牌'), $t('有牌'), $t('中性')][row.feeType] }}<br>
{{$t('箱数')}}{{ row.warehouseInInfoVO.cartonsNum }}<br>
{{$t('体积')}}{{ row.warehouseInInfoVO.volume }}<br>
{{$t('重量')}}{{ row.warehouseInInfoVO.weight }}Kg
</template>
<span v-else>暂无入仓信息</span>
<span v-else>{{$t('暂无入仓信息')}}</span>
</template>
</el-table-column>
<el-table-column
prop="expressNo"
v-slot="{row}"
label="快递单号">
:label="$t('快递单号')">
{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
</el-table-column>
<el-table-column
prop="createTime"
label="最后操作时间">
:label="$t('最后操作时间')">
<template v-slot="{row}">
{{ parseTime(row.createTime) }}
</template>
......@@ -66,29 +66,29 @@
<el-table-column
prop="diffType"
v-slot="{row}"
label="状态">
:label="$t('状态')">
<dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
<span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}</span>
<span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
</el-table-column>
<el-table-column
prop="address"
label="操作">
:label="$t('操作')">
<template v-slot="{ row, column, $index }">
<el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
<el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing($index)">{{$t('修改')}}</el-button>
<template v-else-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
<el-button size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
<el-button size="mini" type="text" @click="handleWarehousing($index)">{{$t('追加')}}</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
</template>
<el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
<el-button v-else size="mini" type="text" @click="handleWarehousing($index)">{{$t('入仓')}}</el-button>
</template>
</el-table-column>
</el-table>
<h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
<h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 400px">
<el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
<el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
<el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="$t('请输入') + item.label">
<el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" :placeholder="$t('请选择')" slot="append" style="width: 100px">
<el-option
v-for="item in currencyList"
:key="item.id"
......@@ -99,21 +99,21 @@
</el-input>
</el-form-item>
<h2>订单数据</h2>
<el-form-item label="总方数" style="width: 300px">
<el-input v-model="form.sumVolume" placeholder="请输入总方数" readonly>
<h2>{{$t('订单数据')}}</h2>
<el-form-item :label="$t('总方数')" style="width: 300px">
<el-input v-model="form.sumVolume" :placeholder="$t('请输入总方数')" readonly>
<span slot="append"></span>
</el-input>
</el-form-item>
<el-form-item label="总重量" style="width: 300px">
<el-input v-model="form.sumWeight" placeholder="请输入总重量" readonly>
<el-form-item :label="$t('总重量')" style="width: 300px">
<el-input v-model="form.sumWeight" :placeholder="$t('请输入总重量')" readonly>
<span slot="append">kg</span>
</el-input>
</el-form-item>
<el-card style="margin-top: 15px;">
<div slot="header" class="clearfix">
<span style="font-size: 18px">入仓影像</span>
<span style="font-size: 18px">{{$t('入仓影像')}}</span>
</div>
<div>
<image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
......@@ -121,7 +121,7 @@
</el-card>
<template v-if="order.parentOrderId && isEdit">
<h2>标签箱号</h2>
<h2>{{$t('标签箱号')}}</h2>
<div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
<el-input-number v-model="item.start" controls-position="right"></el-input-number> -
......@@ -130,12 +130,12 @@
<el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
</div>
<div style="text-align: center">
<el-button type="primary" @click="handleLabelSubmit">修改箱号</el-button>
<el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>
</div>
</template>
<div style="text-align: center;margin-top: 15px" v-if="!isEdit">
<el-button @click="escapeBol = true;" type="primary">转异</el-button>
<el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
<el-button @click="escapeBol = true;" type="primary">{{$t('转异')}}</el-button>
<el-button type="primary" @click="finishVisible = true">{{$t('完成入仓')}}</el-button>
</div>
</el-form>
......@@ -146,33 +146,33 @@
<!-- 完成入仓 -->
<el-dialog
title="确认入仓"
:title="$t('确认入仓')"
:visible.sync="finishVisible"
width="300px">
<div style="text-align: center">在完成入仓前,您还可以</div>
<div style="text-align: center">{{$t('在完成入仓前,您还可以')}}</div>
<div style="text-align: center;padding: 15px 0">
<el-button type="info" @click="areaVisible = true">选择储位</el-button>
<el-button type="info" @click="isShowPrintTag = true">打印标签</el-button>
<el-button type="info" @click="areaVisible = true">{{$t('选择储位')}}</el-button>
<el-button type="info" @click="isShowPrintTag = true">{{$t('打印标签')}}</el-button>
</div>
<div style="text-align: center">
<el-button type="primary" @click="handleSubmit()">确 定</el-button>
<el-button type="primary" @click="handleSubmit()">{{$t('确 定')}}</el-button>
</div>
</el-dialog>
<el-dialog :title="order.orderNo + '订单转异'" center :visible.sync="escapeBol">
<el-dialog :title="order.orderNo + $t('订单转异')" center :visible.sync="escapeBol">
<el-form label-position="top" label-width="200">
<el-form-item label="原因类型">
<el-form-item :label="$t('原因类型')">
<dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
</el-form-item>
<el-form-item required label="附件">
<el-form-item required :label="$t('附件')">
<image-upload v-model="form.exceptionUrls"></image-upload>
</el-form-item>
<el-form-item label="详细信息">
<el-form-item :label="$t('详细信息')">
<el-input v-model="form.descZh" type="textarea"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit">确认并完成入仓</el-button>
<el-button @click="escapeBol = false">取消</el-button>
<el-button type="primary" @click="handleSubmit">{{$t('确认并完成入仓')}}</el-button>
<el-button @click="escapeBol = false">{{$t('取消')}}</el-button>
</span>
</el-dialog>
......
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