Skip to content

J
jiedao-app-operator-master
Commit 050ee02c authored by 我在何方's avatar 我在何方
Browse files
Options

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

parents 9339cc69 0cca163a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 15812 additions and 14549 deletions
src/components/Breadcrumb/index.vue
View file @ 050ee02c
......@@ -35,7 +35,7 @@ export default {
const first = matched[0]
if (!this.isDashboard(first)) {
matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
matched = [{ path: '/index', meta: { title: '首页', titleEn: 'Home' }}].concat(matched)
}
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
......
src/components/DictSelector/index.vue
View file @ 050ee02c
<template>
<div class="dict-selector">
<el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder" :clearable="clearable" :multiple="multiple" :disabled="disabled" @change="val => $emit('change', val)">
<el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder || $t('请选择')" :clearable="clearable" :multiple="multiple" :disabled="disabled" @change="val => $emit('change', val)">
<el-option v-for="dict in formattedList"
:key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</el-select>
......@@ -27,7 +27,7 @@ export default {
props:{
placeholder: {
type: String,
default: '请选择'
default: null
},
type: String,
value: [String, Number, Array, Boolean],
......
src/components/FileUpload/index.vue
View file @ 050ee02c
......@@ -15,7 +15,7 @@
ref="upload"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button>
<el-button size="mini" type="primary">{{$t('选取文件')}}</el-button>
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
......
src/components/Selector/index.vue
View file @ 050ee02c
<template>
<el-select v-model="valueSync" :multiple="multiple" :disabled="disabled" :filterable="filterable">
<el-select v-model="valueSync" :multiple="multiple" :disabled="disabled" :filterable="filterable" :placeholder="$t('请选择')">
<el-option v-for="item in optionsFormated" :key="item.key" :label="item.label" :value="item.value" />
</el-select>
</template>
......
src/i18n/languages/en_US.json
View file @ 050ee02c
This diff is collapsed.
src/i18n/languages/zh_CN.json
View file @ 050ee02c
......@@ -273,5 +273,22 @@
"您确认要全部核销吗":"您确认要全部核销吗",
"上传中":"上传中",
"上传失败":"上传失败",
"确定移除":"确定移除"
"确定移除":"确定移除",
"延迟时间": "延迟时间",
"请输入 小": "请输入 小",
"请输入 大": "请输入 大",
"已实装箱数/总箱数": "已实装箱数/总箱数",
"下单统计：{orderSum} 箱 {orderV} m³ {orderW} kg 入仓统计：{leviteSum} 箱 {leviteV} m³ {leviteW} kg": "下单统计：{orderSum} 箱 {orderV} m³ {orderW} kg 入仓统计：{leviteSum} 箱 {leviteV} m³ {leviteW} kg",
"混合报关": "混合报关",
"VGM声明": "VGM声明",
"请输入VGM重量": "请输入VGM重量",
"您确认提交全部退场审核吗？": "您确认提交全部退场审核吗？",
"您确认提交部分退场审核吗？": "您确认提交部分退场审核吗？",
"请输入费用": "请输入费用",
"未审核": "未审核",
"提单号M/BL NO.": "提单号M/BL NO.",
"毛重(KGS)": "毛重(KGS)",
"立方数(CBM)": "立方数(CBM)",
"选取文件": "选取文件",
"查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}": "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}"
}
src/router/index.js
View file @ 050ee02c
......@@ -65,7 +65,8 @@ export const constantRoutes = [
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: {title: '首页', icon: 'dashboard', affix: true}
nameEn: 'Home',
meta: {title: '首页', titleEn: 'Home', icon: 'dashboard', affix: true}
}
]
}, {
......@@ -77,7 +78,7 @@ export const constantRoutes = [
path: 'profile',
component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
name: 'Profile',
meta: {title: '个人中心', icon: 'user'}
meta: {title: '个人中心', titleEn: 'Profile', icon: 'user'}
}
]
}, {
......
src/views/bpm/form/formEditor.vue
View file @ 050ee02c
......@@ -130,7 +130,7 @@
<!-- <code-type-dialog-->
<!-- :visible.sync="dialogVisible"-->
<!-- title="选择生成类型"-->
<!-- :title="$t('选择生成类型')"-->
<!-- :show-file-name="showFileName"-->
<!-- @confirm="generate"-->
<!-- />-->
......@@ -217,15 +217,15 @@ export default {
saveIdGlobalDebounce: debounce(340, saveIdGlobal),
leftComponents: [
{
title: '输入型组件',
title: this.$t('输入型组件'),
list: inputComponents
},
{
title: '选择型组件',
title: this.$t('选择型组件'),
list: selectComponents
},
{
title: '布局型组件',
title: this.$t('布局型组件'),
list: layoutComponents
}
],
......@@ -236,8 +236,8 @@ export default {
},
// 表单校验
rules: {
name: [{ required: true, message: "表单名不能为空", trigger: "blur" }],
status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t("表单名不能为空"), trigger: "blur" }],
status: [{ required: true, message: this.$t("开启状态不能为空"), trigger: "blur" }],
}
}
},
......@@ -293,8 +293,8 @@ export default {
text: trigger => {
const codeStr = this.generateCode()
this.$notify({
title: '成功',
message: '代码已复制到剪切板，可粘贴。',
title: this.$t('成功'),
message: this.$t('代码已复制到剪切板，可粘贴。'),
type: 'success'
})
return codeStr
......@@ -476,7 +476,7 @@ export default {
document.getElementById('copyNode').click()
},
empty() {
this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
this.$confirm('确定要清空所有组件吗？', this.$t('提示'), { type: 'warning' }).then(
() => {
this.drawingList = []
this.idGlobal = 100
......
src/views/bpm/form/index.vue
View file @ 050ee02c
<template>
<div class="app-container">
<!-- <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> -->
<!-- <doc-alert :title="$t('工作流')" url="https://doc.iocoder.cn/bpm" /> -->
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
......@@ -53,7 +53,7 @@
@pagination="getList"/>
<!--表单配置详情-->
<el-dialog title="表单详情" :visible.sync="detailOpen" width="50%" append-to-body>
<el-dialog :title="$t('表单详情')" :visible.sync="detailOpen" width="50%" append-to-body>
<div class="test-form">
<parser :key="new Date().getTime()" :form-conf="detailForm" />
</div>
......
src/views/bpm/group/index.vue
View file @ 050ee02c
<template>
<div class="app-container">
<doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
<doc-alert :title="$t('工作流')" url="https://doc.iocoder.cn/bpm" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="组名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入组名" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('组名')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入组名')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择状态')" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
......@@ -27,39 +27,39 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['bpm:user-group:create']">新增</el-button>
v-hasPermi="['bpm:user-group:create']">{{ $t('新增') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="组名" align="center" prop="name" />
<el-table-column label="描述" align="center" prop="description" />
<el-table-column label="成员" align="center">
<el-table-column :label="$t('编号')" align="center" prop="id" />
<el-table-column :label="$t('组名')" align="center" prop="name" />
<el-table-column :label="$t('描述')" align="center" prop="description" />
<el-table-column :label="$t('成员')" align="center">
<template slot-scope="scope">
<span v-for="userId in scope.row.memberUserIds">
{{ getUserNickname(userId) }}
</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['bpm:user-group:update']">修改</el-button>
v-hasPermi="['bpm:user-group:update']">{{ $t('修改') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['bpm:user-group:delete']">删除</el-button>
v-hasPermi="['bpm:user-group:delete']">{{ $t('删除') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -70,18 +70,18 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="组名" prop="name">
<el-input v-model="form.name" placeholder="请输入组名" />
<el-form-item :label="$t('组名')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入组名')" />
</el-form-item>
<el-form-item label="描述" prop="description">
<el-input v-model="form.description" placeholder="请输入描述" />
<el-form-item :label="$t('描述')" prop="description">
<el-input v-model="form.description" :placeholder="$t('请输入描述')" />
</el-form-item>
<el-form-item label="成员" prop="memberUserIds">
<el-select v-model="form.memberUserIds" multiple placeholder="请选择成员">
<el-form-item :label="$t('成员')" prop="memberUserIds">
<el-select v-model="form.memberUserIds" multiple :placeholder="$t('请选择成员')">
<el-option v-for="user in users" :key="parseInt(user.id)" :label="user.nickname" :value="parseInt(user.id)"/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item :label="$t('状态')" prop="status">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
......@@ -89,8 +89,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
<el-button @click="cancel">{{ $t('取 消') }}</el-button>
</div>
</el-dialog>
</div>
......@@ -134,10 +134,10 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "组名不能为空", trigger: "blur" }],
description: [{ required: true, message: "描述不能为空", trigger: "blur" }],
memberUserIds: [{ required: true, message: "成员不能为空", trigger: "change" }],
status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t("组名不能为空"), trigger: "blur" }],
description: [{ required: true, message: this.$t("描述不能为空"), trigger: "blur" }],
memberUserIds: [{ required: true, message: this.$t("成员不能为空"), trigger: "change" }],
status: [{ required: true, message: this.$t("状态不能为空"), trigger: "blur" }],
}
};
},
......@@ -193,7 +193,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加用户组";
this.title = this.$t("添加用户组");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -202,7 +202,7 @@ export default {
getUserGroup(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改用户组";
this.title = this.$t("修改用户组");
});
},
/** 提交按钮 */
......
src/views/bpm/model/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/bpm/oa/leave/create.vue
View file @ 050ee02c
......@@ -2,24 +2,24 @@
<div class="app-container">
<!-- 对话框(添加 / 修改) -->
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable size="small" v-model="form.startTime" type="date" value-format="timestamp" placeholder="选择开始时间" />
<el-form-item :label="$t('开始时间')" prop="startTime">
<el-date-picker clearable size="small" v-model="form.startTime" type="date" value-format="timestamp" :placeholder="$t('选择开始时间')" />
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable size="small" v-model="form.endTime" type="date" value-format="timestamp" placeholder="选择结束时间" />
<el-form-item :label="$t('结束时间')" prop="endTime">
<el-date-picker clearable size="small" v-model="form.endTime" type="date" value-format="timestamp" :placeholder="$t('选择结束时间')" />
</el-form-item>
<el-form-item label="请假类型" prop="type">
<el-select v-model="form.type" placeholder="请选择">
<el-form-item :label="$t('请假类型')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择')">
<el-option v-for="dict in typeDictData" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
<el-form-item label="原因" prop="reason">
<el-form-item :label="$t('原因')" prop="reason">
<el-col :span="10">
<el-input type="textarea" :rows="3" v-model="form.reason" placeholder="请输入原因" />
<el-input type="textarea" :rows="3" v-model="form.reason" :placeholder="$t('请输入原因')" />
</el-col>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">提 交</el-button>
<el-button type="primary" @click="submitForm">{{ $t('提 交') }}</el-button>
</el-form-item>
</el-form>
</div>
......@@ -44,10 +44,10 @@ export default {
},
// 表单校验
rules: {
startTime: [{ required: true, message: "开始时间不能为空", trigger: "blur" }],
endTime: [{ required: true, message: "结束时间不能为空", trigger: "blur" }],
type: [{ required: true, message: "请假类型不能为空", trigger: "change" }],
reason: [{ required: true, message: "请假原因不能为空", trigger: "change" }],
startTime: [{ required: true, message: this.$t("开始时间不能为空"), trigger: "blur" }],
endTime: [{ required: true, message: this.$t("结束时间不能为空"), trigger: "blur" }],
type: [{ required: true, message: this.$t("请假类型不能为空"), trigger: "change" }],
reason: [{ required: true, message: this.$t("请假原因不能为空"), trigger: "change" }],
},
typeDictData: getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE),
......
src/views/bpm/oa/leave/detail.vue
View file @ 050ee02c
......@@ -2,12 +2,12 @@
<div class="app-container">
<!-- 对话框(添加 / 修改) -->
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="开始时间：" prop="startTime"> {{parseTime(form.startTime, '{y}-{m}-{d}')}} </el-form-item>
<el-form-item label="结束时间：" prop="endTime"> {{parseTime(form.endTime, '{y}-{m}-{d}')}} </el-form-item>
<el-form-item label="请假类型：" prop="type">
<el-form-item :label="$t('开始时间：')" prop="startTime"> {{parseTime(form.startTime, '{y}-{m}-{d}')}} </el-form-item>
<el-form-item :label="$t('结束时间：')" prop="endTime"> {{parseTime(form.endTime, '{y}-{m}-{d}')}} </el-form-item>
<el-form-item :label="$t('请假类型：')" prop="type">
<dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="form.type"/>
</el-form-item>
<el-form-item label="原因：" prop="reason"> {{ form.reason }}</el-form-item>
<el-form-item :label="$t('原因：')" prop="reason"> {{ form.reason }}</el-form-item>
</el-form>
</div>
</template>
......
src/views/bpm/oa/leave/index.vue
View file @ 050ee02c
<template>
<div class="app-container">
<doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
<doc-alert :title="$t('工作流')" url="https://doc.iocoder.cn/bpm" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="请假类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable>
<el-form-item :label="$t('请假类型')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择请假类型')" clearable>
<el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="申请时间">
<el-form-item :label="$t('申请时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="结果" prop="result">
<el-select v-model="queryParams.result" placeholder="请选择流结果" clearable>
<el-form-item :label="$t('结果')" prop="result">
<el-select v-model="queryParams.result" :placeholder="$t('请选择流结果')" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="原因" prop="reason">
<el-input v-model="queryParams.reason" placeholder="请输入原因" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('原因')" prop="reason">
<el-input v-model="queryParams.reason" :placeholder="$t('请输入原因')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
......@@ -32,47 +32,47 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini"
v-hasPermi="['bpm:oa-leave:create']" @click="handleAdd">发起请假</el-button>
v-hasPermi="['bpm:oa-leave:create']" @click="handleAdd">{{ $t('发起请假') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="申请编号" align="center" prop="id" />
<el-table-column label="状态" align="center" prop="result">
<el-table-column :label="$t('申请编号')" align="center" prop="id" />
<el-table-column :label="$t('状态')" align="center" prop="result">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('开始时间')" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime) }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
<el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime) }}</span>
</template>
</el-table-column>
<el-table-column label="请假类型" align="center" prop="type">
<el-table-column :label="$t('请假类型')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="原因" align="center" prop="reason" />
<el-table-column label="申请时间" align="center" prop="applyTime" width="180">
<el-table-column :label="$t('原因')" align="center" prop="reason" />
<el-table-column :label="$t('申请时间')" align="center" prop="applyTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleCancel(scope.row)"
v-hasPermi="['bpm:oa-leave:create']" v-if="scope.row.result === 1">取消请假</el-button>
v-hasPermi="['bpm:oa-leave:create']" v-if="scope.row.result === 1">{{ $t('取消请假') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)"
v-hasPermi="['bpm:oa-leave:query']">详情</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleProcessDetail(scope.row)">审批进度</el-button>
v-hasPermi="['bpm:oa-leave:query']">{{ $t('详情') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleProcessDetail(scope.row)">{{ $t('审批进度') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -160,12 +160,12 @@ export default {
/** 取消请假 */
handleCancel(row) {
const id = row.processInstanceId;
this.$prompt('请输入取消原因？', "取消流程", {
this.$prompt('请输入取消原因？', this.$t("取消流程"), {
type: 'warning',
confirmButtonText: "确定",
cancelButtonText: "取消",
confirmButtonText: this.$t("确定"),
cancelButtonText: this.$t("取消"),
inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: "取消原因不能为空",
inputErrorMessage: this.$t("取消原因不能为空"),
}).then(({ value }) => {
return cancelProcessInstance(id, value);
}).then(() => {
......
src/views/bpm/processInstance/detail.vue
View file @ 050ee02c
......@@ -31,8 +31,8 @@
</el-button>
<el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleUpdateAssignee(item)">{{$t('转办')}}
</el-button>
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate(item)">委派</el-button>-->
<!-- <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleBack(item)">退回</el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate(item)">{{ $t('委派') }}</el-button>-->
<!-- <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleBack(item)">{{ $t('退回') }}</el-button>-->
</div>
</el-col>
</el-card>
......@@ -103,7 +103,7 @@
</el-card>
<!-- 对话框(转派审批人) -->
<el-dialog title="转派审批人" :visible.sync="updateAssignee.open" width="500px" append-to-body>
<el-dialog :title="$t('转派审批人')" :visible.sync="updateAssignee.open" width="500px" append-to-body>
<el-form ref="updateAssigneeForm" :model="updateAssignee.form" :rules="updateAssignee.rules" label-width="110px">
<el-form-item :label="$t('新审批人')" prop="assigneeUserId">
<el-select v-model="updateAssignee.form.assigneeUserId" clearable style="width: 100%">
......@@ -370,7 +370,7 @@ export default {
runningTasks: [],
auditForms: [],
auditRule: {
comment: [{required: true, message: "审批建议不能为空", trigger: "blur"}],
comment: [{required: true, message: this.$t("审批建议不能为空"), trigger: "blur"}],
},
// 转派审批人
......@@ -381,7 +381,7 @@ export default {
assigneeUserId: undefined,
},
rules: {
assigneeUserId: [{required: true, message: "新审批人不能为空", trigger: "change"}],
assigneeUserId: [{required: true, message: this.$t("新审批人不能为空"), trigger: "change"}],
}
},
......
src/views/bpm/task/done.vue
View file @ 050ee02c
......@@ -3,7 +3,7 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="流程编号" prop="processInstanceId">
<el-form-item :label="$t('流程编号')" prop="processInstanceId">
<el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
......@@ -43,9 +43,7 @@
</el-table-column>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200"/>
<!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
缺少字段
</el-table-column> -->
<!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >{{ $t('缺少字段') }}</el-table-column> -->
<!-- <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120"/>-->
<el-table-column :label="$t('结果')" align="center" prop="result">
<template slot-scope="scope">
......
src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
View file @ 050ee02c
<template>
<div>
<!-- 列表弹窗 -->
<el-dialog title="任务分配规则" :visible.sync="visible" width="800px" append-to-body>
<el-dialog :title="$t('任务分配规则')" :visible.sync="visible" width="800px" append-to-body>
<el-table v-loading="loading" :data="list">
<el-table-column label="任务名" align="center" prop="taskDefinitionName" width="120" fixed />
<el-table-column label="任务标识" align="center" prop="taskDefinitionKey" width="120" show-tooltip-when-overflow />
<el-table-column label="规则类型" align="center" prop="type" width="120">
<el-table-column :label="$t('任务名')" align="center" prop="taskDefinitionName" width="120" fixed />
<el-table-column :label="$t('任务标识')" align="center" prop="taskDefinitionKey" width="120" show-tooltip-when-overflow />
<el-table-column :label="$t('规则类型')" align="center" prop="type" width="120">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="规则范围" align="center" prop="options" width="440px">
<el-table-column :label="$t('规则范围')" align="center" prop="options" width="440px">
<template slot-scope="scope">
<el-tag size="medium" v-if="scope.row.options" v-for="option in scope.row.options">
{{ getAssignRuleOptionName(scope.row.type, option) }}
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="modelId" label="操作" align="center" width="80" fixed="right">
<el-table-column v-if="modelId" :label="$t('操作')" align="center" width="80" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateTaskAssignRule(scope.row)"
v-hasPermi="['bpm:task-assign-rule:update']">修改</el-button>
v-hasPermi="['bpm:task-assign-rule:update']">{{ $t('修改') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 添加/修改弹窗 -->
<el-dialog title="修改任务规则" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="$t('修改任务规则')" :visible.sync="open" width="500px" append-to-body>
<el-form ref="taskAssignRuleForm" :model="form" :rules="rules" label-width="110px">
<el-form-item label="任务名称" prop="taskDefinitionName">
<el-form-item :label="$t('任务名称')" prop="taskDefinitionName">
<el-input v-model="form.taskDefinitionName" disabled />
</el-form-item>
<el-form-item label="任务标识" prop="taskDefinitionKey">
<el-form-item :label="$t('任务标识')" prop="taskDefinitionKey">
<el-input v-model="form.taskDefinitionKey" disabled />
</el-form-item>
<el-form-item label="规则类型" prop="type">
<el-form-item :label="$t('规则类型')" prop="type">
<el-select v-model="form.type" clearable style="width: 100%">
<el-option v-for="dict in taskAssignRuleTypeDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.type === 10" label="指定角色" prop="roleIds">
<el-form-item v-if="form.type === 10" :label="$t('指定角色')" prop="roleIds">
<el-select v-model="form.roleIds" multiple clearable style="width: 100%">
<el-option v-for="item in roleOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
</el-select>
</el-form-item>
<el-form-item v-if="form.type === 20 || form.type === 21" label="指定部门" prop="deptIds">
<el-form-item v-if="form.type === 20 || form.type === 21" :label="$t('指定部门')" prop="deptIds">
<treeselect v-model="form.deptIds" :options="deptTreeOptions" multiple flat :defaultExpandLevel="3"
placeholder="请选择指定部门" :normalizer="normalizer"/>
:placeholder="$t('请选择指定部门')" :normalizer="normalizer"/>
</el-form-item>
<el-form-item v-if="form.type === 22" label="指定岗位" prop="postIds">
<el-form-item v-if="form.type === 22" :label="$t('指定岗位')" prop="postIds">
<el-select v-model="form.postIds" multiple clearable style="width: 100%">
<el-option v-for="item in postOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
</el-select>
</el-form-item>
<el-form-item v-if="form.type === 30" label="指定用户" prop="userIds">
<el-form-item v-if="form.type === 30" :label="$t('指定用户')" prop="userIds">
<el-select v-model="form.userIds" multiple clearable style="width: 100%">
<el-option v-for="item in userOptions" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
</el-select>
</el-form-item>
<el-form-item v-if="form.type === 40" label="指定用户组" prop="userGroupIds">
<el-form-item v-if="form.type === 40" :label="$t('指定用户组')" prop="userGroupIds">
<el-select v-model="form.userGroupIds" multiple clearable style="width: 100%">
<el-option v-for="item in userGroupOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
</el-select>
</el-form-item>
<el-form-item v-if="form.type === 50" label="指定脚本" prop="scripts">
<el-form-item v-if="form.type === 50" :label="$t('指定脚本')" prop="scripts">
<el-select v-model="form.scripts" multiple clearable style="width: 100%">
<el-option v-for="dict in taskAssignScriptDictDatas" :key="parseInt(dict.value)"
:label="dict.label" :value="parseInt(dict.value)"/>
......@@ -71,8 +71,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAssignRuleForm">确 定</el-button>
<el-button @click="cancelAssignRuleForm">取 消</el-button>
<el-button type="primary" @click="submitAssignRuleForm">{{ $t('确 定') }}</el-button>
<el-button @click="cancelAssignRuleForm">{{ $t('取 消') }}</el-button>
</div>
</el-dialog>
</div>
......@@ -109,13 +109,13 @@ export default {
open: false, // 是否打开
form: {}, // 表单
rules: { // 表单校验规则
type: [{ required: true, message: "规则类型不能为空", trigger: "change" }],
roleIds: [{required: true, message: "指定角色不能为空", trigger: "change" }],
deptIds: [{required: true, message: "指定部门不能为空", trigger: "change" }],
postIds: [{required: true, message: "指定岗位不能为空", trigger: "change"}],
userIds: [{required: true, message: "指定用户不能为空", trigger: "change"}],
userGroupIds: [{required: true, message: "指定用户组不能为空", trigger: "change"}],
scripts: [{required: true, message: "指定脚本不能为空", trigger: "change"}],
type: [{ required: true, message: this.$t("规则类型不能为空"), trigger: "change" }],
roleIds: [{required: true, message: this.$t("指定角色不能为空"), trigger: "change" }],
deptIds: [{required: true, message: this.$t("指定部门不能为空"), trigger: "change" }],
postIds: [{required: true, message: this.$t("指定岗位不能为空"), trigger: "change"}],
userIds: [{required: true, message: this.$t("指定用户不能为空"), trigger: "change"}],
userGroupIds: [{required: true, message: this.$t("指定用户组不能为空"), trigger: "change"}],
scripts: [{required: true, message: this.$t("指定脚本不能为空"), trigger: "change"}],
},
// 各种下拉框
......
src/views/customer/credit/index.vue
View file @ 050ee02c
......@@ -3,15 +3,15 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" :placeholder="$t('请输入最高分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" placeholder="请输入最低分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" :placeholder="$t('请输入最低分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -19,34 +19,34 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:credit:create']">新增</el-button>
v-hasPermi="['customer:credit:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:credit:export']">导出</el-button>
v-hasPermi="['customer:credit:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="中文名称" align="center" prop="nameZh" />
<el-table-column label="英文名称" align="center" prop="nameEn" />
<el-table-column label="最低分值" align="center" prop="scoreMin" />
<el-table-column label="最高分值" align="center" prop="scoreMax" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('中文名称')" align="center" prop="nameZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="nameEn" />
<el-table-column :label="$t('最低分值')" align="center" prop="scoreMin" />
<el-table-column :label="$t('最高分值')" align="center" prop="scoreMax" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:credit:update']">修改</el-button>
v-hasPermi="['customer:credit:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:credit:delete']">删除</el-button>
v-hasPermi="['customer:credit:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -57,25 +57,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="中文名称" prop="nameZh">
<el-input v-model="form.nameZh" placeholder="请输入中文名称" />
<el-form-item :label="$t('中文名称')" prop="nameZh">
<el-input v-model="form.nameZh" :placeholder="$t('请输入中文名称')" />
</el-form-item>
<el-form-item label="英文名称" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
<el-form-item :label="$t('英文名称')" prop="nameEn">
<el-input v-model="form.nameEn" :placeholder="$t('请输入英文名称')" />
</el-form-item>
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="form.scoreMax" placeholder="请输入最高分值" />
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="form.scoreMax" :placeholder="$t('请输入最高分值')" />
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="form.scoreMin" placeholder="请输入最低分值" />
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="form.scoreMin" :placeholder="$t('请输入最低分值')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -115,10 +115,10 @@ export default {
form: {},
// 表单校验
rules: {
nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }],
scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }],
nameZh: [{ required: true, message: this.$t('中文名称不能为空'), trigger: "blur" }],
nameEn: [{ required: true, message: this.$t('英文名称不能为空'), trigger: "blur" }],
scoreMax: [{ required: true, message: this.$t('最大分值不能为空'), trigger: "blur" }],
scoreMin: [{ required: true, message: this.$t('最小分值不能为空'), trigger: "blur" }],
}
};
},
......@@ -169,7 +169,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加信用等级";
this.title = this.$t('添加信用等级');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -178,7 +178,7 @@ export default {
getCredit(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改信用等级";
this.title = this.$t('修改信用等级');
});
},
/** 提交按钮 */
......@@ -190,7 +190,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateCredit(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -198,7 +198,7 @@ export default {
}
// 添加的提交
createCredit(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -207,11 +207,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除信用等级编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除信用等级编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCredit(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -221,7 +221,7 @@ export default {
params.pageNo = undefined;
params.pageSize = undefined;
// 执行导出
this.$modal.confirm('是否确认导出所有信用等级数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有信用等级数据项?')).then(() => {
this.exportLoading = true;
return exportCreditExcel(params);
}).then(response => {
......
src/views/customer/creditRule/index.vue
View file @ 050ee02c
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择规则分类')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:credit-rule:create']">新增</el-button>
v-hasPermi="['customer:credit-rule:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:credit-rule:export']">导出</el-button>
v-hasPermi="['customer:credit-rule:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="规则得分" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:credit-rule:update']">修改</el-button>
v-hasPermi="['customer:credit-rule:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:credit-rule:delete']">删除</el-button>
v-hasPermi="['customer:credit-rule:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" />
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="规则得分" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" />
<el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -129,9 +129,9 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
}
};
},
......@@ -183,7 +183,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加信用规则";
this.title = this.$t('添加信用规则');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -192,7 +192,7 @@ export default {
getCreditRule(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改信用规则";
this.title = this.$t('修改信用规则');
});
},
/** 提交按钮 */
......@@ -204,7 +204,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateCreditRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -212,7 +212,7 @@ export default {
}
// 添加的提交
createCreditRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除信用规则编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除信用规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCreditRule(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有信用规则数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有信用规则数据项?')).then(() => {
this.exportLoading = true;
return exportCreditRuleExcel(params);
}).then(response => {
......
src/views/customer/level/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/customer/levelRule/index.vue
View file @ 050ee02c
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择规则分类')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:level-rule:create']">新增</el-button>
v-hasPermi="['customer:level-rule:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:level-rule:export']">导出</el-button>
v-hasPermi="['customer:level-rule:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="规则得分" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:level-rule:update']">修改</el-button>
v-hasPermi="['customer:level-rule:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:level-rule:delete']">删除</el-button>
v-hasPermi="['customer:level-rule:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" />
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="规则得分" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" />
<el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -129,9 +129,9 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
}
};
},
......@@ -183,7 +183,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加客户等级规则";
this.title = this.$t('添加客户等级规则');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -192,7 +192,7 @@ export default {
getLevelRule(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改客户等级规则";
this.title = this.$t('修改客户等级规则');
});
},
/** 提交按钮 */
......@@ -204,7 +204,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateLevelRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -212,7 +212,7 @@ export default {
}
// 添加的提交
createLevelRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除客户等级规则编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除客户等级规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteLevelRule(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有客户等级规则数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有客户等级规则数据项?')).then(() => {
this.exportLoading = true;
return exportLevelRuleExcel(params);
}).then(response => {
......
src/views/dashboard/PanelGroup.vue
View file @ 050ee02c
......@@ -109,6 +109,8 @@ export default {
}
.card-panel {
display: flex;
justify-content: space-between;
height: 108px;
cursor: pointer;
font-size: 12px;
......@@ -158,7 +160,6 @@ export default {
}
.card-panel-icon-wrapper {
float: left;
margin: 14px 0 0 14px;
padding: 16px;
transition: all 0.38s ease-out;
......@@ -166,12 +167,10 @@ export default {
}
.card-panel-icon {
float: left;
font-size: 48px;
}
.card-panel-description {
float: right;
font-weight: bold;
margin: 26px;
margin-left: 0px;
......
src/views/ecw/bankAccount/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/banner/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/bannerPop/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/box/editForm.vue
View file @ 050ee02c
......@@ -3,7 +3,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item :label="$t('运输方式')" prop="transportType">
<el-radio-group v-model="form.transportType">
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'value')">{{dict.label}}</el-radio>
<el-radio v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'value')">{{$l(dict, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
......
src/views/ecw/box/indexSea.vue
View file @ 050ee02c
......@@ -296,6 +296,7 @@ export default {
this.transportTypes = this.getDictDatas(
this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "1" || item.value == "2");
console.log(this.transportTypes)
getWarehouseList().then((res) => (this.warehouseList = res.data));
getCabinetPage(null).then((response) => {
this.cabinetList = response.data.list;
......
src/views/ecw/box/ladingBill/index.vue
View file @ 050ee02c
......@@ -14,12 +14,10 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item, 'prodTitle')}}</p>
<p>{{$t('品牌')}}：【
<span v-if="item.feeType === 0">无品牌</span>
<dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
】
</p>
<span v-if="item.feeType === 0">{{ $t('无品牌') }}</span>
<dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />{{ $t('】') }}</p>
<p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
</div>
</section>
......@@ -27,7 +25,7 @@
</el-table-column>
<el-table-column :label="$t('控货')" align="center" prop="">
<template slot-scope="scope">
{{scope.row.isCargoControl ? '是' : '否' }}
{{scope.row.isCargoControl ? $t('是') : $t('否') }}
</template>
</el-table-column>
<el-table-column :label="$t('计划箱数')" align="center" prop="num">
......@@ -74,8 +72,8 @@
<el-row>
<el-col class="totle-info">
<div>总计：{{getSumData}}</div>
<div>容量：{{calcCapacity}}</div>
<div>{{$t('总计')}}：{{getSumData}}</div>
<div>{{$t('容量')}}：{{calcCapacity}}</div>
</el-col>
</el-row>
......@@ -235,7 +233,7 @@ export default {
downloadFile(
"zipDownload",
{ shipmentId: this.shipmentObj.id },
this.$t("打包文件") + ".zip",
this.shipmentObj.selfNo + ".zip",
"zip"
);
},
......@@ -243,7 +241,7 @@ export default {
computed: {
/* 总计 */
getSumData() {
return `${this.billData.totalNum ?? 0}箱 ${
return `${this.billData.totalNum ?? 0}${this.$t('箱')} ${
this.billData.totalVolume ?? 0
}m³ ${this.billData.totalWeight ?? 0}kg`;
},
......
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @ 050ee02c
......@@ -111,7 +111,7 @@ export default {
"mergecells", //合并多个单元格
"deletetable", //删除表格
"cleardoc", //清空文档
"insertparagraphbeforetable", //"表格前插入行"
"insertparagraphbeforetable", //this.$t("表格前插入行")
//"insertcode", //代码语言
"fontfamily", //字体
"fontsize", //字号
......
src/views/ecw/box/regError.vue
View file @ 050ee02c
......@@ -20,7 +20,7 @@
<el-form-item :label="$t('异常时间')" prop="arrivalTime" class="three-element">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<div class="delayTime">延迟时间：{{delayDay}}天</div>
<div class="delayTime">{{$t('延迟时间')}}：{{delayDay}}{{$t('天')}}</div>
</el-form-item>
<el-form-item :label="$t('通知人')">
......
src/views/ecw/box/shippingDetail.vue
View file @ 050ee02c
......@@ -12,7 +12,7 @@
<el-descriptions-item :label="$t('柜型')">
{{cabinetLabel}}
</el-descriptions-item>
<el-descriptions-item label="体积/重量">
<el-descriptions-item :label="$t('体积/重量')">
{{getVolumeWeight(loadDetail.totalStatistics)}}
</el-descriptions-item>
<el-descriptions-item :label="$t('货柜状态')">
......
src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue
View file @ 050ee02c
......@@ -6,7 +6,7 @@
</el-form-item>
<el-form-item :label="$t('仓库')">
<el-select v-model="cabinetObj.ldWarehouseType" :placeholder="$t('请选择仓库')" filterable>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="$l(warehouse,'title')" :value="warehouse.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
......@@ -56,7 +56,9 @@ export default {
cabinetObj: {},
// 校验
rules: {
ldBoxTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
ldBoxTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
},
};
},
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 050ee02c
......@@ -9,11 +9,11 @@
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已实装箱数/总箱数">
<el-descriptions-item :label="$t('已实装箱数/总箱数')">
<span>{{currRow.installNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
{{orderData.status==99?'异常':'正常'}}
{{orderData.status==99? $t('异常'):$t('正常')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate}}
......@@ -181,37 +181,37 @@
<el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
<el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="100px">
<el-row>
<el-form-item label="中文品名:" prop="zhId">
<el-form-item :label="$t('中文品名')+'：'" prop="zhId">
<el-select v-model="shopForm.zhId" :placeholder="$t('请选择中文品名')" @change="changeProdTitleZh">
<el-option v-for="item in orderItems" :label="item.prodTitleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="英文品名:" prop="enId">
<el-form-item :label="$t('英文品名')+'：'" prop="enId">
<el-select v-model="shopForm.enId" :placeholder="$t('请选择英文品名')" @change="changeProdTitleEn">
<el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="剩余箱数:">
<el-form-item :label="$t('剩余箱数')+'：'">
{{shopForm.num||0}}
</el-form-item>
</el-col>
<el-col :span="12" v-show="isQuantity">
<el-form-item label="剩余数量(个):">
<el-form-item :label="$t('剩余数量(个)')+'：'">
{{shopForm.quantity||0}}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="放入箱数:">
<el-form-item :label="$t('放入箱数')+'：'">
{{shopForm.num||0}}
</el-form-item>
<el-form-item label="放入数量(个):" prop="putQuantity" v-show="isQuantity">
<el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="备注信息:">
<el-form-item :label="$t('备注信息')+'：'">
<el-input v-model="shopForm.remarks"></el-input>
</el-form-item>
</el-row>
......@@ -429,7 +429,7 @@ export default {
const { shipmentObj } = this.$attrs;
// 创建拆单审核
createApproval({
applyReason: "拆单审核",
applyReason: this.$t("拆单审核"),
approvalStatus: 0,
approvalType: 8,
copyUserId: this.selectedUsers,
......
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 050ee02c
......@@ -52,10 +52,9 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item,'prodTitle')}}</p>
<p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
</p>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />{{ $t('】') }}</p>
<p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
</div>
</section>
......@@ -91,7 +90,7 @@
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">{{$t('移出')}}</el-button>
<el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder','拆单')">{{$t('拆单')}}</el-button>
<el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder', $t('拆单'))">{{$t('拆单')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -123,9 +122,9 @@
</div>
<!-- 操作 -->
<div v-if="!isUnderReview">
<el-button type="primary" @click="handlerClick('supplementOrder','补单')">{{$t('补单')}}</el-button>
<el-button type="primary" @click="handlerClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
<el-button type="primary" @click="applyCloseCabinet">{{$t('封柜申请')}}</el-button>
<el-button type="primary" @click="handlerClick('modifyCabinet','修改柜信息')">{{$t('修改柜信息')}}</el-button>
<el-button type="primary" @click="handlerClick('modifyCabinet',$t('修改柜信息'))">{{$t('修改柜信息')}}</el-button>
</div>
<div v-if="isUnderReview">
<el-button type="primary" @click="jumpReviewDetail">{{$t('封柜审核中')}}</el-button>
......@@ -150,7 +149,7 @@
<el-form ref="modifyForm" :rules="rules" :model="modifyCabinetObj" label-width="80px">
<el-form-item :label="$t('起运仓库')" prop="startWarehouseId">
<el-select v-model="modifyCabinetObj.startWarehouseId" :placeholder="$t('请选择仓库')" filterable>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id"></el-option>
<el-option v-for="warehouse in $attrs.warehouseList" :key="warehouse.id" :label="$l(warehouse, 'title')" :value="warehouse.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('预装日期')">{{preinstallDate}}</el-form-item>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
View file @ 050ee02c
......@@ -66,7 +66,7 @@
</el-row>
<!-- 表格 -->
<el-scrollbar style="height:calc(100% - 124px)">
<el-scrollbar style="height:calc(100% - 164px)">
<el-row v-for="(item, index) in toBePreList" :key="index" class="toBePre-table">
<el-row class="table-title">
<div>{{item.orderNo}}</div>
......@@ -84,7 +84,11 @@
<div v-show="!item.fold">
<el-table v-loading="loading" :data="item.boxOrderItemList" border>
<el-table-column :label="$t('序号')" type="index" align="center" width="50" />
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" />
<el-table-column :label="$t('品名')" align="center" prop="" min-width="500">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120">
<template slot-scope="scope">
<template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
......@@ -105,9 +109,7 @@
<!-- <el-table-column :label="$t('预装柜')"
align="center"
prop=""
width="120">
无返回
</el-table-column> -->
width="120">{{ $t('无返回') }}</el-table-column> -->
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleGoods('singele',scope.row)">{{$t('预装')}}</el-button>
......
src/views/ecw/box/shippingSea/nodePage/cusClearance.vue
View file @ 050ee02c
......@@ -46,8 +46,12 @@ export default {
cusClearanceObj: {},
// 校验
rules: {
clEstTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
clClearTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
clEstTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
clClearTime: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
},
// 弹窗配置
dialogVisible: false,
......@@ -76,10 +80,10 @@ export default {
getClAgent(type) {
const agentId = this.$attrs.shipmentObj.agentInfo.agentId;
if (type === "label") {
return (
this.$attrs.allSupplier.find((item) => item.id === agentId)
?.companyZh ?? agentId
const selected = this.$attrs.allSupplier.find(
(item) => item.id === agentId
);
return this.$l(selected, "company") ?? agentId;
}
return agentId;
},
......
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 050ee02c
......@@ -16,12 +16,12 @@
<el-form-item :label="$t('货重')" prop="dcGoodsWgt">
<el-input v-model="cusDeclarationObj.dcGoodsWgt" :placeholder="$t('请输入货重')" clearable />
</el-form-item>
<el-form-item label="VGM重量">
<el-input v-model="cusDeclarationObj.dcVgmWgt" placeholder="请输入VGM重量" clearable />
<el-form-item :label="$t('VGM重量')">
<el-input v-model="cusDeclarationObj.dcVgmWgt" :placeholder="$t('请输入VGM重量')" clearable />
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType">
<el-select v-model="cusDeclarationObj.dcCustomsType" :placeholder="$t('请选择报关方式')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('正常报关订单')" v-show="isShowNormal">
......@@ -40,7 +40,7 @@
</el-form-item>
<el-form-item :label="$t('状态')" prop="dcCustomsStatus">
<el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || isCheckDeal('status')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{item.label}}</el-radio>
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -48,7 +48,7 @@
<div v-show="cusDeclarationObj.dcCustomsStatus === '3'">
<el-form-item :label="$t('查验')">
<el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview || isCheckDeal('check')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{item.label}}</el-radio>
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{$l(item, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
</div>
......@@ -317,7 +317,7 @@ export default {
},
getButtonLabel(documentInfo = []) {
const newList = Array.from(new Set(documentInfo));
return newList.length >= 2 ? "混合报关" : "VGM声明";
return newList.length >= 2 ? this.$t("混合报关") : this.$t("VGM声明");
},
submitCustomsCreate(operateType) {
customsCreate({
......@@ -366,10 +366,10 @@ export default {
// 退场审核状态,1-审核中，2-审核成功，3-审核失败，4-取消
if ([0, 2, 3, 4].includes(checkExamineStatus)) {
this.$modal
.confirm(
.confirm(this.$t(
`您确认提交${
dcCheckStatus === "1" ? "全部退场" : "部分退场"
}审核吗？`
dcCheckStatus === "1" ? this.$t("全部退场") : this.$t("部分退场")
}审核吗？`)
)
.then(() => {
customsCreate({
......@@ -393,7 +393,7 @@ export default {
/* 查询订单号 */
searchOrder() {
if (!this.orderNo) {
this.$message.error("请输入订单号");
this.$message.error(this.$t("请输入订单号"));
return;
}
extraCostOrder({
......@@ -422,7 +422,7 @@ export default {
/* 创建额外费用 */
createExtraCost(row) {
if (!row.fee) {
this.$message.error("请输入费用");
this.$message.error(this.$t("请输入费用"));
return;
}
extraCostCreate({
......@@ -439,7 +439,7 @@ export default {
/* 修改额外费用 */
updateExtraCost(row) {
if (!row.fee) {
this.$message.error("请输入费用");
this.$message.error(this.$t("请输入费用"));
return;
}
extraCostUpdate(row).then((res) => {
......@@ -620,7 +620,7 @@ export default {
? this.$t("审核通过，退场中")
: this.$t("审核通过，部分退场中");
}
return "未审核";
return this.$t("未审核");
},
/* 判断是否已处理 */
isCheckDeal() {
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 050ee02c
......@@ -17,17 +17,17 @@
</el-form-item>
<el-form-item :label="$t('状态')" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" :placeholder="$t('请选择状态')" clearable size="small">
<el-option v-for="item in stateOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in stateOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('备案')" prop="productRecord">
<el-select v-model="queryParams.productRecord" :placeholder="$t('请选择备案')" clearable size="small">
<el-option v-for="item in filingOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in filingOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsType">
<el-select v-model="queryParams.customsType" :placeholder="$t('请选择报关方式')" clearable size="small">
<el-option v-for="item in declarationMethodOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
<el-option v-for="item in declarationMethodOps" :label="$l(item, 'label')" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('待预装订单')" prop="toBePreOrderNo">
......@@ -40,10 +40,10 @@
<el-input v-model="queryParams.itemName" :placeholder="$t('请输入品名')" clearable />
</el-form-item>
<el-form-item :label="$t('重货比')" prop="weightRatioMax">
<el-input v-model="queryParams.weightRatioMax" placeholder="请输入 大" clearable />
<el-input v-model="queryParams.weightRatioMax" :placeholder="$t('请输入 大')" clearable />
</el-form-item>
<el-form-item label="" prop="weightRatioMin">
<el-input v-model="queryParams.weightRatioMin" placeholder="请输入 小" clearable />
<el-input v-model="queryParams.weightRatioMin" :placeholder="$t('请输入 小')" clearable />
</el-form-item>
<el-form-item>
......@@ -137,7 +137,11 @@
{{formatDate(scope.row.rucangTime)}}
</template>
</el-table-column>
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" width="120" />
<el-table-column :label="$t('品名')" align="center" prop="" width="120">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
<template slot-scope="scope">
......@@ -237,13 +241,15 @@
</el-row>
<el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
<el-table-column type="index" align="center" :label="$t('序号')" width="50" />
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<el-table-column :label="$t('品名')" align="center" prop="">
<template slot-scope="{row}">
<template>{{row.brandName}}</template>
（<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />）
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
<template>{{row.brandName}}</template>{{ $t('（') }}<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column :label="$t('体积') +'/' + $t('重量')" align="center" prop="volumeWeight">
<template slot-scope="scope">
......@@ -261,8 +267,7 @@
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column :label="$t('材质')" align="center" prop="material">、
<template slot-scope="scope">
<el-table-column :label="$t('材质')" align="center" prop="material">{{ $t('、') }}<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="scope.row.material" />
</template>
</el-table-column>
......
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
View file @ 050ee02c
......@@ -4,7 +4,7 @@
<el-form-item :label="$t('代理商AGENT')">
<supplierSelect v-model="subMaterialObj.agentId" :companyType="'1'" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" />
</el-form-item>
<el-form-item label="提单号M/BL NO." class="two-element">
<el-form-item :label="$t('提单号M/BL NO.')" class="two-element">
<el-input v-model="subMaterialObj.blMblNo" :placeholder="$t('请输入提单号')"></el-input>
<el-button type="primary">{{$t('提单确认件')}}</el-button>
</el-form-item>
......@@ -38,10 +38,10 @@
<el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="$l(unit, 'title')"></el-option>
</el-select>
</el-form-item>
<el-form-item label="毛重(KGS)">
<el-form-item :label="$t('毛重(KGS)')">
<el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入毛重') + '(KGS)'"></el-input>
</el-form-item>
<el-form-item label="立方数(CBM)">
<el-form-item :label="$t('立方数(CBM)')">
<el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
</el-form-item>
<el-form-item :label="$t('货物描述')">
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 050ee02c
......@@ -38,7 +38,10 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop="prodTitleZh">
<el-table-column :label="$t('商品信息')" width="250px" align="center" prop="">
<template slot-scope="{row}">
{{$l(row,'prodTitle')}}
</template>
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
......@@ -69,7 +72,7 @@
</el-table-column>
<el-table-column :label="$t('重量')" align="center" prop="weight">
</el-table-column>
<el-table-column label="数量（个）" align="center" prop="quantity"></el-table-column>
<el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
<el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
<template slot-scope="scope">
......
src/views/ecw/box/shippingSea/nodePage/trailer.vue
View file @ 050ee02c
......@@ -3,7 +3,7 @@
<el-form ref="trailerForm" :rules="rules" :model="trailerObj" label-width="120px">
<el-form-item :label="$t('状态')">
<el-select v-model="trailerObj.tlContainerStatus" :placeholder="$t('请选择状态')">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="type.label" :value="type.value"></el-option>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_TRAILER_STATUS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('拖车公司')">
......
src/views/ecw/box/shippingSea/nodePage/unloading/index.vue
View file @ 050ee02c
......@@ -2,7 +2,7 @@
<div>
<el-form ref="unloadingForm" :model="unloadingObj" label-width="100px">
<el-form-item :label="$t('网点')">
<el-select filterable v-model="unloadingObj.ulOutletsId" clearable>
<el-select filterable v-model="unloadingObj.ulOutletsId" clearable :placeholder="$t('请选择')">
<el-option v-for="node in nodes" :key="node.id" :label="$l(node, 'title')" :value="node.id"></el-option>
</el-select>
</el-form-item>
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 050ee02c
......@@ -38,10 +38,9 @@
<template slot-scope="scope">
<section class="table-goodList">
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
<p>{{$t('品名')}}：{{$l(item, 'prodTitle')}}</p>
<p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
</p>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />{{ $t('】') }}</p>
</div>
</section>
</template>
......
src/views/ecw/box/shippingSea/seaProcess.vue
View file @ 050ee02c
......@@ -294,6 +294,7 @@ export default {
align-items: center;
.node-div {
text-align: center;
margin-top: 10px;
cursor: pointer;
p {
......
src/views/ecw/box/shippingSea/seaStepDetail.vue
View file @ 050ee02c
......@@ -111,6 +111,7 @@ export default {
height: 550px;
min-width: 1300px;
padding: 10px 10px;
overflow-x: auto;
p {
margin: 0;
......
src/views/ecw/box/shippingSea/shippingSea.vue
View file @ 050ee02c
......@@ -105,7 +105,7 @@ export default {
/* 获取仓库 */
importCityName(id) {
var arr = this.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? arr[0].titleZh : "无";
return arr.length > 0 ? this.$l(arr[0], 'title') : "/";
},
// 出货
getBoxInfo() {
......
src/views/ecw/box/shippingSea/utils.js
View file @ 050ee02c
......@@ -151,7 +151,7 @@ function seaBaseData() {
},
},
{
title: "配船",
title: i18n.$t("配船"),
imgSrc: {
start: require("@/assets/images/shipping/pc-start.png"),
wait: require("@/assets/images/shipping/pc-wait.png"),
......@@ -1340,7 +1340,7 @@ function getTotlContent(total, keys = ["num", "volume", "weight"]) {
let content = [];
for (const key of keys) {
if (key === "num") {
content.push(`${total?.num ?? 0}箱`);
content.push(`${total?.num ?? 0}${i18n.$t("箱")}`);
}
if (key === "volume") {
let volume = total?.volume ?? 0;
......@@ -1357,7 +1357,7 @@ function getTotlContent(total, keys = ["num", "volume", "weight"]) {
}
function getCapacity(capacity) {
return `${capacity?.name ?? ""}柜型 ${capacity?.volume ?? 0}m³ ${
return `${capacity?.name ?? ""}${i18n.$t("柜型")} ${capacity?.volume ?? 0}m³ ${
capacity?.weight ?? 0
}kg`;
}
......@@ -1415,7 +1415,7 @@ function serviceMsg(result, _vue) {
return new Promise((resolve, reject) => {
const { code, msg } = result;
if (code === 0) {
_vue.$message.success("操作成功");
_vue.$message.success(i18n.$t("操作成功"));
resolve();
} else {
_vue.$message.error(msg);
......
src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue
View file @ 050ee02c
......@@ -120,7 +120,7 @@ export default {
/* 获取仓库 */
importCityName(id) {
var arr = this.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? this.$l(arr[0], 'title') : "无";
return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无");
},
// 出货
getBoxInfo() {
......
src/views/ecw/box/updateError.vue
View file @ 050ee02c
......@@ -96,7 +96,7 @@ export default {
} else {
this.headerTitle = this.$t(
`确定给{selfNo}下的${
operate === "all" ? "所有订单" : "所选订单"
operate === "all" ? this.$t("所有订单") : this.$t("所选订单")
}更新状态吗？`,
{
selfNo: this.shipmentObj.selfNo,
......
src/views/ecw/busiPwd/index.vue
View file @ 050ee02c
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="密码类别" prop="busiType">
<el-select v-model="queryParams.busiType" placeholder="请选择密码类别" clearable size="small">
<el-form-item :label="$t('密码类别')" prop="busiType">
<el-select v-model="queryParams.busiType" :placeholder="$t('请选择密码类别')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.PWD_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="密码" prop="pwd">
<el-input v-model="queryParams.pwd" placeholder="请输入密码" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('密码')" prop="pwd">
<el-input v-model="queryParams.pwd" :placeholder="$t('请输入密码')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
......@@ -26,11 +26,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:busi-pwd:create']">新增</el-button>
v-hasPermi="['ecw:busi-pwd:create']">{{ $t('新增') }}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:busi-pwd:export']">导出</el-button>
v-hasPermi="['ecw:busi-pwd:export']">{{ $t('导出') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -38,23 +38,23 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键ID" align="center" prop="id" />
<el-table-column label="密码类别" align="center" prop="busiType">
<el-table-column :label="$t('密码类别')" align="center" prop="busiType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.PWD_TYPE" :value="scope.row.busiType" />
</template>
</el-table-column>
<!-- <el-table-column label="密码" align="center" prop="pwd" />-->
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<!-- <el-table-column :label="$t('密码')" align="center" prop="pwd" />-->
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:busi-pwd:update']">修改</el-button>
v-hasPermi="['ecw:busi-pwd:update']">{{ $t('修改') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:busi-pwd:delete']">删除</el-button>
v-hasPermi="['ecw:busi-pwd:delete']">{{ $t('删除') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -65,23 +65,23 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="密码类别" prop="busiType">
<el-select v-model="form.busiType" placeholder="请选择密码类别">
<el-form-item :label="$t('密码类别')" prop="busiType">
<el-select v-model="form.busiType" :placeholder="$t('请选择密码类别')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.PWD_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="密码" prop="pwd">
<el-input v-model="pwd1" placeholder="请输入密码" type="password"/>
<el-form-item :label="$t('密码')" prop="pwd">
<el-input v-model="pwd1" :placeholder="$t('请输入密码')" type="password"/>
</el-form-item>
<el-form-item label="确认密码" prop="pwd">
<el-input v-model="pwd2" placeholder="请再次输入密码" type="password"/>
<el-form-item :label="$t('确认密码')" prop="pwd">
<el-input v-model="pwd2" :placeholder="$t('请再次输入密码')" type="password"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
<el-button @click="cancel">{{ $t('取 消') }}</el-button>
</div>
</el-dialog>
</div>
......@@ -174,7 +174,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加业务密码";
this.title = this.$t("添加业务密码");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -183,7 +183,7 @@ export default {
getBusiPwd(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改业务密码";
this.title = this.$t("修改业务密码");
});
},
/** 提交按钮 */
......
src/views/ecw/cabinet/index.vue
View file @ 050ee02c
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="柜型名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入柜型名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('柜型名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入柜型名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="是否启用" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择是否启用" clearable size="small">
<el-form-item :label="$t('是否启用')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择是否启用')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
......@@ -26,11 +26,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:cabinet:create']">新增</el-button>
v-hasPermi="['ecw:cabinet:create']">{{ $t('新增') }}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:cabinet:export']">导出</el-button>
v-hasPermi="['ecw:cabinet:export']">{{ $t('导出') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -38,8 +38,8 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="柜型名称" align="center" prop="name" />
<el-table-column :label="$t('排序')" align="center" prop="sort" />
<el-table-column :label="$t('柜型名称')" align="center" prop="name" />
<el-table-column label="体积(m³)" align="center" prop="volume">
<template slot-scope="scope">
{{ scope.row.volume }} m³
......@@ -50,22 +50,22 @@
{{ scope.row.weight }} Kg
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="status">
<el-table-column :label="$t('是否启用')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:cabinet:update']">修改</el-button>
v-hasPermi="['ecw:cabinet:update']">{{ $t('修改') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:cabinet:delete']">删除</el-button>
v-hasPermi="['ecw:cabinet:delete']">{{ $t('删除') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -76,28 +76,28 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="柜型名称" prop="name">
<el-input v-model="form.name" placeholder="请输入柜型名称" />
<el-form-item :label="$t('柜型名称')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入柜型名称')" />
</el-form-item>
<el-form-item label="体积(m³)" prop="volume">
<el-input v-model="form.volume" placeholder="请输入体积" />
<el-input v-model="form.volume" :placeholder="$t('请输入体积')" />
</el-form-item>
<el-form-item label="重量(Kg)" prop="weight">
<el-input v-model="form.weight" placeholder="请输入重量" />
<el-input v-model="form.weight" :placeholder="$t('请输入重量')" />
</el-form-item>
<el-form-item label="是否启用" prop="status">
<el-form-item :label="$t('是否启用')" prop="status">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
<el-form-item :label="$t('排序')" prop="sort">
<el-input v-model="form.sort" :placeholder="$t('请输入排序')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
<el-button @click="cancel">{{ $t('取 消') }}</el-button>
</div>
</el-dialog>
</div>
......@@ -138,9 +138,9 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "柜型名称不能为空", trigger: "blur" }],
status: [{ required: true, message: "是否启用不能为空", trigger: "blur" }],
sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t("柜型名称不能为空"), trigger: "blur" }],
status: [{ required: true, message: this.$t("是否启用不能为空"), trigger: "blur" }],
sort: [{ required: true, message: this.$t("排序不能为空"), trigger: "blur" }],
}
};
},
......@@ -193,7 +193,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加柜型配置";
this.title = this.$t("添加柜型配置");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -202,7 +202,7 @@ export default {
getCabinet(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改柜型配置";
this.title = this.$t("修改柜型配置");
});
},
/** 提交按钮 */
......
src/views/ecw/channel/edit.vue
View file @ 050ee02c
......@@ -5,21 +5,21 @@
<el-card shadow="never">
<div slot="header" class="clearfix">
<span>渠道信息</span>
<span>{{ $t('渠道信息') }}</span>
</div>
<el-row>
<el-col :span="12">
<el-form-item label="中文名称" prop="nameZh">
<el-form-item :label="$t('中文名称')" prop="nameZh">
<el-input v-model="form.nameZh" placeholder="请输入名称-中文" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="名称英文" prop="nameEn">
<el-form-item :label="$t('名称英文')" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入名称-英文" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部名称中文" prop="internalNameZh">
<el-form-item :label="$t('内部名称中文')" prop="internalNameZh">
<el-input
v-model="form.internalNameZh"
placeholder="请输入内部名称-中文"
......@@ -27,7 +27,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部名称英文" prop="internalNameEn">
<el-form-item :label="$t('内部名称英文')" prop="internalNameEn">
<el-input
v-model="form.internalNameEn"
placeholder="请输入内部名称-英文"
......@@ -35,23 +35,23 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="类型编码" prop="typeNumber">
<el-form-item :label="$t('类型编码')" prop="typeNumber">
<el-input
v-model="form.typeNumber"
placeholder="请输入类型编码"
:placeholder="$t('请输入类型编码')"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="简码" prop="code">
<el-form-item :label="$t('简码')" prop="code">
<el-input
v-model="form.code"
placeholder="请输入简码"
:placeholder="$t('请输入简码')"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属仓库" prop="warehouseIds">
<el-form-item :label="$t('归属仓库')" prop="warehouseIds">
<!-- <el-select v-model="form.wareHouseIds">
<el-option v-for="item in warehouseList" :value="item.id" :label="item.nameZh"/>
</el-select> -->
......@@ -66,12 +66,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
<el-form-item :label="$t('排序')" prop="sort">
<el-input v-model="form.sort" :placeholder="$t('请输入排序')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="快递" prop="expressId">
<el-form-item :label="$t('快递')" prop="expressId">
<!-- <el-input v-model="form.expressId" placeholder="请输入快递ID" /> -->
<el-select v-model="form.expressId">
<el-option v-for="item in expressList" :value="item.id" :label="item.companyName" :key="item.id"/>
......@@ -79,17 +79,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预计到达时间" prop="etaTime">
<el-input type="number" v-model="form.etaTime" placeholder="请输入天数">
<span slot="append">天</span>
<el-form-item :label="$t('预计到达时间')" prop="etaTime">
<el-input type="number" v-model="form.etaTime" :placeholder="$t('请输入天数')">
<span slot="append">{{ $t('天') }}</span>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="渠道代理" prop="channelAgent">
<el-form-item :label="$t('渠道代理')" prop="channelAgent">
<el-input
v-model="form.channelAgent"
placeholder="请输入渠道代理"
:placeholder="$t('请输入渠道代理')"
/>
</el-form-item>
</el-col> -->
......@@ -109,30 +109,30 @@
</el-form-item>
<!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status">
<el-radio-group v-model="form.status">
<el-radio label="1">请选择字典生成</el-radio>
<el-radio label="1">{{ $t('请选择字典生成') }}</el-radio>
</el-radio-group>
</el-form-item> -->
</el-card>
<!-- <el-card shadow="never">-->
<!-- <div slot="header" class="clearfix">-->
<!-- <span>渠道收费规则</span>-->
<!-- <span>{{ $t('渠道收费规则') }}</span>-->
<!-- </div>-->
<!-- -->
<!-- <el-form-item label="清关单价" prop="customsClearUnit">-->
<!-- <el-input v-model="form.customsClearUnit" placeholder="请输入清关单价">-->
<!-- <el-form-item :label="$t('清关单价')" prop="customsClearUnit">-->
<!-- <el-input v-model="form.customsClearUnit" :placeholder="$t('请输入清关单价')">-->
<!-- <span slot="append">$</span>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="每0.5KG单价" prop="weightUnitPrice">-->
<!-- <el-input v-model="form.weightUnitPrice" placeholder="此字段名暂缺" >-->
<!-- <el-input v-model="form.weightUnitPrice" :placeholder="$t('此字段名暂缺')" >-->
<!-- <span slot="append">$</span>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
</el-form>
<div>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="$router.back()">返回列表</el-button>
<el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
<el-button @click="$router.back()">{{ $t('返回列表') }}</el-button>
</div>
</div>
</template>
......
src/views/ecw/channel/index.vue
View file @ 050ee02c
......@@ -3,37 +3,37 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="nameZh">
<el-input v-model="queryParams.nameZh" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('名称')" prop="nameZh">
<el-input v-model="queryParams.nameZh" :placeholder="$t('请输入名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="名称-英文" prop="nameEn">
<el-input v-model="queryParams.nameEn" placeholder="请输入名称-英文" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item label="内部名称" prop="internalNameZh">
<el-input v-model="queryParams.internalNameZh" placeholder="请输入内部名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('内部名称')" prop="internalNameZh">
<el-input v-model="queryParams.internalNameZh" :placeholder="$t('请输入内部名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="内部名称-英文" prop="internalNameEn">
<el-input v-model="queryParams.internalNameEn" placeholder="请输入内部名称-英文" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item label="类型编码" prop="typeNumber">
<el-input v-model="queryParams.typeNumber" placeholder="请输入类型编码" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('类型编码')" prop="typeNumber">
<el-input v-model="queryParams.typeNumber" :placeholder="$t('请输入类型编码')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="仓库ID字符串" prop="warehouseIds">
<el-input v-model="queryParams.warehouseIds" placeholder="请输入仓库ID字符串" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<!-- <el-form-item label="排序" prop="sort">
<el-input v-model="queryParams.sort" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery"/>
<!-- <el-form-item :label="$t('排序')" prop="sort">
<el-input v-model="queryParams.sort" :placeholder="$t('请输入排序')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item label="快递ID" prop="expressId">
<el-input v-model="queryParams.expressId" placeholder="请输入快递ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="预计时间">
<el-input v-model="queryParams.etaTime" placeholder="预计到达天数" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('预计时间')">
<el-input v-model="queryParams.etaTime" :placeholder="$t('预计到达天数')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="渠道代理" prop="channelAgent">
<el-input v-model="queryParams.channelAgent" placeholder="请输入渠道代理" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('渠道代理')" prop="channelAgent">
<el-input v-model="queryParams.channelAgent" :placeholder="$t('请输入渠道代理')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="备注" prop="remarksZh">
<el-form-item :label="$t('备注')" prop="remarksZh">
<el-input v-model="queryParams.remarksZh" placeholder="请输入备注-中文" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="备注-英文" prop="remarksEn">
......@@ -41,16 +41,16 @@
</el-form-item> -->
<!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态(0:禁用 1:启用)" clearable size="small">
<el-option label="请选择字典生成" value="" />
<el-option :label="$t('请选择字典生成')" value="" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="创建时间">
<!-- <el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
......@@ -58,11 +58,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:channel:create']">新增</el-button>
v-hasPermi="['ecw:channel:create']">{{ $t('新增') }}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:channel:export']">导出</el-button>
v-hasPermi="['ecw:channel:export']">{{ $t('导出') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -70,13 +70,13 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="渠道ID" align="center" prop="channelId" />
<el-table-column label="名称" align="center" prop="nameZh" />
<el-table-column :label="$t('名称')" align="center" prop="nameZh" />
<!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> -->
<el-table-column label="内部名称" align="center" prop="internalNameZh" />
<el-table-column :label="$t('内部名称')" align="center" prop="internalNameZh" />
<!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
<el-table-column label="类型编码" align="center" prop="typeNumber" />-->
<el-table-column :label="$t('类型编码')" align="center" prop="typeNumber" />-->
<!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
<el-table-column label="仓库名" align="center" prop="warehouseNameList" width="180">
<el-table-column :label="$t('仓库名')" align="center" prop="warehouseNameList" width="180">
<template slot-scope="scope">
<el-scrollbar style="margin-right: 6px;">
<div class="left">
......@@ -88,25 +88,25 @@
</el-scrollbar>
</template>
</el-table-column>
<el-table-column label="简码" align="center" prop="code" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="快递公司" align="center" prop="companyName" />
<el-table-column :label="$t('简码')" align="center" prop="code" />
<el-table-column :label="$t('排序')" align="center" prop="sort" />
<el-table-column :label="$t('快递公司')" align="center" prop="companyName" />
<el-table-column label="预计时间(天)" align="center" prop="etaTime" />
<el-table-column label="渠道代理" align="center" prop="channelAgent" />
<el-table-column label="备注" align="center" prop="remarksZh" />
<el-table-column :label="$t('渠道代理')" align="center" prop="channelAgent" />
<el-table-column :label="$t('备注')" align="center" prop="remarksZh" />
<!-- <el-table-column label="备注-英文" align="center" prop="remarksEn" /> -->
<!-- <el-table-column label="状态" align="center" prop="status" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<!-- <el-table-column :label="$t('状态')" align="center" prop="status" /> -->
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:channel:update']">修改</el-button>
v-hasPermi="['ecw:channel:update']">{{ $t('修改') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:channel:delete']">删除</el-button>
v-hasPermi="['ecw:channel:delete']">{{ $t('删除') }}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/coupon/edit.vue
View file @ 050ee02c
......@@ -52,8 +52,8 @@
</div>
</el-form-item>
<el-form-item label="运费" v-if="[2,3,4,5,6,7].indexOf(form.type) > -1">
<span slot="label"><span style="color: red">*</span>运费</span>
<el-form-item :label="$t('运费')" v-if="[2,3,4,5,6,7].indexOf(form.type) > -1">
<span slot="label"><span style="color: red">*</span>{{ $t('运费') }}</span>
<div class="fee-item" v-for="(item, index) in fee[1]" :key="index">
<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
{{$t('满')}}
......@@ -75,8 +75,7 @@
<span v-if="[4].indexOf(form.type) > -1">%</span>
</template>
<template v-if="form.type==7">
> <el-input v-model="item.startAmount" @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />
≤ <el-input v-model="item.endAmount" @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
> <el-input v-model="item.startAmount" @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />{{ $t('≤') }}<el-input v-model="item.endAmount" @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
<selector v-model="item.startAndEndCurrencyId" @input="checkReduceCurrency(item)" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
{{$t('价格')}}
</template>
......@@ -117,8 +116,7 @@
<span v-if="[4].indexOf(form.type) > -1">%</span>
</template>
<template v-if="form.type==7">
> <el-input v-model="item.startAmount" @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />
≤ <el-input v-model="item.endAmount" @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
> <el-input v-model="item.startAmount" @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />{{ $t('≤') }}<el-input v-model="item.endAmount" @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
<Selector v-model="item.startAndEndCurrencyId" @input="checkReduceCurrency(item)" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
{{$t('价格')}}
</template>
......@@ -440,7 +438,7 @@ export default {
})
// 没有商品则表示全部
if(!this.form.prodIds){
if(!this.form.prodIds || !this.form.prodIds.length){
this.isAllProduct = true
}
if(this.form.couponIds){
......@@ -645,7 +643,7 @@ export default {
fields.forEach(field => {
if(!item[field] || +item[field] <= 0){
err = true
this.$message.error((item.type == 1 ? '运费' : '清关费') + '不能为空且大于0')
this.$message.error((item.type == 1 ? this.$t('运费') : '清关费') + '不能为空且大于0')
this.errTips[item.type]
}
})
......
src/views/ecw/coupon/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/currency/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/currencyEcash/index.vue
View file @ 050ee02c
......@@ -100,19 +100,19 @@
:label="$l(item, 'title')" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间（尼日利亚）" prop="nrlyStartTime">
<el-form-item :label="$t('开始时间（尼日利亚）')" prop="nrlyStartTime">
<el-date-picker v-model="form.nrlyStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" :placeholder="$t('选择开始时间')"></el-date-picker>
</el-form-item>
<el-form-item label="结束时间（尼日利亚）" prop="nrlyEndTime">
<el-form-item :label="$t('结束时间（尼日利亚）')" prop="nrlyEndTime">
<el-date-picker v-model="form.nrlyEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" :placeholder="$t('选择结束时间')"></el-date-picker>
</el-form-item>
<el-form-item label="开始时间（北京）" prop="bjStartTime">
<el-form-item :label="$t('开始时间（北京）')" prop="bjStartTime">
<el-date-picker v-model="form.bjStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" :placeholder="$t('选择开始时间')"></el-date-picker>
</el-form-item>
<el-form-item label="结束时间（北京）" prop="bjEndTime">
<el-form-item :label="$t('结束时间（北京）')" prop="bjEndTime">
<el-date-picker v-model="form.bjEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetime" :placeholder="$t('选择结束时间')"></el-date-picker>
</el-form-item>
......@@ -127,8 +127,8 @@
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
<el-button @click="cancel">{{ $t('取 消') }}</el-button>
</div>
</el-dialog>
</div>
......
src/views/ecw/customer/components/Delay.vue
View file @ 050ee02c
<template>
<div>
<el-descriptions :column="4">
<el-descriptions-item label="客户编号">{{detail.customerId}}</el-descriptions-item>
<el-descriptions-item label="客户名称">{{detail.customerName}}</el-descriptions-item>
<el-descriptions-item label="跟进客服">{{detail.followUpSalesmanName}}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{detail.createTime|parseTime}}</el-descriptions-item>
<el-descriptions-item label="申请凭证" :span="4">
<el-descriptions-item :label="$t('客户编号')">{{detail.customerId}}</el-descriptions-item>
<el-descriptions-item :label="$t('客户名称')">{{detail.customerName}}</el-descriptions-item>
<el-descriptions-item :label="$t('跟进客服')">{{detail.followUpSalesmanName}}</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">{{detail.createTime|parseTime}}</el-descriptions-item>
<el-descriptions-item :label="$t('申请凭证')" :span="4">
<el-image v-for="(item, index) in pictures" :key="index" :src="item" style="width:100px; height:100px" :preview-src-list="pictures"></el-image>
</el-descriptions-item>
<el-descriptions-item label="申请原因" :span="4">{{detail.reason}}</el-descriptions-item>
<el-descriptions-item :label="$t('申请原因')" :span="4">{{detail.reason}}</el-descriptions-item>
</el-descriptions>
</div>
</template>
......
src/views/ecw/customer/delay.vue
View file @ 050ee02c
......@@ -201,7 +201,7 @@
cancelAudit(){
this.$prompt("请输入取消原因", {
inputPattern: /[\S]+/,
inputErrorMessage: '不能为空'
inputErrorMessage: this.$t('不能为空')
}).then(({value}) => {
console.log(this.handlerParams.approvalId)
return cancelDelayApproval({approveId:this.handlerParams.approvalId,reason:value})
......
src/views/ecw/customer/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customer/indirectCustomer.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customer/indirectInfo.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customer/query.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customerCommission/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customerComplaint/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/customerConfirm/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/deptTarget/myAchievement.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/dock/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/express/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/creatCollection.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/creatPayment.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/openInvoice.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/payable.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/paymentDetail.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/paymentExamine.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/paymentVoucher.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/printVoucher.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/receiptDetail.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/receivable.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/financial/voucher.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/messageLeave/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/myCustomerService/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/oceanCustomer/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/createLog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/detail.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/edit.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/result.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/offer/special.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/cargoControl.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/cargoControlDetail.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/components/Release.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/components/Transfer.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/detail.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/edit.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/exception/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/prepayDeal.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/singleApply.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/special/Commission.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/special/Discount.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/special/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/success.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/order/transferWarehousing.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/orderCode/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/product/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productBrandEmpower/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productBrank/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productPrice/batchEdit.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productPrice/blacklist.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productPrice/edit.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productPrice/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/productType/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/region/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/shelf/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/shelfGrid/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/supplier/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/unit/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/warehouse/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/ecw/zhongPao/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/error/401.vue
View file @ 050ee02c
This diff is collapsed.
src/views/error/404.vue
View file @ 050ee02c
This diff is collapsed.
src/views/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/index_old.vue deleted 100644 → 0
View file @ 9339cc69
This diff is collapsed.
src/views/infra/apiAccessLog/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/apiErrorLog/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/CodeTypeDialog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/FormDrawer.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/IconsDialog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/JsonDrawer.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/ResourceDialog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/RightPanel.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/TreeNodeDialog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/build/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/codegen/basicInfoForm.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/codegen/editTable.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/codegen/genInfoForm.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/codegen/importTable.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/codegen/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/config/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/file/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/fileConfig/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/job/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/job/log.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/redis/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/infra/testDemo/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/login.vue
View file @ 050ee02c
This diff is collapsed.
src/views/member/user/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/pay/app/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/pay/merchant/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/pay/order/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/pay/refund/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/socialLogin.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/dept/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/dict/data.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/dict/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/errorCode/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/helpDoc/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/internalHelpDoc/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/internalMessage/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/loginlog/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/mailAccount/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/mailLog/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/mailTemplate/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/menu/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/needKnow/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/notice/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/operatelog/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/post/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/role/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/session/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/sms/smsChannel.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/sms/smsLog.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/sms/smsTemplate.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/tenant/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/tenantPackage/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/user/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/user/profile/index.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/user/profile/resetPwd.vue
View file @ 050ee02c
This diff is collapsed.
src/views/system/user/profile/userInfo.vue
View file @ 050ee02c
This diff is collapsed.
translator.js 0 → 100644
View file @ 050ee02c
This diff is collapsed.
yarn.lock
View file @ 050ee02c
This diff is collapsed.
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