Skip to content

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

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents 0e778b8e 554c13af
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 90 deletions
src/components/ImageAndVideoUpload/index.vue
View file @ 054714e3
...@@ -24,16 +24,14 @@ ...@@ -24,16 +24,14 @@
</el-upload> </el-upload>
<!-- 上传提示 --> <!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip"> <div class="el-upload__tip" slot="tip" v-if="showTip">
请上传 {{ $t('请上传') }}
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template> <br> <template v-if="fileSize">{{ $t('大小不超过') }}<b style="color: #f56c6c">{{ fileSize }}MB</b> </template> <br>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template> <template v-if="fileType">{{ $t('格式为') }}<b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>{{ $t('的文件') }}</div>
的文件
</div>
</div> </div>
</div> </div>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
title="预览" :title="$t('预览')"
width="800" width="800"
append-to-body append-to-body
> >
......
src/components/OrderBaseInfo/index.vue
View file @ 054714e3
<template> <template>
<div> <div>
<el-descriptions border v-if="order.orderId"> <el-descriptions border v-if="order.orderId">
<el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item> <el-descriptions-item :label="$t('唛头')">{{ order.marks }}</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item> <el-descriptions-item :label="$t('已到箱数/总箱数')">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item>
<el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item> <el-descriptions-item :label="$t('订单状态')"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发地">{{ order.logisticsInfoDto.startTitleZh || '' }}<span v-if="order.isExternalWarehouse" style="color: red">（外部仓）</span></el-descriptions-item> <el-descriptions-item :label="$t('始发地')">{{ order.logisticsInfoDto.startTitleZh || '' }}<span v-if="order.isExternalWarehouse" style="color: red">{{ $t('（外部仓）') }}</span></el-descriptions-item>
<el-descriptions-item label="目的地">{{ order.logisticsInfoDto.destTitleZh || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('目的地')">{{ order.logisticsInfoDto.destTitleZh || '' }}</el-descriptions-item>
<el-descriptions-item label="发货人姓名">{{ order.consignorVO && order.consignorVO.name || ''}}</el-descriptions-item> <el-descriptions-item :label="$t('发货人姓名')">{{ order.consignorVO && order.consignorVO.name || ''}}</el-descriptions-item>
<el-descriptions-item label="发货人公司">{{ order.consignorVO && order.consignorVO.company || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('发货人公司')">{{ order.consignorVO && order.consignorVO.company || '' }}</el-descriptions-item>
<el-descriptions-item label="发货人电话">{{ order.consignorVO && (order.consignorVO.countryCode + order.consignorVO.phone) || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('发货人电话')">{{ order.consignorVO && (order.consignorVO.countryCode + order.consignorVO.phone) || '' }}</el-descriptions-item>
<el-descriptions-item label="收货人姓名">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item> <el-descriptions-item :label="$t('收货人姓名')">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item>
<el-descriptions-item label="收货人公司">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('收货人公司')">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item>
<el-descriptions-item label="收货人电话">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('收货人电话')">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
<el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item> <el-descriptions-item :label="$t('送货时间')">{{ order.deliveryDate || '' }}</el-descriptions-item>
<el-descriptions-item label="入仓类型">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item> <el-descriptions-item :label="$t('入仓类型')">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
<el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item> <el-descriptions-item :label="$t('订单号')">{{ order.orderNo }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </template>
......
src/components/RightToolbar/index.vue
View file @ 054714e3
<template> <template>
<div class="top-right-btn"> <div class="top-right-btn">
<el-row> <el-row>
<el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top"> <el-tooltip class="item" effect="dark" :content="showSearch ? $t('隐藏搜索') : $t('显示搜索')" placement="top">
<el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" /> <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="刷新" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('刷新')" placement="top">
<el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" /> <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns"> <el-tooltip class="item" effect="dark" :content="$t('显隐列')" placement="top" v-if="columns">
<el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" /> <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
</el-tooltip> </el-tooltip>
</el-row> </el-row>
<el-dialog :title="title" :visible.sync="open" append-to-body> <el-dialog :title="title" :visible.sync="open" append-to-body>
<el-transfer <el-transfer
:titles="['显示', '隐藏']" :titles="[$t('显示'), $t('隐藏')]"
v-model="value" v-model="value"
:data="columns" :data="columns"
@change="dataChange" @change="dataChange"
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
// 显隐数据 // 显隐数据
value: [], value: [],
// 弹出层标题 // 弹出层标题
title: "显示/隐藏", title: this.$t('显示/隐藏'),
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
}; };
......
src/components/WarehouseAreaDialog/index.vue
View file @ 054714e3
<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 :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index"> <el-tab-pane :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">
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
</div> </div>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
已选择：{{ selected.join(', ') }} {{$t('已选择')}}：{{ selected.join(', ') }}
<el-divider></el-divider> <el-divider></el-divider>
</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/i18n/languages/en_US.json
View file @ 054714e3
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
"卸柜时间": "Unloading time", "卸柜时间": "Unloading time",
"开始卸柜": "Start unloading cabinet", "开始卸柜": "Start unloading cabinet",
"请先通过卸柜审批": "Please pass the unloading approval first", "请先通过卸柜审批": "Please pass the unloading approval first",
"请输入": "please enter", "请输入": "please enter ",
"一键卸柜": "One-click unloading", "一键卸柜": "One-click unloading",
"清关状态": "Clearance Status", "清关状态": "Clearance Status",
"异常状态": "Exception Status", "异常状态": "Exception Status",
...@@ -3528,5 +3528,27 @@ ...@@ -3528,5 +3528,27 @@
"手机号码不能为空": "Mobile number cannot be empty", "手机号码不能为空": "Mobile number cannot be empty",
"社交平台": "Social platform", "社交平台": "Social platform",
"已绑定": "Bound", "已绑定": "Bound",
"未绑定": "Unbound" "未绑定": "Unbound",
"已选择": "selected",
"隐藏搜索": "hide search",
"显示搜索": "show search",
"显隐列": "Display column",
"隐藏": "hide",
"显示/隐藏": "show/hide",
"（外部仓）": "(External warehouse)",
"请上传": "Please upload",
"大小不超过": "Size does not exceed ",
"格式为": "Format is ",
"的文件": " only",
"货物修改": "Goods modification",
"货物入仓": "Goods warehousing",
"文档地址": "Document address",
"退出登录": "Log out",
"主题风格设置": "Theme Style Settings",
"主题颜色": "Theme Colors",
"系统布局配置": "System layout configuration",
"固定": "fixed",
"动态标题": "Dynamic Title",
"保存配置": "Save",
"重置配置": "Reset"
} }
src/layout/components/Navbar.vue
View file @ 054714e3
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">--> <!-- <el-tooltip :content="$t('文档地址')" effect="dark" placement="bottom">-->
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />--> <!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</template> </template>
<!-- <el-select v-model="locale" placeholder="语言" class="right-menu-item select-nav" @change="localeChange"> <!-- <el-select v-model="locale" :placeholder="$t('语言')" class="right-menu-item select-nav" @change="localeChange">
<el-option v-for="dict in langDatas" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in langDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> --> </el-select> -->
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
<el-dropdown-item>{{$t('个人中心')}}</el-dropdown-item> <el-dropdown-item>{{$t('个人中心')}}</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item @click.native="setting = true"> <el-dropdown-item @click.native="setting = true">
<span>布局设置</span> <span>{{ $t('布局设置') }}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span>退出登录</span> <span>{{ $t('退出登录') }}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
......
src/layout/components/Settings/index.vue
View file @ 054714e3
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div> <div>
<div class="setting-drawer-content"> <div class="setting-drawer-content">
<div class="setting-drawer-title"> <div class="setting-drawer-title">
<h3 class="drawer-title">主题风格设置</h3> <h3 class="drawer-title">{{ $t('主题风格设置') }}</h3>
</div> </div>
<div class="setting-drawer-block-checbox"> <div class="setting-drawer-block-checbox">
<div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')"> <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
...@@ -33,44 +33,44 @@ ...@@ -33,44 +33,44 @@
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>主题颜色</span> <span>{{ $t('主题颜色') }}</span>
<theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" /> <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
</div> </div>
</div> </div>
<el-divider/> <el-divider/>
<h3 class="drawer-title">系统布局配置</h3> <h3 class="drawer-title">{{ $t('系统布局配置') }}</h3>
<div class="drawer-item"> <div class="drawer-item">
<span>开启 TopNav</span> <span>{{ $t('开启') }} TopNav</span>
<el-switch v-model="topNav" class="drawer-switch" /> <el-switch v-model="topNav" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>开启 Tags-Views</span> <span>{{ $t('开启') }} Tags-Views</span>
<el-switch v-model="tagsView" class="drawer-switch" /> <el-switch v-model="tagsView" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>固定 Header</span> <span>{{ $t('固定') }} Header</span>
<el-switch v-model="fixedHeader" class="drawer-switch" /> <el-switch v-model="fixedHeader" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>显示 Logo</span> <span>{{ $t('显示') }} Logo</span>
<el-switch v-model="sidebarLogo" class="drawer-switch" /> <el-switch v-model="sidebarLogo" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>动态标题</span> <span>{{ $t('动态标题') }}</span>
<el-switch v-model="dynamicTitle" class="drawer-switch" /> <el-switch v-model="dynamicTitle" class="drawer-switch" />
</div> </div>
<el-divider/> <el-divider/>
<el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button> <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">{{ $t('保存配置') }}</el-button>
<el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button> <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">{{ $t('重置配置') }}</el-button>
</div> </div>
</div> </div>
</template> </template>
......
src/router/index.js
View file @ 054714e3
...@@ -416,14 +416,14 @@ export const constantRoutes = [ ...@@ -416,14 +416,14 @@ export const constantRoutes = [
component: (resolve) => import('@/views/ecw/box/query'), component: (resolve) => import('@/views/ecw/box/query'),
props: true, props: true,
name: 'shippingDetail', name: 'shippingDetail',
meta: {title: '出货详情', icon: '', activeMenu: '/shipment/boxDetail'} meta: {titleZh: '出货详情', titleEn: "Shipping Details", icon: '', activeMenu: '/shipment/boxDetail'}
}, },
{ {
path: 'shippingSea/:shipmentId(\\d+)', path: 'shippingSea/:shipmentId(\\d+)',
component: (resolve) => import('@/views/ecw/box/shippingSea/shippingSea'), component: (resolve) => import('@/views/ecw/box/shippingSea/shippingSea'),
props: true, props: true,
name: 'shippingSea', name: 'shippingSea',
meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/boxSea'} meta: {titleZh: '海运出货操作', titleEn: "Ocean shipment operation", icon: '', activeMenu: '/shipment/boxSea'}
} }
] ]
}, },
...@@ -438,14 +438,14 @@ export const constantRoutes = [ ...@@ -438,14 +438,14 @@ export const constantRoutes = [
component: (resolve) => import('@/views/ecw/box/query'), component: (resolve) => import('@/views/ecw/box/query'),
props: true, props: true,
name: 'shippingDetail', name: 'shippingDetail',
meta: {title: '出货详情', icon: '', activeMenu: '/shipment/boxDetail'} meta: {titleZh: '出货详情', titleEn: "Shipping Details", icon: '', activeMenu: '/shipment/boxDetail'}
}, },
{ {
path: 'shippingSeaAir/:shipmentId(\\d+)', path: 'shippingSeaAir/:shipmentId(\\d+)',
component: (resolve) => import('@/views/ecw/box/shippingSeaAir/shippingSeaAir'), component: (resolve) => import('@/views/ecw/box/shippingSeaAir/shippingSeaAir'),
props: true, props: true,
name: 'shippingSeaAir', name: 'shippingSeaAir',
meta: {title: '海空联运出货操作', icon: '', activeMenu: '/shipment/boxSeaAir'} meta: {titleZh: '海空联运出货操作', titleEn: "Sea and Air Combined Shipping Operation", icon: '', activeMenu: '/shipment/boxSeaAir'}
} }
] ]
}, },
......
src/views/ecw/box/indexFutureBox.vue
View file @ 054714e3
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<el-form-item :label="$t('已装柜仓数')"> <el-form-item :label="$t('已装柜仓数')">
{{form.loadingNumber}} m³ {{form.loadingNumber}} m³
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<div> <div>
{{$t('未来')}} <el-input v-model="form.futureNumber" class="w-100"></el-input> {{$t('天货柜数')}} {{$t('未来')}} <el-input v-model="form.futureNumber" class="w-100"></el-input> {{$t('天货柜数')}}
...@@ -222,7 +222,7 @@ export default { ...@@ -222,7 +222,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: { form: {
}, },
// 表单校验 // 表单校验
rules: { rules: {
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
return id => { return id => {
let warehouse = this.importWarehouseList.find(item => item.id == id) let warehouse = this.importWarehouseList.find(item => item.id == id)
return this.$l(warehouse, 'title') return this.$l(warehouse, 'title')
} }
} }
/* importCityList(){ /* importCityList(){
return this.tradeCityList.filter(item => item.type == 1 || item.tye == 3) return this.tradeCityList.filter(item => item.type == 1 || item.tye == 3)
...@@ -314,7 +314,6 @@ export default { ...@@ -314,7 +314,6 @@ export default {
this.getVolume() this.getVolume()
}, },
'form.shippingChannelId'(){ 'form.shippingChannelId'(){
console.log('123shippingChannelId')
this.getVolume() this.getVolume()
}, },
'form.warehousedNumber'(){ 'form.warehousedNumber'(){
......
src/views/ecw/box/indexSea.vue
View file @ 054714e3
...@@ -296,7 +296,6 @@ export default { ...@@ -296,7 +296,6 @@ export default {
this.transportTypes = this.getDictDatas( this.transportTypes = this.getDictDatas(
this.DICT_TYPE.ECW_TRANSPORT_TYPE this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "1" || item.value == "2"); ).filter((item) => item.value == "1" || item.value == "2");
console.log(this.transportTypes)
getWarehouseList().then((res) => (this.warehouseList = res.data)); getWarehouseList().then((res) => (this.warehouseList = res.data));
getCabinetPage(null).then((response) => { getCabinetPage(null).then((response) => {
this.cabinetList = response.data.list; this.cabinetList = response.data.list;
......
src/views/ecw/box/query.vue
View file @ 054714e3
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class="status-line"></div> <div class="status-line"></div>
<div class="status-number">{{logList.length - index}}</div> <div class="status-number">{{logList.length - index}}</div>
<div class="status-info"> <div class="status-info">
<div>{{item.titleZh}}</div> <div>{{$l(item, 'title')}}</div>
<div> <div>
<p>{{formatDate(item.createTime)}}</p> <p>{{formatDate(item.createTime)}}</p>
<p>{{item.operator}}</p> <p>{{item.operator}}</p>
......
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 054714e3
...@@ -241,7 +241,6 @@ export default { ...@@ -241,7 +241,6 @@ export default {
...this.shipmentObj[voName], ...this.shipmentObj[voName],
documentInfo: this.shipmentObj.documentInfo?.split(",") ?? [], documentInfo: this.shipmentObj.documentInfo?.split(",") ?? [],
}; };
console.log(oldData)
if (!this.shipmentObj[voName]) { if (!this.shipmentObj[voName]) {
oldData.dcCustomsType = oldData.dcCustomsType oldData.dcCustomsType = oldData.dcCustomsType
......
src/views/ecw/customer/query.vue
View file @ 054714e3
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form :inline="true"> <el-form :inline="true">
<el-form-item :label="$t('运输方式：')"> <el-form-item :label="$t('运输方式：')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" /> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单状态：')"> <el-form-item :label="$t('订单状态：')">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"/> <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"/>
...@@ -166,7 +166,12 @@ ...@@ -166,7 +166,12 @@
<template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template> <template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('始发仓')" align="center" prop="departureName" /> <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">
<template slot-scope="{row}">
{{row.startWarehouseName}}
<span style="color:red" v-if="row.isExternalWarehouse">({{$t('外部仓')}})</span>
</template>
</el-table-column>
<el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId"> <el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.objectiveName}} <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.objectiveName}}
...@@ -183,7 +188,7 @@ ...@@ -183,7 +188,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination @pagination="getorderList" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="orderTotal" ></pagination> <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows" :total="orderTotal" ></pagination>
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('报价')"> <el-tab-pane :label="$t('报价')">
...@@ -568,8 +573,8 @@ export default { ...@@ -568,8 +573,8 @@ export default {
customerCreditLogList:[], customerCreditLogList:[],
rucangtime:[], rucangtime:[],
queryParams:{ queryParams:{
pageSize:10, rows:10,
pageNo:1 page:1
}, },
orderList:[], orderList:[],
orderTotal:0, orderTotal:0,
......
src/views/ecw/order/associatedOrder.vue
View file @ 054714e3
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{{$t('已加入关联订单列表')}} {{$t('已加入关联订单列表')}}
</h1> </h1>
<div style="flex: 1;margin-left: 20px;"> <div style="flex: 1;margin-left: 20px;">
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button> <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.relateOrderId})))" >{{$t('批量移出')}}</el-button>
</div> </div>
<div> <div>
<el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">{{$t('添加关联订单')}}</el-button> <el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">{{$t('添加关联订单')}}</el-button>
......
src/views/ecw/order/mutexOrder.vue
View file @ 054714e3
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
{{$t('已加入互斥订单列表')}} {{$t('已加入互斥订单列表')}}
</h1> </h1>
<div style="flex: 1;margin-left: 20px;"> <div style="flex: 1;margin-left: 20px;">
<el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,mutualOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button> <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,mutualOrderId:e.mutualOrderId})))" >{{$t('批量移出')}}</el-button>
</div> </div>
<div> <div>
<el-button type="primary" @click="$router.push('/order/not-mutex-order/'+ orderId)" >{{$t('添加互斥订单')}}</el-button> <el-button type="primary" @click="$router.push('/order/not-mutex-order/'+ orderId)" >{{$t('添加互斥订单')}}</el-button>
......
src/views/ecw/order/prepayDeal.vue
View file @ 054714e3
...@@ -201,10 +201,11 @@ ...@@ -201,10 +201,11 @@
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'"> <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('已核销预付金额')+':'"> <el-form-item :label="$t('已核销预付金额')+':'">
<span style="margin-left: 8px;" v-for="(item, key) of orderFee.writeOffAmount" :key="key">{{item}}{{currencyMap[key]}}</span> <span v-if="JSON.stringify(orderFee.writeOffAmount) != '{}'" style="margin-left: 8px;" v-for="(item, key) of orderFee.writeOffAmount" :key="key">{{item}}{{currencyMap[key]}}</span>
<span v-if="JSON.stringify(orderFee.writeOffAmount) == '{}'">0</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="320px"> <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="320px">
{{orderFee.writeOffAmountScale}}% {{orderFee.writeOffAmountScale}}%
</el-form-item> </el-form-item>
...@@ -216,7 +217,7 @@ ...@@ -216,7 +217,7 @@
{{orderFee.paymentGoodsWorth}} {{$t('人民币')}} {{orderFee.paymentGoodsWorth}} {{$t('人民币')}}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="320px"> <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="320px">
{{orderFee.paymentGoodsWorthScale}}% {{orderFee.paymentGoodsWorthScale}}%
</el-form-item> </el-form-item>
...@@ -229,7 +230,7 @@ ...@@ -229,7 +230,7 @@
{{orderFee.paymentGoodsVolume}} {{$t('立方米')}} {{orderFee.paymentGoodsVolume}} {{$t('立方米')}}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item :label="$t('预付商品货值占订单总运费+清关费比例')+':'" label-width="320px"> <el-form-item :label="$t('预付商品货值占订单总运费+清关费比例')+':'" label-width="320px">
{{orderFee.needWorthScale}}% {{orderFee.needWorthScale}}%
</el-form-item> </el-form-item>
...@@ -241,13 +242,13 @@ ...@@ -241,13 +242,13 @@
{{orderFee.totalVolume}} {{$t('立方米')}} {{orderFee.totalVolume}} {{$t('立方米')}}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="12">
<el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="320px"> <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="320px">
{{orderFee.paymentGoodsVolumeScale}}% {{orderFee.paymentGoodsVolumeScale}}%
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'"> <el-row :span="12" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'">
<el-form-item :label="$t('报关资料')+':'" size="medium" :require="true"> <el-form-item :label="$t('报关资料')+':'" size="medium" :require="true">
<file-upload v-model="handlerParams.fileList" :value="orderExceptionData.orderExceptionAttr" ></file-upload> <file-upload v-model="handlerParams.fileList" :value="orderExceptionData.orderExceptionAttr" ></file-upload>
</el-form-item> </el-form-item>
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 054714e3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
width="1280px" width="1280px"
> >
<el-tabs v-model="activeName" type="card" @tab-click="handleTabs"> <el-tabs v-model="activeName" type="card" @tab-click="handleTabs">
<el-tab-pane :label="edit ? '货物修改' : '货物入仓'" name="first"> <el-tab-pane :label="edit ? $t('货物修改') : $t('货物入仓')" name="first">
<el-form ref="form" :model="form" :rules="formRules" label-width="80px"> <el-form ref="form" :model="form" :rules="formRules" label-width="80px">
<el-descriptions border :column="2"> <el-descriptions border :column="2">
<el-descriptions-item> <el-descriptions-item>
...@@ -97,6 +97,9 @@ ...@@ -97,6 +97,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长(cm)"> <el-table-column label="长(cm)">
<template v-slot:header>
<span>{{ $t('长') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge1" :prop="!tableData[$index].id && $index + '.boxGauge1'"> <el-form-item :rules="tableFormRules.boxGauge1" :prop="!tableData[$index].id && $index + '.boxGauge1'">
<span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span> <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
...@@ -105,6 +108,9 @@ ...@@ -105,6 +108,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="宽(cm)"> <el-table-column label="宽(cm)">
<template v-slot:header>
<span>{{ $t('宽') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge2" :prop="!tableData[$index].id && $index + '.boxGauge2'"> <el-form-item :rules="tableFormRules.boxGauge2" :prop="!tableData[$index].id && $index + '.boxGauge2'">
<span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span> <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
...@@ -113,6 +119,9 @@ ...@@ -113,6 +119,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高(cm)"> <el-table-column label="高(cm)">
<template v-slot:header>
<span>{{ $t('高') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge3" :prop="!tableData[$index].id && $index + '.boxGauge3'"> <el-form-item :rules="tableFormRules.boxGauge3" :prop="!tableData[$index].id && $index + '.boxGauge3'">
<span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span> <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
...@@ -122,7 +131,7 @@ ...@@ -122,7 +131,7 @@
</el-table-column> </el-table-column>
<el-table-column label="体积(m³)"> <el-table-column label="体积(m³)">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> 体积(m³) <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'"> <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
...@@ -133,7 +142,7 @@ ...@@ -133,7 +142,7 @@
</el-table-column> </el-table-column>
<el-table-column label="重量(Kg)"> <el-table-column label="重量(Kg)">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> 重量(Kg) <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'"> <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
...@@ -254,6 +263,9 @@ ...@@ -254,6 +263,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长(cm)"> <el-table-column label="长(cm)">
<template v-slot:header>
<span>{{ $t('长') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'"> <el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[0] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[0] : '' }}</span>
...@@ -262,6 +274,9 @@ ...@@ -262,6 +274,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="宽(cm)"> <el-table-column label="宽(cm)">
<template v-slot:header>
<span>{{ $t('宽') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'"> <el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[1] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[1] : '' }}</span>
...@@ -270,6 +285,9 @@ ...@@ -270,6 +285,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高(cm)"> <el-table-column label="高(cm)">
<template v-slot:header>
<span>{{ $t('高') }}</span>(cm)
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'"> <el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[2] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[2] : '' }}</span>
...@@ -279,7 +297,7 @@ ...@@ -279,7 +297,7 @@
</el-table-column> </el-table-column>
<el-table-column label="体积(m³)"> <el-table-column label="体积(m³)">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> 体积(m³) <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'"> <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
...@@ -290,7 +308,7 @@ ...@@ -290,7 +308,7 @@
</el-table-column> </el-table-column>
<el-table-column label="重量(Kg)"> <el-table-column label="重量(Kg)">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> 重量(Kg) <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'"> <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
...@@ -692,7 +710,7 @@ export default { ...@@ -692,7 +710,7 @@ export default {
computed: { computed: {
title() { title() {
return this.$route.name return this.$i18n.locale === 'en_US' ? this.$route.meta.titleEn : this.$route.name
}, },
brandObject(){ brandObject(){
return this.brandList.find(e => e.id === this.form.brand) || '' return this.brandList.find(e => e.id === this.form.brand) || ''
......
src/views/ecw/order/warehousing/index.vue
View file @ 054714e3
...@@ -108,14 +108,14 @@ ...@@ -108,14 +108,14 @@
</el-card> </el-card>
<h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2> <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="200px">
<el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 400px"> <el-form-item :label="$i18n.locale === 'en_US' ? item.labelEn : item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 600px">
<el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="$t('请输入') + item.label"> <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="$t('请输入') + ($i18n.locale === 'en_US' ? item.labelEn : item.label)">
<el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" :placeholder="$t('请选择')" slot="append" style="width: 100px"> <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" :placeholder="$t('请选择')" slot="append" style="width: 100px">
<el-option <el-option
v-for="item in currencyList" v-for="item in currencyList"
:key="item.id" :key="item.id"
:label="item.titleZh" :label="$i18n.locale === 'en_US' ? item.titleEn : item.titleZh"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
return this.$route.path === "/order/warehousing-update" return this.$route.path === "/order/warehousing-update"
}, },
title() { title() {
return this.$route.name return this.$i18n.locale === 'en_US' ? this.$route.meta.titleEn : this.$route.name
}, },
orderSpecialNeedsDict() { orderSpecialNeedsDict() {
return this.$store.state.dict.dictDatas.order_special_needs return this.$store.state.dict.dictDatas.order_special_needs
...@@ -478,7 +478,7 @@ export default { ...@@ -478,7 +478,7 @@ export default {
this.specialList.forEach(e => { this.specialList.forEach(e => {
const t = this.orderSpecialNeedsDict.find(f => f.value === e.advanceType) const t = this.orderSpecialNeedsDict.find(f => f.value === e.advanceType)
if(t) { if(t) {
result.push({...e, label: t.label}) result.push({...e, label: t.label, labelEn: t.labelEn})
} }
}) })
return result return result
......
src/views/system/myInternalMessage/index.vue
View file @ 054714e3
...@@ -105,11 +105,6 @@ ...@@ -105,11 +105,6 @@
<script> <script>
import { getMyInternalMessagePage ,getRedInternalMessage, deleteInternalMessage} from "@/api/system/internalMessage"; import { getMyInternalMessagePage ,getRedInternalMessage, deleteInternalMessage} from "@/api/system/internalMessage";
let type = {
1:this.$t('订单消息'),
2:this.$t('出货消息'),
3:this.$t('提醒消息'),
}
export default { export default {
name: "MyInternalMessage", name: "MyInternalMessage",
data() { data() {
...@@ -144,7 +139,11 @@ export default { ...@@ -144,7 +139,11 @@ export default {
form: {}, form: {},
dialogVisible:false, dialogVisible:false,
publicObj:{}, publicObj:{},
type, type: {
1:this.$t('订单消息'),
2:this.$t('出货消息'),
3:this.$t('提醒消息'),
},
}; };
}, },
computed:{ computed:{
......
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