Skip to content

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

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

parents fe8f1e62 050ee02c
release
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6788 additions and 5755 deletions
src/components/Breadcrumb/index.vue
View file @ 0e778b8e
......@@ -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)
......@@ -49,7 +49,7 @@ export default {
return name.trim() === '首页' // 修复 Index 重复的问题
},
handleLink(item) {
return
return
const { redirect, path } = item
if (redirect) {
this.$router.push(redirect)
......
src/i18n/languages/en_US.json
View file @ 0e778b8e
This diff is collapsed.
src/router/index.js
View file @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
<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 @ 0e778b8e
<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 @ 0e778b8e
This diff is collapsed.
src/views/bpm/oa/leave/create.vue
View file @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
<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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
<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/ecw/bankAccount/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/bannerPop/index.vue
View file @ 0e778b8e
......@@ -104,7 +104,7 @@
~
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateEnd">
</el-date-picker>
<span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
<span style="color:red;font-size:14px;">{{ $t('注意：留空则表示永久有效') }}</span>
</el-form-item>
<el-form-item :label="$t('网页中文')" prop="htmlWebZh">
......@@ -121,8 +121,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/box/ladingBill/index.vue
View file @ 0e778b8e
......@@ -16,10 +16,8 @@
<div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
<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>
......
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @ 0e778b8e
......@@ -111,7 +111,7 @@ export default {
"mergecells", //合并多个单元格
"deletetable", //删除表格
"cleardoc", //清空文档
"insertparagraphbeforetable", //"表格前插入行"
"insertparagraphbeforetable", //this.$t("表格前插入行")
//"insertcode", //代码语言
"fontfamily", //字体
"fontsize", //字号
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -54,8 +54,7 @@
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<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>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
View file @ 0e778b8e
......@@ -109,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/cusDeclaration.vue
View file @ 0e778b8e
......@@ -368,7 +368,7 @@ export default {
this.$modal
.confirm(this.$t(
`您确认提交${
dcCheckStatus === "1" ? "全部退场" : "部分退场"
dcCheckStatus === "1" ? this.$t("全部退场") : this.$t("部分退场")
}审核吗？`)
)
.then(() => {
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 0e778b8e
......@@ -248,10 +248,7 @@
</el-table-column>
<el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}">
<template>{{row.brandName}}</template>
（
<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />）
</template>
<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">
......@@ -270,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/tally/index.vue
View file @ 0e778b8e
......@@ -72,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/unloading/startUnloading.vue
View file @ 0e778b8e
......@@ -40,8 +40,7 @@
<div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
<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/shippingSeaAir/shippingSeaAir.vue
View file @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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 @ 0e778b8e
......@@ -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>
......@@ -119,8 +118,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>
......@@ -647,7 +645,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 @ 0e778b8e
This diff is collapsed.
src/views/ecw/currency/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/currencyEcash/index.vue
View file @ 0e778b8e
......@@ -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 @ 0e778b8e
<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 @ 0e778b8e
......@@ -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 @ 0e778b8e
This diff is collapsed.
src/views/ecw/customer/indirectCustomer.vue
View file @ 0e778b8e
......@@ -4,7 +4,7 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('客户名称')" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('联系方式')">
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
......
src/views/ecw/customer/indirectInfo.vue
View file @ 0e778b8e
......@@ -37,7 +37,7 @@
<el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
</el-descriptions-item>
<el-descriptions-item :label="$t('备注')">{{ customer.remarks }}</el-descriptions-item>
<!-- <el-descriptions-item label="信用等级">{{ customer }}</el-descriptions-item>-->
<!-- <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->
</el-descriptions>
</el-card>
......
src/views/ecw/customer/query.vue
View file @ 0e778b8e
......@@ -45,7 +45,7 @@
<el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
</el-descriptions-item>
<el-descriptions-item :label="$t('备注')">{{ customer.remarks }}</el-descriptions-item>
<!-- <el-descriptions-item label="信用等级">{{ customer }}</el-descriptions-item>-->
<!-- <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->
</el-descriptions>
</el-card>
......
src/views/ecw/customerCommission/index.vue
View file @ 0e778b8e
......@@ -126,7 +126,7 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view" @click="handleUpdate(scope.row)">查看</el-button>
<el-button size="mini" type="text" icon="el-icon-view" @click="handleUpdate(scope.row)">{{ $t('查看') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{$t('删除')}}</el-button>
</template>
</el-table-column>
......
src/views/ecw/customerCommissionInfo/index.vue
View file @ 0e778b8e
......@@ -13,7 +13,7 @@
<!-- <el-select-->
<!-- v-model="customerForm.name"-->
<!-- filterable-->
<!-- placeholder="请输入关键词"-->
<!-- :placeholder="$t('请输入关键词')"-->
<!-- @change="changefn">-->
<!-- <el-option-->
<!-- v-for="item in customeList"-->
......@@ -449,7 +449,7 @@ export default {
this.customerName = p.customerName
}
getCustomerCommission(this.id).then(r =>{
// console.log(r,'客户佣金详情',);
// console.log(r,this.$t('客户佣金详情'),);
if(r.code != 0 || r.data.length == 0) return
if(this.form.type == 1){
//明佣
......
src/views/ecw/customerComplaint/index.vue
View file @ 0e778b8e
......@@ -185,9 +185,9 @@
<el-form-item v-show="form.status == '3'" :label="$t('处理时间')" required>
<span>{{parseTime(form.handleAt)}}</span>
</el-form-item>
<!-- <el-form-item label="处理状态" prop="status" v-if="form.id">
<!-- <el-form-item :label="$t('处理状态')" prop="status" v-if="form.id">
<span v-if="!form.id">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS, 1) }}</span>
<el-select v-else v-model="form.status" placeholder="请选择处理状态">
<el-select v-else v-model="form.status" :placeholder="$t('请选择处理状态')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
......
src/views/ecw/customerConfirm/index.vue
View file @ 0e778b8e
......@@ -4,10 +4,10 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('客户编号')" prop="number">
<el-input v-model="queryParams.number" placeholder="请输入客户编号" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('客户名称')" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('客户等级')" prop="level">
<el-select clearable v-model="queryParams.level" :placeholder="$t('请选择客户等级')" clearable size="small">
......@@ -141,7 +141,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国家" prop="country">
<el-form-item :label="$t('国家')" prop="country">
<el-select v-model="form.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
......@@ -534,7 +534,7 @@ export default {
// getCustomer(id).then(response => {
// this.form = response.data;
// this.open = true;
// this.title = "完善客户";
// this.title = this.$t("完善客户");
// });
},
/** 修改按钮操作 */
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 0e778b8e
......@@ -218,7 +218,7 @@ export default {
country: [{ required: true, message: this.$t('国家不能为空'), trigger: "blur" }],
level: [{ required: true, message: this.$t('客户等级不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('客户类别不能为空'), trigger: "blur" }],
// createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
// createTime: [{ required: true, message: this.$t("创建时间不能为空"), trigger: "blur" }],
source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }],
customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }],
status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }],
......@@ -348,7 +348,7 @@ export default {
this.$router.push('/customer/add-edit/0')
// this.reset();
// this.open = true;
// this.title = "添加客户";
// this.title = this.$t("添加客户");
},
/** 查看按钮操作 */
handleView(row) {
......@@ -362,7 +362,7 @@ export default {
// getCustomer(id).then(response => {
// this.form = { ...this.form, ...response.data };
// this.open = true;
// this.title = "修改客户";
// this.title = this.$t("修改客户");
// });
},
/** 提交按钮 */
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ 0e778b8e
......@@ -26,8 +26,8 @@
</el-form-item> -->
<!-- <el-form-item prop="customerService">
<el-select clearable v-model="queryParams.customerService" clearable size="small">
<el-option label="下单时间" value="createTime"/>
<el-option label="装柜时间" value="ldBoxTime"/>
<el-option :label="$t('下单时间')" value="createTime"/>
<el-option :label="$t('装柜时间')" value="ldBoxTime"/>
</el-select>
</el-form-item> -->
<el-form-item>
......@@ -44,15 +44,15 @@
</el-form-item>
</el-form>
<div class="total_num">
<span>开发客户：</span>
<span>{{ $t('开发客户：') }}</span>
<span>总箱数 {{totalData.developNum}}箱 </span>
<span>总方数 {{totalData.developVolume}}m³ </span>
<span>总重量 {{totalData.developWeight}}KG </span>
<span>公司客户：</span>
<span>{{ $t('公司客户：') }}</span>
<span>总箱数 {{totalData.companyNum}}箱 </span>
<span>总方数 {{totalData.companyVolume}}m³ </span>
<span>总重量 {{totalData.companyWeight}}KG </span>
<span>汇总：</span>
<span>{{ $t('汇总：') }}</span>
<span>总箱数 {{totalData.sumNum}}箱 </span>
<span>总方数 {{totalData.sumVolume}}m³ </span>
<span>总重量 {{totalData.sumWeight}}KG </span>
......
src/views/ecw/financial/creatCollection.vue
View file @ 0e778b8e
......@@ -408,7 +408,7 @@
@open="getList"
>
<div>
<!-- <div slot="header" class="card-title">添加未收客户款项</div> -->
<!-- <div slot="header" class="card-title">{{ $t('添加未收客户款项') }}</div> -->
<!-- 搜索工作栏 -->
<el-form
v-if="open"
......@@ -551,7 +551,7 @@
></dict-tag>
</template>
</el-table-column>
<!-- <el-table-column label="单价美元" align="center" prop="unitPrice" /> -->
<!-- <el-table-column :label="$t('单价美元')" align="center" prop="unitPrice" /> -->
<el-table-column :label="$t('单价')" align="center" prop="unitPrice">
<template slot-scope="scope">
<span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
......@@ -893,7 +893,7 @@ export default {
var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
if(dollarList.length>0){
var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
}
})
// const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
......
src/views/ecw/financial/creatPayment.vue
View file @ 0e778b8e
......@@ -249,7 +249,7 @@
</el-form>
</el-card>
<div slot="footer" style="margin: 20px 0">
<!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
<!-- <el-button type="primary" @click="submitDraft">{{ $t('保 存') }}</el-button> -->
<el-button type="primary" @click="submitForm">{{id==0?$t('新增'):$t('编辑')}}</el-button>
</div>
<el-dialog
......@@ -260,7 +260,7 @@
@open="openDialog"
>
<div>
<!-- <div slot="header" class="card-title">添加未收客户款项</div> -->
<!-- <div slot="header" class="card-title">{{ $t('添加未收客户款项') }}</div> -->
<!-- 搜索工作栏 -->
<el-form
:model="queryParams"
......@@ -689,17 +689,17 @@ export default {
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/openInvoice.vue
View file @ 0e778b8e
......@@ -206,17 +206,17 @@ export default {
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/payable.vue
View file @ 0e778b8e
......@@ -31,7 +31,7 @@
/>
</el-form-item>
<!-- <el-form-item label="订单号:" >
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery"/>
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item :label="$t('始发仓')">
<el-select
......@@ -72,14 +72,14 @@
</el-row>
<!-- <el-form-item label="付款单号:" >
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" placeholder="请输入付款单号" clearable @keyup.enter.native="handleQuery"/>
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" :placeholder="$t('请输入付款单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<!-- <el-form-item label="状态:">
<dict-selector :type="DICT_TYPE.ECW_RECEIPT_STATE" v-model="queryParams.control" />
</el-form-item>
<el-form-item label="业务员:">
<el-select v-model="form.salesmanId" placeholder="请选择业务员">
<el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
<el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
</el-select>
</el-form-item> -->
......@@ -97,7 +97,7 @@
</el-row> -->
<el-row>
<!-- <el-form-item label="商品名称:" >
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" :placeholder="$t('请输入商品名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item :label="$t('供应商名称')">
<el-input
......@@ -145,8 +145,8 @@
<span>{{getCurrencyLabel(scope.row.currencyId)}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="channelName" />
<el-table-column label="创建人" align="center" prop="toDepartureId" /> -->
<!-- <el-table-column :label="$t('创建时间')" align="center" prop="channelName" />
<el-table-column :label="$t('创建人')" align="center" prop="toDepartureId" /> -->
<el-table-column
:label="$t('操作')"
align="center"
......
src/views/ecw/financial/paymentDetail.vue
View file @ 0e778b8e
......@@ -210,7 +210,7 @@
</el-form>
</el-card>
<div slot="footer" style="margin: 20px 0">
<!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
<!-- <el-button type="primary" @click="submitDraft">{{ $t('保 存') }}</el-button> -->
<el-button type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{ $t('返回') }}</el-button>
</div>
</div>
......@@ -476,17 +476,17 @@ export default {
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/paymentExamine.vue
View file @ 0e778b8e
......@@ -180,17 +180,17 @@ export default {
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/paymentVoucher.vue
View file @ 0e778b8e
......@@ -148,11 +148,11 @@
<el-button v-if="scope.row.state == 2" size="mini" type="text" v-hasPermi="['ecw:payment:update']" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
<el-button v-if="scope.row.state == 4" size="mini" type="text" v-hasPermi="['ecw:payment:update']" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
<!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">开票</el-button> -->
<!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">{{ $t('开票') }}</el-button> -->
<el-button size="mini" type="text" @click="toprint(scope.row.id)" v-hasPermi="['ecw:payment:query']">{{ $t('打印') }}</el-button>
<el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" type="text" v-hasPermi="['ecw:payment:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
<!-- <el-button size="mini" type="text" @click="open = true">导出订单</el-button> -->
<!-- <el-button size="mini" type="text" @click="open = true">{{ $t('导出订单') }}</el-button> -->
</template>
</el-table-column>
</el-table>
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ 0e778b8e
......@@ -23,8 +23,8 @@
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('银行账号') }}：</div><span>{{ form.supplierBankAccount || '-' }}</span></div>
</div>
<!-- <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;">水单号：</div><span>{{form?form.accountBank:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;">手续费：</div><span>{{form?form.accountBank:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;">{{ $t('水单号：') }}</div><span>{{form?form.accountBank:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;">{{ $t('手续费：') }}</div><span>{{form?form.accountBank:'无'}}</span></div>
</div> -->
<div style="display: flex;width: 80%;align-items: center;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">{{ $t('备注') }}：</div><span>{{ form.notes || '-' }}</span></div>
......@@ -198,17 +198,17 @@
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/printVoucher.vue
View file @ 0e778b8e
......@@ -289,17 +289,17 @@
},
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
var cnInteger = this.$t('整');
//整型完以后的单位
var cnIntLast = '元';
var cnIntLast = this.$t('元');
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
......
src/views/ecw/financial/receiptDetail.vue
View file @ 0e778b8e
......@@ -59,8 +59,8 @@
<el-descriptions :column="2" border class="card">
<!-- <el-descriptions-item v-for="(v, index) in form.platformAccountIdList" :label="`收款账户${index + 1}`" :key="index">
<div style="display: flex">
<el-button type="text" v-if="index === 0" @click="form.platformAccountIdList = [...form.platformAccountIdList, {}]">添加收款账户</el-button>
<el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">删除</span></el-button>
<el-button type="text" v-if="index === 0" @click="form.platformAccountIdList = [...form.platformAccountIdList, {}]">{{ $t('添加收款账户') }}</el-button>
<el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">{{ $t('删除') }}</span></el-button>
</div>
</el-descriptions-item>
-->
......@@ -68,10 +68,10 @@
<span>{{ form.openInvoice == 1 ? $t('需要') : $t('不需要') }}</span>
<!-- <el-select
v-model="form.openInvoice"
placeholder="请选择是否需要开票"
:placeholder="$t('请选择是否需要开票')"
>
<el-option :value="1" label="需要"></el-option>
<el-option :value="0" label="不需要"></el-option>
<el-option :value="1" :label="$t('需要')"></el-option>
<el-option :value="0" :label="$t('不需要')"></el-option>
</el-select> -->
</el-descriptions-item>
<el-descriptions-item>
......@@ -129,7 +129,7 @@
{{getCurrencyLabel(scope.row.currencyId)}}
</template>
</el-table-column>
<!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> -->
<!-- <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount" /> -->
<el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
<template slot-scope="scope" v-if="scope.row.type !== 'total'">
<span v-if="scope.row.discountTotal&&scope.row.discountTotal>0">{{ `${scope.row.receivableAmount - scope.row.discountTotal }(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}</span>
......@@ -209,7 +209,7 @@
<el-date-picker
v-model="form.rateValidateDate"
type="datetime"
placeholder="选择日期时间">
:placeholder="$t('选择日期时间')">
</el-date-picker>
</el-form-item> -->
</el-descriptions-item>
......@@ -659,7 +659,7 @@ export default {
// if(n && n.discountTotal&&n.discountTotal>0){
// amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)})
// }else{
amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
// }
}
......@@ -968,6 +968,7 @@ export default {
this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
collom[item.currencyId] = item.amount
})
console.log(this.form.receiptAccountList)
console.log('collom',collom)
// if(recepted.length>collom.length){
recepted.forEach((amount,currency)=>{
......
src/views/ecw/financial/receivable.vue
View file @ 0e778b8e
......@@ -151,12 +151,12 @@
/>
</el-form-item>
<!-- <el-form-item label="发货人:" >
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" placeholder="请输入发货人" clearable @keyup.enter.native="handleQuery"/>
<el-input style="max-width: 188px;" v-model="queryParams.orderNo" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
</el-row>
<el-row>
<el-form-item :label="$t('收货人')">
<!-- <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" placeholder="请输入收货人" clearable @keyup.enter.native="handleQuery"/> -->
<!-- <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery"/> -->
<customer-selector
v-model="queryParams.consigneeNameOrPhone"
@change="consignor = $event"
......
src/views/ecw/financial/voucher.vue
View file @ 0e778b8e
......@@ -122,8 +122,8 @@
<!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
</template>
</el-table-column>
<!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
<!-- <el-table-column label="订单号" align="center" prop="orderNo"> -->
<!-- <el-table-column :label="$t('自编号')" align="center" prop="orderNo" /> -->
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderNo"> -->
<!-- <template slot-scope="scope"> -->
<!-- <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.orderNo}}</span> -->
<!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
......@@ -135,11 +135,11 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="币种" align="center">
<!-- <el-table-column :label="$t('币种')" align="center">
<template slot-scope="scope">
</template>
</el-table-column> -->
<!-- <el-table-column label="汇率" align="center" prop="totalAmount" /> -->
<!-- <el-table-column :label="$t('汇率')" align="center" prop="totalAmount" /> -->
<el-table-column :label="$t('实收日期')" align="center" prop="payedAt">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
......@@ -177,7 +177,7 @@
size="mini"
type="text"
@click="verificationClick(scope.row)"
>核销</el-button
>{{ $t('核销') }}</el-button
> -->
<el-button
v-if="scope.row.state == 4 || scope.row.state == 5 || scope.row.state == 6"
......@@ -231,7 +231,7 @@
append-to-body
>
<!-- <div slot="title" class="card-title" style='border-bottom: 2px solid #f8f8f8;'>
<span>导出账单</span>
<span>{{ $t('导出账单') }}</span>
<i class="el-icon-close" @click="cancel"></i>
</div> -->
<div class="dialog-footer">
......
src/views/ecw/messageLeave/index.vue
View file @ 0e778b8e
......@@ -120,7 +120,7 @@
</div>
</el-dialog>
<!-- 留言详情-->
<el-dialog title="留言详情" :visible.sync="leavingShow" width="500px" append-to-body>
<el-dialog :title="$t('留言详情')" :visible.sync="leavingShow" width="500px" append-to-body>
<el-row class="el-row-leaving" :gutter="10">
<el-col :span="4">{{$t('姓名')}}:</el-col><el-col :span="12">{{messageVal.name ? messageVal.name : ''}}</el-col>
</el-row>
......
src/views/ecw/myCustomerService/index.vue
View file @ 0e778b8e
......@@ -207,7 +207,7 @@ export default {
country: [{ required: true, message: this.$t('国家不能为空'), trigger: "blur" }],
level: [{ required: true, message: this.$t('客户等级不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('客户类别不能为空'), trigger: "blur" }],
// createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
// createTime: [{ required: true, message: this.$t("创建时间不能为空"), trigger: "blur" }],
source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }],
status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }],
founder: [{ required: true, message: this.$t('创建人不能为空'), trigger: "blur" }],
......@@ -333,7 +333,7 @@ export default {
this.$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})
// this.reset();
// this.open = true;
// this.title = "添加客户";
// this.title = this.$t("添加客户");
},
/** 查看按钮操作 */
handleView(row) {
......@@ -347,7 +347,7 @@ export default {
// getCustomer(id).then(response => {
// this.form = { ...this.form, ...response.data };
// this.open = true;
// this.title = "修改客户";
// this.title = this.$t("修改客户");
// });
},
/** 提交按钮 */
......
src/views/ecw/oceanCustomer/index.vue
View file @ 0e778b8e
......@@ -128,7 +128,7 @@
<!-- 移交 -->
<el-dialog
center
title="客服"
:title="$t('客服')"
:visible.sync="transferShow"
width="30%">
<div style="width: 100%;min-height: 200px;text-align: center">
......@@ -338,7 +338,7 @@ export default {
this.$router.push('/customer/add-edit/0')
// this.reset();
// this.open = true;
// this.title = "添加客户";
// this.title = this.$t("添加客户");
},
/** 查看按钮操作 */
handleView(row) {
......@@ -352,7 +352,7 @@ export default {
// getCustomer(id).then(response => {
// this.form = { ...this.form, ...response.data };
// this.open = true;
// this.title = "修改客户";
// this.title = this.$t("修改客户");
// });
},
/** 提交按钮 */
......
src/views/ecw/offer/components/Commossion.vue
View file @ 0e778b8e
......@@ -35,13 +35,13 @@
</el-form-item>
<!-- 明佣或者明佣+暗佣才显示 -->
<el-form-item label="明佣佣金" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-form-item :label="$t('明佣佣金')" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-input v-model.number="form.lightCommissionAmount" placeholder="" class="w-100"></el-input>
{{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
<!-- 明佣+暗佣才显示 -->
<el-form-item label="暗佣佣金" v-if="form.commissionType == 3">
<el-form-item :label="$t('暗佣佣金')" v-if="form.commissionType == 3">
<el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input>
{{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
......@@ -61,7 +61,7 @@
<template v-if="darkCommission">
{{$t('暗佣')}}：{{darkCommission}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</template>
<el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">去设置</el-link>
<el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">{{ $t('去设置') }}</el-link>
</div>
<div v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{ salePrice }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
......@@ -73,14 +73,14 @@
<div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button>
<el-button type="default" @click="closeDialog">返回</el-button>
<el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div>
</el-dialog>
</template>
......@@ -132,7 +132,7 @@ export default {
type: TYPE
},
rules:{
commissionType : {required: true, message: '请选择佣金类型'},
commissionType : {required: true, message: this.$t('请选择佣金类型')},
},
darkCommission: null, // 暗佣佣金
}
......@@ -156,7 +156,7 @@ export default {
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : ''
return s ? this.$t('【') + s + this.$t('】') : ''
}
},
// 最初的运费
......
src/views/ecw/offer/components/SpecialDetail.vue
View file @ 0e778b8e
......@@ -44,7 +44,7 @@
</div>
</el-descriptions-item>
<el-descriptions-item label="申请原因" :span="3" v-if="type == 1">
<el-descriptions-item :label="$t('申请原因')" :span="3" v-if="type == 1">
<div class="item">
{{$t('商品')}}：{{$l(form, 'prodTitle')}}
</div>
......@@ -65,24 +65,22 @@
</el-descriptions-item>
<!--
<el-descriptions-item label="商品类型">{{ $l(productType, 'title') }}</el-descriptions-item>
<el-descriptions-item label="商品名称">{{ form.prodTitleZh }}</el-descriptions-item>
<el-descriptions-item label="英文名称">{{ form.prodTitleEn }}</el-descriptions-item>
<el-descriptions-item label="线路">
【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="form.transportId" />】
<template v-if="channel">
<el-descriptions-item :label="$t('商品类型')">{{ $l(productType, 'title') }}</el-descriptions-item>
<el-descriptions-item :label="$t('商品名称')">{{ form.prodTitleZh }}</el-descriptions-item>
<el-descriptions-item :label="$t('英文名称')">{{ form.prodTitleEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('线路')">{{ $t('【') }}<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="form.transportId" />{{ $t('】') }}<template v-if="channel">
【{{ $l(channel, 'name') }}】
</template>
{{$t("从【{start}】发往【{dest}】", { start: form.departureName, dest: form.objectiveName })}}
</el-descriptions-item>
<el-descriptions-item label="是否预付">
<el-descriptions-item :label="$t('是否预付')">
<dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="form.isPayAdvance" />
</el-descriptions-item> -->
<!-- <el-descriptions-item label="旧运费">{{ form.orgSeaFreight }} {{ currencyMap[form.orgSeaFreightCurrency] }}/{{ unitMap[form.orgSeaFreightVolume] }}</el-descriptions-item>
<el-descriptions-item label="旧清关费">{{ form.orgClearanceFreight }} {{ currencyMap[form.orgClearanceFreightCurrency] }}/{{ unitMap[form.orgClearanceFreightVolume] }}</el-descriptions-item>
<el-descriptions-item label="新运费">{{ form.seaFreight }} {{ currencyMap[form.seaFreightCurrency] }}/{{ unitMap[form.seaFreightVolume] }}</el-descriptions-item>
<el-descriptions-item label="新清关费">{{ form.clearanceFreight }} {{ currencyMap[form.clearanceFreightCurrency] }}/{{ unitMap[form.clearanceFreightVolume] }}</el-descriptions-item> -->
<!-- <el-descriptions-item :label="$t('旧运费')">{{ form.orgSeaFreight }} {{ currencyMap[form.orgSeaFreightCurrency] }}/{{ unitMap[form.orgSeaFreightVolume] }}</el-descriptions-item>
<el-descriptions-item :label="$t('旧清关费')">{{ form.orgClearanceFreight }} {{ currencyMap[form.orgClearanceFreightCurrency] }}/{{ unitMap[form.orgClearanceFreightVolume] }}</el-descriptions-item>
<el-descriptions-item :label="$t('新运费')">{{ form.seaFreight }} {{ currencyMap[form.seaFreightCurrency] }}/{{ unitMap[form.seaFreightVolume] }}</el-descriptions-item>
<el-descriptions-item :label="$t('新清关费')">{{ form.clearanceFreight }} {{ currencyMap[form.clearanceFreightCurrency] }}/{{ unitMap[form.clearanceFreightVolume] }}</el-descriptions-item> -->
</el-descriptions>
</template>
......
src/views/ecw/offer/components/SpecialDiscount.vue
View file @ 0e778b8e
......@@ -53,17 +53,17 @@
</el-form-item>
</el-form>
<div class="page-title">审批流程</div>
<div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button>
<el-button type="default" @click="closeDialog">返回</el-button>
<el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div>
</el-dialog>
</template>
......@@ -113,8 +113,8 @@ export default {
},
orignal: {}, // 原始数据，用来判断是否做了修改
rules:{
seaFreight : {required: true, message: '运费不能为空'},
clearanceFreight: {required: true, message: '清关费不能为空'}
seaFreight : {required: true, message: this.$t('运费不能为空')},
clearanceFreight: {required: true, message: this.$t('清关费不能为空')}
}
}
},
......@@ -177,7 +177,7 @@ export default {
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : ''
return s ? this.$t('【') + s + this.$t('】') : ''
}
},
currentMap(){
......
src/views/ecw/offer/createLog.vue
View file @ 0e778b8e
......@@ -5,7 +5,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item :label="$t('报价单号')" prop="number" style="width: 46%;display: inline-block;">
<label>{{form.number}}</label>
<!-- <el-input :value="form.number" disabled placeholder="请输入报价单号" /> -->
<!-- <el-input :value="form.number" disabled :placeholder="$t('请输入报价单号')" /> -->
</el-form-item>
<el-form-item :label="$t('跟进类型')" prop="type" style="width: 46%;display: inline-block;margin-left:8%">
<el-radio v-model="form.type" label="2">{{$t('商务洽谈')}}</el-radio>
......
src/views/ecw/offer/detail.vue
View file @ 0e778b8e
......@@ -133,10 +133,10 @@
<el-table-column :label="$t('成交价')" width="200px">
<template slot-scope="{row}">
<template v-if="row.charging ==1">
<template v-if="!row.seaFreight">未报价</template>
<template v-if="!row.seaFreight">{{ $t('未报价') }}</template>
<template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
</template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">{{ $t('未报价') }}</template>
<template v-else>
<div>
{{$t('运费')}}：{{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
......
src/views/ecw/offer/edit.vue
View file @ 0e778b8e
......@@ -21,7 +21,7 @@
<div class="form-section">
<el-form-item :label="$t('发货人')" prop="consignorId" >
<div class="contact">
<el-input v-model="form.consignorName" placeholder="选择或新建" disabled style="width:120px"/>
<el-input v-model="form.consignorName" :placeholder="$t('选择或新建')" disabled style="width:120px"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" />
</div>
......@@ -40,7 +40,7 @@
<div class="form-section">
<el-form-item :label="$t('收货人')" prop="consigneeId">
<div class="contact">
<el-input v-model="form.consigneeName" placeholder="请选择或新建" :disabled="true" style="width:120px"/>
<el-input v-model="form.consigneeName" :placeholder="$t('请选择或新建')" :disabled="true" style="width:120px"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
</div>
......@@ -289,13 +289,13 @@
<el-descriptions-item :label="$t('总件数')">
{{sum.totalNum.toFixed() || 0}}
</el-descriptions-item>
<el-descriptions-item label="总体积">
<el-descriptions-item :label="$t('总体积')">
{{sum.totalVolume.toFixed() || 0}}m³
</el-descriptions-item>
<el-descriptions-item label="总重量">
<el-descriptions-item :label="$t('总重量')">
{{sum.totalWeight.toFixed() || 0}}kg
</el-descriptions-item>
<el-descriptions-item label="总数量">
<el-descriptions-item :label="$t('总数量')">
{{sum.totalQuatity.toFixed() || 0}}
</el-descriptions-item>
......@@ -429,7 +429,7 @@
</el-form-item>
<el-form-item :label="$t('交货地址')">
<el-input v-model="form.tradeAdress" placeholder="港口或地点"></el-input>
<el-input v-model="form.tradeAdress" :placeholder="$t('港口或地点')"></el-input>
</el-form-item>
</div>
<div class="form-section">
......@@ -576,8 +576,8 @@ export default {
}
],
lineId: [{ required: true, message: this.$t("请选择线路")}],
/* consignorId: [{ required: true, message: "发货人不能为空",}],
consigneeId: [{ required: true, message: "收货人不能为空"}], */
/* consignorId: [{ required: true, message: this.$t("发货人不能为空"),}],
consigneeId: [{ required: true, message: this.$t("收货人不能为空")}], */
startTime: [{ required: true, message: this.$t("有效期开始时间不能为空")}],
endTime: [{ required: true, message: this.$t("有效期结束时间不能为空")}],
transportId: [{ required: true, message: this.$t("选择运输方式")}],
......@@ -701,7 +701,7 @@ export default {
let arr = []
this.clearanceFeeList.forEach(item => {
let it = {
src: '清关费',
src: this.$t('清关费'),
currencyId: item.currencyId,
amount: Decimal(item.amount)
}
......@@ -715,7 +715,7 @@ export default {
this.freightFeeList.forEach(item => {
if(!arr.find(arrItem => arrItem.currencyId == item.currencyId)){
arr.push({
src: '未计算的运费',
src: this.$t('未计算的运费'),
currencyId: item.currencyId,
amount: Decimal(item.amount)
})
......
src/views/ecw/offer/index.vue
View file @ 0e778b8e
......@@ -12,9 +12,7 @@
</el-form-item>
<el-form-item :label="$t('创建时间')" prop="orderNo">
<el-date-picker v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
到
<el-date-picker v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('始发地')" prop="departureId">
......@@ -49,9 +47,7 @@
<div>
<el-form-item :label="$t('预计结束时间')" prop="orderNo">
<el-date-picker v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
到
<el-date-picker v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-date-picker v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
......
src/views/ecw/offer/result.vue
View file @ 0e778b8e
......@@ -2,26 +2,26 @@
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="报价单号">
<el-form-item :label="$t('报价单号')">
<div>{{number}}</div>
</el-form-item>
<el-form-item label="结果" prop="result">
<el-form-item :label="$t('结果')" prop="result">
<dict-selector form-type="radio" :type="DICT_TYPE.ECW_OFFER_RESULT" v-model="form.result" />
</el-form-item>
<template v-if="form.result==1">
<el-form-item label="入仓类型" prop="warehousingType">
<el-form-item :label="$t('入仓类型')" prop="warehousingType">
<dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehousingType" />
</el-form-item>
<el-form-item label="关联订单" prop="orderIds">
<el-form-item :label="$t('关联订单')" prop="orderIds">
<!-- <el-input v-model="form.orderIds" style="width: 206px;"></el-input> -->
<el-select
v-model="form.orderNo"
filterable
remote
reserve-keyword
placeholder="订单号"
:placeholder="$t('订单号')"
@focus="checkOptions"
:remote-method="remoteMethod"
:loading="selectLoading">
......@@ -35,14 +35,14 @@
</el-form-item>
</template>
<template v-else>
<el-form-item label="原因" prop="reason">
<el-form-item :label="$t('原因')" prop="reason">
<el-input style="width: 500px;" type="textarea" placeholder="" v-model="form.reason"></el-input>
</el-form-item>
</template>
<el-form-item>
<el-button type="primary" @click="submitForm">{{form.result==1? $t("确定并新增草稿订单") : $t("提交")}}</el-button>
<el-button @click="$router.back()">返 回</el-button>
<el-button @click="$router.back()">{{ $t('返 回') }}</el-button>
</el-form-item>
</el-form>
</div>
......@@ -75,7 +75,7 @@ export default {
},
// 表单校验
rules: {
warehousingType: {required: true, message: '请选择入仓类型'}
warehousingType: {required: true, message: this.$t('请选择入仓类型')}
},
selectLoading: false,
orderNoList: []
......
src/views/ecw/offer/special.vue
View file @ 0e778b8e
......@@ -47,7 +47,7 @@
<el-table-column
:label="$t('原价')">
<template v-slot="{row}">
<template v-if="!row.originalSeaFreight">未报价</template>
<template v-if="!row.originalSeaFreight">{{ $t('未报价') }}</template>
<template v-else-if="row.charging ==1">
{{$t('全包价')}}：{{ row.originalSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
</template>
......@@ -59,9 +59,9 @@
</template>
</el-table-column>
<el-table-column
label="成本价">
:label="$t('成本价')">
<template v-slot="{row}">
<template v-if="!row.costSeaFreight">未报价</template>
<template v-if="!row.costSeaFreight">{{ $t('未报价') }}</template>
<template v-else-if="row.charging">
{{$t('全包价')}}：{{ row.costSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
</template>
......@@ -75,7 +75,7 @@
<el-table-column
:label="$t('销售价')">
<template v-slot="{row}">
<template v-if="!row.oneSeaFreight">未报价</template>
<template v-if="!row.oneSeaFreight">{{ $t('未报价') }}</template>
<template v-else-if="row.charging">
{{$t('全包价')}}：{{ row.oneSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
</template>
......@@ -97,9 +97,9 @@
</el-table>
<!-- <div style="text-align: center;margin-top: 80px">
<el-button type="primary">申请重货优惠</el-button>
<el-button type="primary">申请泡货优惠</el-button>
<el-button type="primary">关闭窗口</el-button>
<el-button type="primary">{{ $t('申请重货优惠') }}</el-button>
<el-button type="primary">{{ $t('申请泡货优惠') }}</el-button>
<el-button type="primary">{{ $t('关闭窗口') }}</el-button>
</div> -->
<special-discount v-if="showOfferProdId" :offerProdId="showOfferProdId" @close="showOfferProdId=null" @success="onSuccess" />
<commossion v-if="showCommissionProd" :offer="offer" :offerProd="showCommissionProd" @close="showCommissionProd=null" @success="onSuccess" />
......
src/views/ecw/order/batchSingleApplication.vue
View file @ 0e778b8e
......@@ -45,7 +45,7 @@
<template v-slot="{row}">
{{row.channelName || '/'}}</template>
</el-table-column>
<!-- <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>-->
<!-- <el-table-column :label="$t('始发仓')" prop="startWarehouseName"></el-table-column>-->
<el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column :label="$t('始发仓')" prop="startWarehouseName">
</el-table-column>
......
src/views/ecw/order/cargoControl.vue
View file @ 0e778b8e
......@@ -35,7 +35,7 @@
<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="发货人" prop="consignorId">
<el-form-item :label="$t('发货人')" prop="consignorId">
<el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -48,7 +48,7 @@
</el-form-item>
<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="number">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
......
src/views/ecw/order/cargoControlDetail.vue
View file @ 0e778b8e
......@@ -73,34 +73,34 @@
</el-table-column>
</el-table>
<!-- <div class="page-title">历史放货记录</div>
<!-- <div class="page-title">{{ $t('历史放货记录') }}</div>
<el-table :data="[1]" border>
<el-table-column label="序号" width="50px">
<el-table-column :label="$t('序号')" width="50px">
</el-table-column>
<el-table-column label="操作">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('操作')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="申请原因">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('申请原因')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="附件">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('附件')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="申请时间">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('申请时间')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="申请人">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('申请人')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="审批时间">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('审批时间')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="审批人">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('审批人')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
<el-table-column label="备注">
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
<el-table-column :label="$t('备注')">
<el-input v-model="formData.field110" :placeholder="$t('请输入收货人邮箱')" clearable></el-input>
</el-table-column>
</el-table> -->
<fallback v-if="fallbackIndex !== null" :order="detail" :index="fallbackIndex" @close="fallbackIndex=null" @success="onFallbackSuccess" />
......@@ -189,7 +189,7 @@ export default {
this.$confirm(this.$t('确定取消此申请么？'))
.then(res => {
let approvalId = this.getApproval(id)
return cancelApproval(approvalId, {reason: '无'})
return cancelApproval(approvalId, {reason: this.$t('无')})
})
.then(res => {
this.$message.success(this.$t('操作成功'))
......
src/views/ecw/order/components/BatchPickup.vue
View file @ 0e778b8e
......@@ -22,8 +22,8 @@
</el-form-item>
<el-form-item label="">
<el-table :data="orderList">
<el-table-column label="提单号" prop="tidanNo"></el-table-column>
<el-table-column label="提货数量" prop="tidanNo">
<el-table-column :label="$t('提单号')" prop="tidanNo"></el-table-column>
<el-table-column :label="$t('提货数量')" prop="tidanNo">
<template slot-scope="{row}">
<el-input v-model.number="row.pickNum" placeholder=""></el-input>
</template>
......
src/views/ecw/order/components/CargoControlDetail.vue
View file @ 0e778b8e
......@@ -2,37 +2,37 @@
<template>
<div v-if="order">
<el-descriptions :column="3">
<el-descriptions-item label="订单号">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
<el-descriptions-item label="出货方式">
<el-descriptions-item :label="$t('出货方式')">
{{channelName}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" />
</el-descriptions-item>
<el-descriptions-item label="唛头">{{order.marks}}</el-descriptions-item>
<el-descriptions-item label="始发仓">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<!-- 放货修改 -->
<el-descriptions-item label="放货件数" v-if="applyType == 7">
<el-descriptions-item :label="$t('放货件数')" v-if="applyType == 7">
【{{detail.pickNum}}】{{$t('改')}} {{detail.currentPickNum}}
</el-descriptions-item>
<!-- 反复核 -->
<el-descriptions-item label="申请原因" v-if="applyType == 8">
<el-descriptions-item :label="$t('申请原因')" v-if="applyType == 8">
<dict-tag :type="DICT_TYPE.ECW_PICK_RECURRENT_NUCLEAR_TYPE" :value="detail.recurrentNuclearType" />
</el-descriptions-item>
<!-- 调货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 9">
<el-descriptions-item :label="$t('申请原因')" v-if="applyType == 9">
{{$l(detail, 'reason')}}
</el-descriptions-item>
<!-- 取消放货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 10">
<el-descriptions-item :label="$t('申请原因')" v-if="applyType == 10">
<dict-tag :type="DICT_TYPE.ECW_CANCEL_PICK_TYPE" :value="detail.cancelPickType" />
</el-descriptions-item>
......
src/views/ecw/order/components/CargoControlEdit.vue
View file @ 0e778b8e
......@@ -82,7 +82,7 @@ export default {
},
computed:{
title(){
let t = '放货修改'
let t = this.$t('放货修改')
return t
},
info(){
......
src/views/ecw/order/components/LandingBillDetail.vue
View file @ 0e778b8e
......@@ -20,9 +20,9 @@
{{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item>
</el-descriptions>
<el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
<el-button type="primary" @click="ShowLandingBill=true">{{ $t('查看提单') }}</el-button>
<el-dialog title="查看提单" :visible.sync="ShowLandingBill" width="1000px">
<el-dialog :title="$t('查看提单')" :visible.sync="ShowLandingBill" width="1000px">
<div style="text-align:center; width: 960px; margin: auto" v-html="billContent" />
</el-dialog>
</div>
......
src/views/ecw/order/components/Release.vue
View file @ 0e778b8e
......@@ -39,7 +39,7 @@
<el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable class="w-150" ></el-input>
</el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<!-- <el-input v-model="formData.field109" placeholder="区号" clearable class="w-150"></el-input> -->
<!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
<area-code-selector v-model="formData.consigneeCountryCode" class="w-150" />
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable class="w-150 ml-10"></el-input>
</el-form-item>
......@@ -80,7 +80,7 @@
</el-form-item>
<el-form-item :label="$t('手机验证码')" prop="code">
<el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable class="w-150 mr-10"></el-input>
<!-- <el-button type="success">获取验证码</el-button> -->
<!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
<send-sms-code :order-id="detail.orderId" scene="5" />
</el-form-item>
<el-form-item label="" style="margin-top:20px">
......@@ -94,7 +94,7 @@
<need-know ref="needKnow" keyname="control" />
<div style="margin-top:30px">
<el-button type="primary" @click="agreement=true">{{$t('我同意')}}</el-button>
<!-- <el-button type="primary" @click="$refs.needKnow.download()">保存协议</el-button> -->
<!-- <el-button type="primary" @click="$refs.needKnow.download()">{{ $t('保存协议') }}</el-button> -->
<el-button @click="closeDialog">{{$t('关闭')}}</el-button>
</div>
</div>
......@@ -136,11 +136,11 @@ export default {
rules(){
return {
consigneeName: {required: true, message: this.$t('请填写收货人')},
code: {required: true, message: '请填写验证码'},
code: {required: true, message: this.$t('请填写验证码')},
pickNum: {
type: 'number',
max: this.detail.sumNum - this.detail.releaseNum,
message: "不能超过剩余箱数",
message: this.$t("不能超过剩余箱数"),
trigger: 'change'
}
}
......
src/views/ecw/order/components/SendSmsCode.vue
View file @ 0e778b8e
......@@ -21,7 +21,7 @@ export default {
return this.$t('发送验证码')
}
if(this.leftTime > 0){
return this.leftTime + '秒'
return this.leftTime + this.$t('秒')
}
return this.$t('重新发送')
}
......
src/views/ecw/order/components/Transfer.vue
View file @ 0e778b8e
......@@ -65,7 +65,7 @@ export default {
rules:{
name: [{required: true, message: this.$t('请输入控货人')}],
phone: [{required: true, message: this.$t('请输入控货人手机')}],
// email: [{required: true, message: '请输入控货人'}],
// email: [{required: true, message: this.$t('请输入控货人')}],
code: [{required: true, message: this.$t('验证码不能为空')}]
}
}
......
src/views/ecw/order/components/ordeDetailsForm.vue
View file @ 0e778b8e
<template>
<div>
<el-descriptions class="margin-top" border :column="4">
<el-descriptions-item label="唛头">{{details.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{details.marks}}</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">{{details.sumNum || 0}}/{{details.costVO ? details.costVO.totalNum : 0}}</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" />
</el-descriptions-item>
<el-descriptions-item label="送货日期">{{details.deliveryDate}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('送货日期')">{{details.deliveryDate}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="出货渠道">
<el-descriptions-item :label="$t('出货渠道')">
{{details.channelName || '/'}}
</el-descriptions-item>
<el-descriptions-item label="始发地">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>
<el-descriptions-item label="目的地">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人姓名">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人公司">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item>
<el-descriptions-item label="发货人电话">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发地')">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的地')">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('发货人姓名')">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('发货人公司')">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('发货人电话')">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="收货人姓名">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item>
<el-descriptions-item label="收货人公司">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item>
<el-descriptions-item label="收货人电话"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
<el-descriptions-item :label="$t('收货人姓名')">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item>
<el-descriptions-item :label="$t('收货人公司')">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item>
<el-descriptions-item :label="$t('收货人电话')"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</el-descriptions>
</div>
......
src/views/ecw/order/components/specialNeeds.vue
View file @ 0e778b8e
......@@ -5,12 +5,12 @@
<div class="content">
<h1>{{orderNo}} 特需</h1>
<el-form label-width="180px" label-position="left">
<el-form-item label="特殊要求">
<el-form-item :label="$t('特殊要求')">
<el-checkbox-group v-model="advanceType" >
<el-checkbox @click="change(item)" v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)" :label="item.value" >{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="特殊要求备注"><el-input type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
<el-form-item :label="$t('特殊要求备注')"><el-input type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
<el-form-item v-for="(item,index) in this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'">
<el-input style="width: 300px;" v-model="specialNeedsList[index].transFee">
<div style="width: 100px;" slot="append" >
......@@ -20,15 +20,15 @@
</div>
</el-input>
<div style="display: inline-block;margin-left: 20px;">
<span style="margin-right: 10px;">付款类型</span>
<dict-selector placeholder="请选择付款类型" v-model="specialNeedsList[index].payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>
<span style="margin-right: 10px;">{{ $t('付款类型') }}</span>
<dict-selector :placeholder="$t('请选择付款类型')" v-model="specialNeedsList[index].payType" :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>
</div>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">提交</el-button>
<el-button @click="$emit('update:show',false)">取消</el-button>
<el-button type="primary" @click="submit">{{ $t('提交') }}</el-button>
<el-button @click="$emit('update:show',false)">{{ $t('取消') }}</el-button>
</div>
</el-dialog>
</div>
......
src/views/ecw/order/components/warehouseDetails.vue
View file @ 0e778b8e
<template>
<div>
<h1>
申请信息【订单信息】
</h1>
<h1>{{ $t('申请信息【订单信息】') }}</h1>
<el-table :data="list" v-if="type === 1">
<el-table-column
prop="orderNo"
label="订单编号">
:label="$t('订单编号')">
</el-table-column>
<el-table-column
prop="marks"
label="唛头">
:label="$t('唛头')">
</el-table-column>
<el-table-column
label="已到箱数/总箱数">
......@@ -19,7 +17,7 @@
</template>
</el-table-column>
<el-table-column
label="下单统计">
:label="$t('下单统计')">
<template v-slot="{row}">
<div v-if="row.costVO">
箱数：{{row.costVO.totalNum}}
......@@ -29,7 +27,7 @@
</template>
</el-table-column>
<el-table-column
label="入仓统计">
:label="$t('入仓统计')">
<template v-slot="{row}">
<div>总箱数：{{row.totalNum}}</div>
<div>体积：{{row.sumVolume}}CBM </div>
......@@ -37,24 +35,24 @@
</template>
</el-table-column>
<el-table-column
label="入仓时间">
:label="$t('入仓时间')">
<template v-slot="{row}">
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column
label="运输方式">
:label="$t('运输方式')">
<template v-slot = {row}>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
</template>
</el-table-column>
<el-table-column
label="出货渠道">
:label="$t('出货渠道')">
<template v-slot="{row}">{{row.channelName || '/'}}</template>
</el-table-column>
<el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>
<el-table-column label="目的地" prop="objectiveName"></el-table-column>
<el-table-column label="发货人">
<el-table-column :label="$t('始发仓')" prop="startWarehouseName"></el-table-column>
<el-table-column :label="$t('目的地')" prop="objectiveName"></el-table-column>
<el-table-column :label="$t('发货人')">
<template v-slot="{row}">
<p>
{{row.consignorName}}
......@@ -64,7 +62,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="收货人">
<el-table-column :label="$t('收货人')">
<template v-slot="{row}">
<p>
{{row.consigneeName}}
......@@ -76,50 +74,48 @@
</el-table-column>
</el-table>
<el-descriptions v-else-if="type === 2" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderBackVO.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('订单号')">{{FeeDetails.orderBackVO.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.orderBackVO.transportId"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="出货方式">
<el-descriptions-item :label="$t('出货方式')">
{{selectChannel(FeeDetails.channelId)}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.orderBackVO.abnormalState"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="唛头">
<el-descriptions-item :label="$t('唛头')">
{{FeeDetails.orderBackVO.marks}}
</el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.startWarehouse}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.destWarehouse}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">{{FeeDetails.startWarehouse}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{FeeDetails.destWarehouse}}</el-descriptions-item>
</el-descriptions>
<el-descriptions v-else-if="type === 3 || type === 4" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('订单号')">{{FeeDetails.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.transportId"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="出货方式">
<el-descriptions-item :label="$t('出货方式')">
{{selectChannel(FeeDetails.channelId)}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.abnormalState"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="唛头">
<el-descriptions-item :label="$t('唛头')">
{{FeeDetails.marks}}
</el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">{{FeeDetails.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{FeeDetails.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
</el-descriptions>
<div v-if="type === 1">
<p>
申请说明
</p>
<p>{{ $t('申请说明') }}</p>
<div >
从 【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseOutId ? FeeDetails.details.warehouseOutId : '' )}}】 调到
【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseInId ? FeeDetails.details.warehouseInId : '' )}}】
</div>
</div>
<div v-if="type === 2">
<p>申请理由</p>
<p>{{ $t('申请理由') }}</p>
<div>
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="FeeDetails.feeType" />，
{{FeeDetails.applicationFee}}
......@@ -130,19 +126,19 @@
</div>
</div>
<div v-if="type === 3">
<p>申请理由</p>
<p>{{ $t('申请理由') }}</p>
<div>
{{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
</div>
</div>
<div v-if="type === 4">
<p>申请理由</p>
<p>{{ $t('申请理由') }}</p>
<div>
用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ prodName }}】信息：
<ol>
<template v-for="item in FeeDetails.details.applyInfoVOList">
<li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
<li v-else-if="item.newValue === undefined">删除入仓</li>
<li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }}</li>
<li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
</template>
</ol>
......
src/views/ecw/order/components/warehouseLocation.vue
View file @ 0e778b8e
<template>
<div>
<el-dialog
title="选择储位"
:title="$t('选择储位')"
:visible.sync="opened"
width="600px"
:before-close="handleClose()"
......@@ -10,7 +10,7 @@
<el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}">
<el-tab-pane v-if="item.warehouseId === warehouseId" :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index">
<div>
<div style="text-align: center">区域</div>
<div style="text-align: center">{{ $t('区域') }}</div>
<div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
<el-row :gutter="20">
<el-col :span="12" v-for="warehouse in item.children" :key="warehouse.id">
......@@ -26,7 +26,7 @@
</div>
</div>
<div>
<div style="text-align: center">仓位</div>
<div style="text-align: center">{{ $t('仓位') }}</div>
<div class="position-group">
<div class="position" v-for="position in activeWarehouse.positionList" :key="position.id" @click="handleSelectPosition(position)">
<template v-if="position.children">
......@@ -56,8 +56,8 @@
</el-tab-pane>
</el-tabs>
<span slot="footer">
<el-button @click="opened = false">关 闭</el-button>
<el-button type="primary" @click="handleSubmit()">提 交</el-button>
<el-button @click="opened = false">{{ $t('关 闭') }}</el-button>
<el-button type="primary" @click="handleSubmit()">{{ $t('提 交') }}</el-button>
</span>
</el-dialog>
</div>
......
src/views/ecw/order/detail.vue
View file @ 0e778b8e
......@@ -44,7 +44,7 @@
<el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}">
<el-descriptions-item :label="$t('付款人')">
<el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">自定义</el-link>
<el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">{{ $t('自定义') }}</el-link>
<dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
</el-descriptions-item>
</el-descriptions>
......@@ -169,10 +169,10 @@
<template slot-scope="{row}">
<template v-if="row.charging ==1">
<template v-if="!row.seaFreight">未报价</template>
<template v-if="!row.seaFreight">{{ $t('未报价') }}</template>
<el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
</template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">{{ $t('未报价') }}</template>
<template v-else>
<el-link type="primary" @click="showFeeDetail(row, 'freight')">
{{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
......@@ -419,7 +419,7 @@ export default {
const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
// 不是特价则显示其他字段
freightFields = [
// {field: 'oneSeaFreight', label: '成交单价'},
// {field: 'oneSeaFreight', label: this.$t('成交单价')},
{field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
// {field: 'brandFreightPrice', label: this.$t('品牌加价')},
{field: 'liquidFreightPrice', label: this.$t('液体加价')},
......@@ -481,11 +481,11 @@ export default {
freight.push({
label: '价格更新时间',
label: this.$t('价格更新时间'),
value: parseTime(row.updateTime)
})
clearance.push({
label: '价格更新时间',
label: this.$t('价格更新时间'),
value: parseTime(row.updateTime)
})
this.feeDetail = {freight, clearance, charging: row.charging}
......
src/views/ecw/order/edit.vue
View file @ 0e778b8e
......@@ -372,8 +372,8 @@
<el-form-item :label="$t('付款人')" prop="drawee">
<dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" :disabled="false"/>
<el-table :data="customDraweeList" v-if="form.drawee==3" >
<el-table-column label="费用类型" prop="label" width="200px"></el-table-column>
<el-table-column label="付款人" width="300px">
<el-table-column :label="$t('费用类型')" prop="label" width="200px"></el-table-column>
<el-table-column :label="$t('付款人')" width="300px">
<template slot-scope="{row}">
<dict-selector :type="DICT_TYPE.DRAWEE" :filter="(e) => e.value == '1' || e.value == '2'" v-model="row.value" form-type="radio" :disabled="false"/>
</template>
......@@ -411,12 +411,12 @@
<el-form-item :label="$t('清关证书')">
<dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
</el-form-item>
<el-form-item label="清关证书备注" >
<el-form-item :label="$t('清关证书备注')" >
<el-input v-model="form.remarks" :disabled="false"></el-input>
</el-form-item>
</div>
<div v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item label="是否拆包">
<el-form-item :label="$t('是否拆包')">
<dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
</el-form-item>
</div>
......@@ -480,8 +480,8 @@
<el-table-column :label="$t('件数')" prop="num"></el-table-column>
<el-table-column :label="$t('重量') + '(kg)'" prop="weight"></el-table-column>
<el-table-column :label="$t('体积') + '(m³)'" prop="volume"></el-table-column>
<!-- <el-table-column label="有无单证" prop="">// TODO</el-table-column> -->
<!-- <el-table-column label="缺货箱数" prop="lessNum"></el-table-column> -->
<!-- <el-table-column :label="$t('有无单证')" prop="">// TODO</el-table-column> -->
<!-- <el-table-column :label="$t('缺货箱数')" prop="lessNum"></el-table-column> -->
<el-table-column :label="$t('数量')" prop="quantity"></el-table-column>
<el-table-column :label="$t('材质')" prop="material"></el-table-column>
</el-table>
......
src/views/ecw/order/exception/index.vue
View file @ 0e778b8e
......@@ -78,7 +78,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<!-- <el-button icon="el-icon-refresh" @click="reset">重置</el-button> -->
<!-- <el-button icon="el-icon-refresh" @click="reset">{{ $t('重置') }}</el-button> -->
</el-form-item>
</el-row>
</el-form>
......
src/views/ecw/order/index.vue
View file @ 0e778b8e
......@@ -6,8 +6,8 @@
<el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="唛头" prop="marks">
<el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" />
<!-- <el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item :label="$t('发货人')" prop="consignorKey">
......@@ -42,14 +42,14 @@
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="商品分类" prop="goodsType">
<!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
<selector v-model="queryParams.goodsType" :options="productAttrList" label-field="attrName" value-field="id">
</selector>
</el-form-item>
<el-form-item label="品名" prop="prodId">
<el-form-item :label="$t('品名')" prop="prodId">
<product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-form-item :label="$t('品牌')" prop="brand">
<dict-selector v-model="queryParams.brand" :type="DICT_TYPE.ECW_IS_BRAND" formatter="bool" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> -->
......@@ -78,7 +78,7 @@
<!--// 字段存疑-->
<dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="重货比" prop="weightRatio">
<!-- <el-form-item :label="$t('重货比')" prop="weightRatio">
<el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange"
@keyup.enter.native="handleQuery" />
-
......@@ -558,15 +558,15 @@ export default {
let actions = {
cancelOrder: {
callable: cancelOrder,
confirm: '确定要取消此订单么？'
confirm: this.$t('确定要取消此订单么？')
},
recoveryOrder: {
callable: recoveryOrder,
confirm: '确定要恢复此订单么？'
confirm: this.$t('确定要恢复此订单么？')
},
deleteOrder: {
callable: deleteOrder,
confirm: '确定要删除此订单么？'
confirm: this.$t('确定要删除此订单么？')
}
}
let action = actions[type]
......
src/views/ecw/order/prepayDeal.vue
View file @ 0e778b8e
......@@ -25,7 +25,7 @@
</div>
<el-row>
<el-form-item :label="$t('运输路线')+':'" >
<span v-if="orderData">【<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />】</span>
<span v-if="orderData">{{ $t('【') }}<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />{{ $t('】') }}</span>
{{orderData?getRouterNameById():''}}
</el-form-item>
</el-row>
......@@ -88,7 +88,7 @@
<!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-form-item>
<el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">新增收款单</el-button>
<el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">{{ $t('新增收款单') }}</el-button>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionDetails">
<el-form-item :label="$t('详细内容')+':'">
......@@ -255,7 +255,7 @@
<!--预付异常的备选需要根据接口数据过滤-->
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) ==-1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template>
......@@ -264,7 +264,7 @@
</el-row>
<el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
<el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template>
......@@ -311,7 +311,7 @@
</el-row>
<el-row>
<el-form-item :label="$t('处理结果')+':'" required v-if="handlerParams.orderExceptionStatus==2">
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_don_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -504,7 +504,7 @@
// 根据线路id显示线路名称
getRouterNameById(){
if(this.orderData.logisticsInfoDto) {
return this.$t('从')+'【'+this.orderData.logisticsInfoDto.startTitleZh + '】'+this.$t('发往')+'【' + this.orderData.logisticsInfoDto.destTitleZh+'】'
return this.$t('从')+this.$t('【')+this.orderData.logisticsInfoDto.startTitleZh + this.$t('】')+this.$t('发往')+this.$t('【') + this.orderData.logisticsInfoDto.destTitleZh+this.$t('】')
}
return this.$t('无')
},
......@@ -539,7 +539,7 @@
cancelAudit(){
this.$prompt("请输入取消原因", {
inputPattern: /[\S]+/,
inputErrorMessage: '不能为空'
inputErrorMessage: this.$t('不能为空')
}).then(({value}) => {
return cancelProcessInstance(this.orderExceptionData.bpmId, value)
})
......
src/views/ecw/order/singleApply.vue
View file @ 0e778b8e
......@@ -79,7 +79,7 @@
</el-table-column>
<el-table-column :label="入仓货物属性" align="center">
<template slot-scope="scope">
<span>合计：</span>
<span>{{ $t('合计：') }}</span>
<span>{{scope.row.mergedOrder.sumNum+'箱 '+scope.row.mergedOrder.sumVolume+'m³ '+scope.row.mergedOrder.sumWeight+'kg'}}</span>
</template>
</el-table-column>
......@@ -137,7 +137,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" />
<!-- <el-row v-if="singleData.length>0">
<el-checkbox v-model="checked">需要仓库打包</el-checkbox>
<el-checkbox v-model="checked">{{ $t('需要仓库打包') }}</el-checkbox>
</el-row> -->
</el-card>
<work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
......
src/views/ecw/order/special/Commission.vue
View file @ 0e778b8e
......@@ -10,8 +10,7 @@
<el-form-item :label="$t('英文名称')">
<span>{{ orderItem.prodTitleEn }}</span>
</el-form-item>
<el-form-item :label="$t('线路')">
【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
<el-form-item :label="$t('线路')">{{ $t('【') }}<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
{{ channel ? $l(channel, 'title') : '' }}
{{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}}
</el-form-item>
......@@ -43,13 +42,13 @@
</el-form-item>
<!-- 明佣或者明佣+暗佣才显示 -->
<el-form-item label="明佣佣金" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-form-item :label="$t('明佣佣金')" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-input v-model="form.lightCommissionAmount" type="number" placeholder="" class="w-100"></el-input>
{{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item>
<!-- 明佣+暗佣才显示 -->
<el-form-item label="暗佣佣金" v-if="form.commissionType == 3" prop="shadeCommissionAmount" :rules="{validator: shadeCommissionValidator, message: '暗佣设置错误', trigger: 'blur'}">
<el-form-item :label="$t('暗佣佣金')" v-if="form.commissionType == 3" prop="shadeCommissionAmount" :rules="{validator: shadeCommissionValidator, message: '暗佣设置错误', trigger: 'blur'}">
<el-input v-model="form.shadeCommissionAmount" placeholder="" type="number" class="w-100"></el-input>
{{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item>
......@@ -88,17 +87,17 @@
</div>
</el-form>
<div class="page-title">审批流程</div>
<div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="commission_config" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button>
<el-button type="default" @click="closeDialog">返回</el-button>
<el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div>
</el-dialog>
</template>
......@@ -141,8 +140,8 @@ export default {
type: 3
},
rules:{
seaFreight : {required: true, message: '运费不能为空'},
clearanceFreight: {required: true, message: '清关费不能为空'}
seaFreight : {required: true, message: this.$t('运费不能为空')},
clearanceFreight: {required: true, message: this.$t('清关费不能为空')}
},
productType: null,
channel: null,
......@@ -168,7 +167,7 @@ export default {
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : ''
return s ? this.$t('【') + s + this.$t('】') : ''
}
},
currencyMap(){
......
src/views/ecw/order/special/Discount.vue
View file @ 0e778b8e
......@@ -10,8 +10,7 @@
<el-form-item :label="$t('英文名称')">
<span>{{ orderItem.prodTitleEn }}</span>
</el-form-item>
<el-form-item :label="$t('线路')">
【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
<el-form-item :label="$t('线路')">{{ $t('【') }}<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />】
{{ channel ? $l(channel, 'title') : '' }}
{{$t("从【{departureName}】发往【{objectiveName}】", {departureName: $l(order.logisticsInfoDto, 'startTitle'), objectiveName: $l(order.logisticsInfoDto, 'destTitle')})}}
</el-form-item>
......@@ -55,17 +54,17 @@
</el-form-item>
</el-form>
<div class="page-title">审批流程</div>
<div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="!submitable">{{ $t('提交') }}</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button>
<el-button type="default" @click="closeDialog">返回</el-button>
<el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div>
</el-dialog>
</template>
......@@ -118,8 +117,8 @@ export default {
ccIdArr: [],
form: { },
rules:{
freight : {required: true, message: '运费不能为空'},
clearanceFreight: {required: true, message: '清关费不能为空'}
freight : {required: true, message: this.$t('运费不能为空')},
clearanceFreight: {required: true, message: this.$t('清关费不能为空')}
},
productType: null,
channel: null
......@@ -186,7 +185,7 @@ export default {
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : ''
return s ? this.$t('【') + s + this.$t('】') : ''
}
},
currentMap(){
......
src/views/ecw/order/special/Preferential.vue
View file @ 0e778b8e
......@@ -20,18 +20,18 @@
</el-form-item>
</template>
</el-form>
<div class="page-title">审批流程</div>
<div class="page-title">{{ $t('审批流程') }}</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" />
<div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button>
<el-button type="primary" @click="handleSubmit">{{ $t('提交') }}</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
<el-button type="primary" @click="cancelAudit">取消审核</el-button>
<el-button type="default" @click="closeDialog">返回</el-button>
<el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
<el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
</div>
</el-dialog>
</template>
......
src/views/ecw/order/special/index.vue
View file @ 0e778b8e
......@@ -60,7 +60,7 @@
</template>
</el-table-column>
<el-table-column
label="成本价">
:label="$t('成本价')">
<template v-slot="{row}">
<template v-if="!row.costSeaFreight">{{$t('未报价')}}</template>
<template v-else-if="row.charging">
......
src/views/ecw/order/success.vue
View file @ 0e778b8e
......@@ -12,7 +12,7 @@
<div class="line">{{$t('商品列表')}}：
<span v-for="(item, index) in order.orderItemVOList" :key="index">
{{item.prodTitleZh}}
<template v-if="index < order.orderItemVOList.length - 1">、</template>
<template v-if="index < order.orderItemVOList.length - 1">{{ $t('、') }}</template>
</span>
</div>
<div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div>
......
src/views/ecw/order/transferWarehousing.vue
View file @ 0e778b8e
......@@ -343,7 +343,7 @@ export default {
})
let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
return ['合计：',text,text2]
return [this.$t('合计：'),text,text2]
},
cancellationOfOrder(){
this.$prompt(this.$t('请输入取消调仓原因'), this.$t('提示'), {
......
src/views/ecw/orderCode/index.vue
View file @ 0e778b8e
......@@ -3,16 +3,16 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题')" prop="title">
<el-input v-model="queryParams.title" :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>
......@@ -20,32 +20,32 @@
<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:order-code:create']">新增</el-button>
v-hasPermi="['ecw:order-code: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:order-code:export']">导出</el-button>
v-hasPermi="['ecw:order-code: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="title" />
<el-table-column label="起始编号" align="center" prop="startCode" />
<el-table-column label="结束编号" align="center" prop="endCode" />
<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="title" />
<el-table-column :label="$t('起始编号')" align="center" prop="startCode" />
<el-table-column :label="$t('结束编号')" align="center" prop="endCode" />
<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:order-code:update']">修改</el-button>
v-hasPermi="['ecw:order-code:update']">{{ $t('修改') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:order-code:delete']">删除</el-button>
v-hasPermi="['ecw:order-code:delete']">{{ $t('删除') }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -56,19 +56,19 @@
<!-- 对话框(添加 / 修改) -->
<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="title">
<el-input v-model="form.title" placeholder="请输入标题" />
<el-form-item :label="$t('标题')" prop="title">
<el-input v-model="form.title" :placeholder="$t('请输入标题')" />
</el-form-item>
<el-form-item label="起始编号" prop="startCode">
<el-input v-model="form.startCode" placeholder="请输入起始编号" />
<el-form-item :label="$t('起始编号')" prop="startCode">
<el-input v-model="form.startCode" :placeholder="$t('请输入起始编号')" />
</el-form-item>
<el-form-item label="结束编号" prop="endCode">
<el-input v-model="form.endCode" placeholder="请输入结束编号" />
<el-form-item :label="$t('结束编号')" prop="endCode">
<el-input v-model="form.endCode" :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>
......@@ -108,8 +108,8 @@ export default {
form: {},
// 表单校验
rules: {
title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
startCode: [{ required: true, message: "起始编号不能为空", trigger: "blur" }],
title: [{ required: true, message: this.$t("标题不能为空"), trigger: "blur" }],
startCode: [{ required: true, message: this.$t("起始编号不能为空"), trigger: "blur" }],
}
};
},
......@@ -160,7 +160,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加单号配置";
this.title = this.$t("添加单号配置");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -169,7 +169,7 @@ export default {
getOrderCode(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改单号配置";
this.title = this.$t("修改单号配置");
});
},
/** 提交按钮 */
......
src/views/ecw/product/index.vue
View file @ 0e778b8e
......@@ -82,9 +82,7 @@
<!--商品特性-->
<el-table-column :label="$t('商品图片')" align="center" prop="attrId">
<template slot-scope="scope">
<el-image :src="firstImg(scope.row.imgs)" style="width:50px; height:50px">
无
</el-image>
<el-image :src="firstImg(scope.row.imgs)" style="width:50px; height:50px">{{ $t('无') }}</el-image>
</template>
</el-table-column>
......@@ -139,9 +137,7 @@
</el-col> -->
<!-- <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
<el-button size="small">
上传图片
<i class="el-icon-upload el-icon--right"></i>
<el-button size="small">{{ $t('上传图片') }}<i class="el-icon-upload el-icon--right"></i>
</el-button>
</el-upload> -->
......@@ -277,10 +273,10 @@ export default {
titleZh: [{ required: true, message: this.$t("中文标题不能为空"), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t("英文标题不能为空"), trigger: "blur" }],
// materialType: [{ required: true, message: this.$t("商品材质不能为空"), trigger: "blur" }],
// packaging: [{ required: true, message: "包装要求不能为空", trigger: "blur" }],
// containerLocation: [{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
// square: [{ required: true, message: "订单方数上线不能为空", trigger: "blur" }],
// needBook: [{ required: true, message: "是否预约入仓不能为空", trigger: "blur" }],
// packaging: [{ required: true, message: this.$t("包装要求不能为空"), trigger: "blur" }],
// containerLocation: [{ required: true, message: this.$t("默认货柜位置不能为空"), trigger: "blur" }],
// square: [{ required: true, message: this.$t("订单方数上线不能为空"), trigger: "blur" }],
// needBook: [{ required: true, message: this.$t("是否预约入仓不能为空"), trigger: "blur" }],
},
CommonStatusEnum: CommonStatusEnum,
......
src/views/ecw/productBrandEmpower/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productBrank/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productPrice/batchEdit.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productPrice/blacklist.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productPrice/edit.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productPrice/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/productType/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/region/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/shelf/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/shelfGrid/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/supplier/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/unit/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/warehouse/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/ecw/zhongPao/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/error/401.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/error/404.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/apiAccessLog/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/apiErrorLog/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/CodeTypeDialog.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/FormDrawer.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/IconsDialog.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/JsonDrawer.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/ResourceDialog.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/RightPanel.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/TreeNodeDialog.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/build/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/codegen/basicInfoForm.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/codegen/editTable.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/codegen/genInfoForm.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/codegen/importTable.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/codegen/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/config/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/file/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/fileConfig/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/job/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/job/log.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/redis/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/infra/testDemo/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/login.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/member/user/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/pay/app/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/pay/merchant/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/pay/order/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/pay/refund/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/socialLogin.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/dept/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/dict/data.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/dict/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/errorCode/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/internalHelpDoc/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/internalMessage/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/loginlog/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/mailAccount/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/mailLog/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/mailTemplate/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/menu/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/operatelog/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/post/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/role/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/session/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/sms/smsChannel.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/sms/smsLog.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/sms/smsTemplate.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/tenant/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/tenantPackage/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/user/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/user/profile/index.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/user/profile/resetPwd.vue
View file @ 0e778b8e
This diff is collapsed.
src/views/system/user/profile/userInfo.vue
View file @ 0e778b8e
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