Skip to content

J
jiedao-app-operator-master
Commit 1a9aea20 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 7668b8fb 59dbbb83
Hide whitespace changes
Inline Side-by-side
Showing with 11141 additions and 11038 deletions
src/i18n/languages/en_US.json
View file @ 1a9aea20
......@@ -8,7 +8,7 @@
"重置": "Reset",
"新建订单": "New Order",
"订舱": "Book space",
"已核销比例\\n（已核销基准币种总金额/应收总金额）": "Written-off ratio\\n (total amount of base currency written off/total receivable amount)",
"已核销比例\n（已核销基准币种总金额/应收总金额）": "Written-off ratio \n (total amount of base currency written off/total receivable amount)",
"您确认要反核销吗": "Are you sure you want to cancel the write-off",
"捷道货运收款单": "Shortway Freight Collection Note",
"是否确认删除该应付款": "Are you sure to delete the account payable",
......@@ -2172,5 +2172,134 @@
"待审核会员": "Member to be reviewed",
"是否确认删除昵称为{nickname}的会员?": "Are you sure to delete the member whose nickname is {nickname}?",
"取消删除": "Cancel Delete",
"重货标准(CBM)": "Heavy cargo standard (CBM)"
}
"重货标准(CBM)": "Heavy cargo standard (CBM)",
"WEB端图片": "",
"APP端图片": "",
"WEB端广告图片（建议尺寸": "",
"请上传WEB端广告图片": "",
"APP端广告图片（建议尺寸": "",
"请上传APP端广告图片": "",
"web端广告图片不能为空": "",
"app端广告图片不能为空": "",
"禁用": "",
"添加广告设置": "",
"修改广告设置": "",
"是否确认删除广告设置编号为": "",
"是否确认导出所有广告设置数据项?": "",
"有效期开始时间": "",
"请输入有效期开始时间": "",
"有效期结束时间": "",
"请输入有效期结束时间": "",
"弹窗标题": "",
"弹窗时间": "",
"网页中文": "",
"网页英文": "",
"开始时间不能大于结束时间": "",
"结束时间不能小于开始时间": "",
"添加广告弹窗": "",
"修改广告弹窗": "",
"是否确认删除广告弹窗编号为": "",
"是否确认导出所有广告弹窗数据项?": "",
"已核销比例\\n（已核销基准币种总金额/应收总金额）": "",
"是否要删除昵称为": "",
"的会员": "",
"请输入标题中文": "",
"请输入标题英文": "",
"内容中文": "",
"内容英语": "",
"添加帮助文档": "",
"修改帮助文档": "",
"是否确认删除帮助文档编号为": "",
"是否确认导出所有帮助文档数据项?": "",
"请输入内容中文": "",
"请输入内容英语": "",
"添加对内帮助文档": "",
"修改对内帮助文档": "",
"是否确认删除对内帮助文档编号为": "",
"是否确认导出所有对内帮助文档数据项?": "",
"须知类型": "",
"请选择须知类型": "",
"添加须知": "",
"修改须知": "",
"是否确认删除须知编号为": "",
"是否确认导出所有须知数据项?": "",
"公告标题": "",
"请输入公告标题": "",
"操作人员": "",
"请输入操作人员": "",
"公告类型": "",
"有效日期": "",
"创建者": "",
"内容英文": "",
"公告标题不能为空": "",
"公告类型不能为空": "",
"添加公告": "",
"修改公告": "",
"是否确认删除公告编号为": "",
"中文名称": "",
"港口类型": "",
"省": "",
"城市": "",
"码头编号": "",
"码头类型": "",
"请输入中文名称": "",
"请输入码头编号": "",
"请输入码头类型": "",
"中文名称不能为空": "",
"添加码头信息": "",
"修改码头信息": "",
"是否确认删除码头信息编号为": "",
"是否确认导出所有码头信息数据项?": "",
"快递公司名称": "",
"请输入快递公司名称": "",
"请输入账户名称": "",
"查件key": "",
"请输入查件key": "",
"查询url": "",
"请输入查询url": "",
"快递公司名称不能为空": "",
"添加配送管理": "",
"修改配送管理": "",
"是否确认删除配送管理编号为": "",
"是否确认导出所有配送管理数据项?": "",
"应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种": "应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种",
"实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率": "实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率",
"Incompatible receiver, ": "",
"最高分值": "",
"请输入最高分值": "",
"最低分值": "",
"请输入最低分值": "",
"最大分值不能为空": "",
"最小分值不能为空": "",
"添加信用等级": "",
"修改信用等级": "",
"是否确认删除信用等级编号为": "",
"是否确认导出所有信用等级数据项?": "",
"请输入规则名称": "",
"请选择规则分类": "",
"请输入规则得分": "",
"规则名称不能为空": "",
"规则分类不能为空": "",
"规则得分不能为空": "",
"添加信用规则": "",
"修改信用规则": "",
"是否确认删除信用规则编号为": "",
"是否确认导出所有信用规则数据项?": "",
"添加客户等级": "",
"修改客户等级": "",
"是否确认删除客户等级编号为": "",
"是否确认导出所有客户等级数据项?": "",
"添加客户等级规则": "",
"修改客户等级规则": "",
"是否确认删除客户等级规则编号为": "",
"是否确认导出所有客户等级规则数据项?": "",
"应核销总金额": "",
"导出账单给客户时显示的收款金额与币种": "",
"实收已核销总金额": "",
"所有银行收款明细中状态为已核销的实收金额，币种根据实收币种分类统计": "",
"核销基准币种已核销总金额": "",
"为了方便统计收款单核销比例，将所有银行收款明细中状态为已核销的实收金额，转换为核销基准币种的金额累加": "",
"总核销比例": "",
"总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额": "",
"身份证审核状态": ""
}
\ No newline at end of file
src/i18n/languages/zh_CN.json
View file @ 1a9aea20
......@@ -196,7 +196,7 @@
"请输入项目": "请输入项目",
"请选择": "请选择",
"请选择业务员": "请选择业务员",
"请选择业务员": "请选择供应商",
"请选择供应商": "请选择供应商",
"请选择出货渠道": "请选择出货渠道",
"请选择单位": "请选择单位",
"请选择始发仓": "请选择始发仓",
......@@ -256,8 +256,6 @@
"审核备注":"审核备注",
"审核请款单":"审核请款单",
"费用类型":"费用类型",
"未开票":"未开票",
"已开票":"已开票",
"反审核成功":"反审核成功",
"待审核":"待审核",
"已审核待核销":"已审核待核销",
......
src/views/customer/credit/index.vue
View file @ 1a9aea20
......@@ -3,15 +3,15 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" :placeholder="$t('请输入最高分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" placeholder="请输入最低分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" :placeholder="$t('请输入最低分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -19,34 +19,34 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:credit:create']">新增</el-button>
v-hasPermi="['customer:credit:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:credit:export']">导出</el-button>
v-hasPermi="['customer:credit:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="中文名称" align="center" prop="nameZh" />
<el-table-column label="英文名称" align="center" prop="nameEn" />
<el-table-column label="最低分值" align="center" prop="scoreMin" />
<el-table-column label="最高分值" align="center" prop="scoreMax" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('中文名称')" align="center" prop="nameZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="nameEn" />
<el-table-column :label="$t('最低分值')" align="center" prop="scoreMin" />
<el-table-column :label="$t('最高分值')" align="center" prop="scoreMax" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:credit:update']">修改</el-button>
v-hasPermi="['customer:credit:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:credit:delete']">删除</el-button>
v-hasPermi="['customer:credit:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -57,25 +57,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="中文名称" prop="nameZh">
<el-input v-model="form.nameZh" placeholder="请输入中文名称" />
<el-form-item :label="$t('中文名称')" prop="nameZh">
<el-input v-model="form.nameZh" :placeholder="$t('请输入中文名称')" />
</el-form-item>
<el-form-item label="英文名称" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
<el-form-item :label="$t('英文名称')" prop="nameEn">
<el-input v-model="form.nameEn" :placeholder="$t('请输入英文名称')" />
</el-form-item>
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="form.scoreMax" placeholder="请输入最高分值" />
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="form.scoreMax" :placeholder="$t('请输入最高分值')" />
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="form.scoreMin" placeholder="请输入最低分值" />
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="form.scoreMin" :placeholder="$t('请输入最低分值')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -115,10 +115,10 @@ export default {
form: {},
// 表单校验
rules: {
nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }],
scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }],
nameZh: [{ required: true, message: this.$t('中文名称不能为空'), trigger: "blur" }],
nameEn: [{ required: true, message: this.$t('英文名称不能为空'), trigger: "blur" }],
scoreMax: [{ required: true, message: this.$t('最大分值不能为空'), trigger: "blur" }],
scoreMin: [{ required: true, message: this.$t('最小分值不能为空'), trigger: "blur" }],
}
};
},
......@@ -169,7 +169,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加信用等级";
this.title = this.$t('添加信用等级');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -178,7 +178,7 @@ export default {
getCredit(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改信用等级";
this.title = this.$t('修改信用等级');
});
},
/** 提交按钮 */
......@@ -190,7 +190,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateCredit(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -198,7 +198,7 @@ export default {
}
// 添加的提交
createCredit(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -207,11 +207,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除信用等级编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除信用等级编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCredit(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -221,7 +221,7 @@ export default {
params.pageNo = undefined;
params.pageSize = undefined;
// 执行导出
this.$modal.confirm('是否确认导出所有信用等级数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有信用等级数据项?')).then(() => {
this.exportLoading = true;
return exportCreditExcel(params);
}).then(response => {
......
src/views/customer/creditRule/index.vue
View file @ 1a9aea20
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择规则分类')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:credit-rule:create']">新增</el-button>
v-hasPermi="['customer:credit-rule:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:credit-rule:export']">导出</el-button>
v-hasPermi="['customer:credit-rule:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="规则得分" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:credit-rule:update']">修改</el-button>
v-hasPermi="['customer:credit-rule:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:credit-rule:delete']">删除</el-button>
v-hasPermi="['customer:credit-rule:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" />
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="规则得分" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" />
<el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -129,9 +129,9 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
}
};
},
......@@ -183,7 +183,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加信用规则";
this.title = this.$t('添加信用规则');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -192,7 +192,7 @@ export default {
getCreditRule(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改信用规则";
this.title = this.$t('修改信用规则');
});
},
/** 提交按钮 */
......@@ -204,7 +204,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateCreditRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -212,7 +212,7 @@ export default {
}
// 添加的提交
createCreditRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除信用规则编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除信用规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCreditRule(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有信用规则数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有信用规则数据项?')).then(() => {
this.exportLoading = true;
return exportCreditRuleExcel(params);
}).then(response => {
......
src/views/customer/level/index.vue
View file @ 1a9aea20
......@@ -3,19 +3,19 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" :placeholder="$t('请输入最高分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" placeholder="请输入最低分值" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" :placeholder="$t('请输入最低分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -23,34 +23,34 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:level:create']">新增</el-button>
v-hasPermi="['customer:level:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:level:export']">导出</el-button>
v-hasPermi="['customer:level:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="中文名称" align="center" prop="nameZh" />
<el-table-column label="英文名称" align="center" prop="nameEn" />
<el-table-column label="最低分值" align="center" prop="scoreMin" />
<el-table-column label="最高分值" align="center" prop="scoreMax" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('中文名称')" align="center" prop="nameZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="nameEn" />
<el-table-column :label="$t('最低分值')" align="center" prop="scoreMin" />
<el-table-column :label="$t('最高分值')" align="center" prop="scoreMax" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:level:update']">修改</el-button>
v-hasPermi="['customer:level:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:level:delete']">删除</el-button>
v-hasPermi="['customer:level:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -61,25 +61,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="nameZh">
<el-input v-model="form.nameZh" placeholder="请输入中文名称" />
<el-form-item :label="$t('名称')" prop="nameZh">
<el-input v-model="form.nameZh" :placeholder="$t('请输入中文名称')" />
</el-form-item>
<el-form-item label="英文名称" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
<el-form-item :label="$t('英文名称')" prop="nameEn">
<el-input v-model="form.nameEn" :placeholder="$t('请输入英文名称')" />
</el-form-item>
<el-form-item label="最低分值" prop="scoreMin">
<el-input v-model="form.scoreMin" placeholder="请输入最低分值" />
<el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="form.scoreMin" :placeholder="$t('请输入最低分值')" />
</el-form-item>
<el-form-item label="最高分值" prop="scoreMax">
<el-input v-model="form.scoreMax" placeholder="请输入最高分值" />
<el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="form.scoreMax" :placeholder="$t('请输入最高分值')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -120,10 +120,10 @@ export default {
form: {},
// 表单校验
rules: {
nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }],
scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }],
nameZh: [{ required: true, message: this.$t('中文名称不能为空'), trigger: "blur" }],
nameEn: [{ required: true, message: this.$t('英文名称不能为空'), trigger: "blur" }],
scoreMax: [{ required: true, message: this.$t('最大分值不能为空'), trigger: "blur" }],
scoreMin: [{ required: true, message: this.$t('最小分值不能为空'), trigger: "blur" }],
}
};
},
......@@ -176,7 +176,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加客户等级";
this.title = this.$t('添加客户等级');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -185,7 +185,7 @@ export default {
getLevel(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改客户等级";
this.title = this.$t('修改客户等级');
});
},
/** 提交按钮 */
......@@ -197,7 +197,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateLevel(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -205,7 +205,7 @@ export default {
}
// 添加的提交
createLevel(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -214,11 +214,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除客户等级编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除客户等级编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteLevel(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -229,7 +229,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有客户等级数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有客户等级数据项?')).then(() => {
this.exportLoading = true;
return exportLevelExcel(params);
}).then(response => {
......
src/views/customer/levelRule/index.vue
View file @ 1a9aea20
......@@ -3,22 +3,22 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择规则分类')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['customer:level-rule:create']">新增</el-button>
v-hasPermi="['customer:level-rule:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['customer:level-rule:export']">导出</el-button>
v-hasPermi="['customer:level-rule:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="规则得分" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['customer:level-rule:update']">修改</el-button>
v-hasPermi="['customer:level-rule:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['customer:level-rule:delete']">删除</el-button>
v-hasPermi="['customer:level-rule:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="规则名称" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" />
<el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item>
<el-form-item label="规则分类" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类">
<el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="规则得分" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" />
<el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -129,9 +129,9 @@ export default {
form: {},
// 表单校验
rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
}
};
},
......@@ -183,7 +183,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加客户等级规则";
this.title = this.$t('添加客户等级规则');
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -192,7 +192,7 @@ export default {
getLevelRule(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改客户等级规则";
this.title = this.$t('修改客户等级规则');
});
},
/** 提交按钮 */
......@@ -204,7 +204,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateLevelRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false;
this.getList();
});
......@@ -212,7 +212,7 @@ export default {
}
// 添加的提交
createLevelRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
this.getList();
});
......@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除客户等级规则编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除客户等级规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteLevelRule(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有客户等级规则数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有客户等级规则数据项?')).then(() => {
this.exportLoading = true;
return exportLevelRuleExcel(params);
}).then(response => {
......
src/views/dashboard/PanelGroup.vue
View file @ 1a9aea20
......@@ -109,6 +109,8 @@ export default {
}
.card-panel {
display: flex;
justify-content: space-between;
height: 108px;
cursor: pointer;
font-size: 12px;
......@@ -158,7 +160,6 @@ export default {
}
.card-panel-icon-wrapper {
float: left;
margin: 14px 0 0 14px;
padding: 16px;
transition: all 0.38s ease-out;
......@@ -166,12 +167,10 @@ export default {
}
.card-panel-icon {
float: left;
font-size: 48px;
}
.card-panel-description {
float: right;
font-weight: bold;
margin: 26px;
margin-left: 0px;
......
src/views/ecw/banner/index.vue
View file @ 1a9aea20
......@@ -3,17 +3,17 @@
<!-- 搜索工作栏 -->
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="中文标题" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入中文标题" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('中文标题')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入中文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="英文标题" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入英文标题" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('英文标题')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="中文内容" prop="contentZh">
<el-input v-model="queryParams.contentZh" placeholder="请输入中文内容" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('中文内容')" prop="contentZh">
<el-input v-model="queryParams.contentZh" :placeholder="$t('请输入中文内容')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="英文内容" prop="contentEn">
<el-input v-model="queryParams.contentEn" placeholder="请输入英文内容" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('英文内容')" prop="contentEn">
<el-input v-model="queryParams.contentEn" :placeholder="$t('请输入英文内容')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="图片地址WEB" prop="bannerUrlWeb">
<el-input v-model="queryParams.bannerUrlWeb" placeholder="请输入图片地址WEB" clearable @keyup.enter.native="handleQuery"/>
......@@ -23,16 +23,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="结束日期" />
type="daterange" range-separator="-" start-:placeholder="$t('开始日期')" end-:placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form> -->
......@@ -40,11 +40,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:banner:create']">新增</el-button>
v-hasPermi="['ecw:banner: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:banner:export']">导出</el-button>
v-hasPermi="['ecw:banner:export']">{{$t('导出')}}</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -52,33 +52,33 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="标题" align="center" prop="titleZh" />
<el-table-column label="WEB端图片" align="center" prop="bannerUrlWeb">
<el-table-column :label="$t('标题')" align="center" prop="titleZh" />
<el-table-column :label="$t('WEB端图片')" align="center" prop="bannerUrlWeb">
<template slot-scope="scope">
<el-image :src="scope.row.bannerUrlWeb"></el-image>
</template>
</el-table-column>
<el-table-column label="APP端图片" align="center" prop="bannerUrlApp" >
<el-table-column :label="$t('APP端图片')" align="center" prop="bannerUrlApp" >
<template slot-scope="scope">
<el-image :src="scope.row.bannerUrlApp"></el-image>
</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">
<span>{{ statusName(scope.row.status) }}</span>
</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:banner:update']">修改</el-button>
v-hasPermi="['ecw:banner:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:banner:delete']">删除</el-button>
v-hasPermi="['ecw:banner:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -89,45 +89,45 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="126px">
<el-form-item label="中文标题" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入中文标题" />
<el-form-item :label="$t('中文标题')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入中文标题')" />
</el-form-item>
<el-form-item label="英文标题" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入英文标题" />
<el-form-item :label="$t('英文标题')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入英文标题')" />
</el-form-item>
<el-form-item label="中文内容" prop="contentZh">
<el-form-item :label="$t('中文内容')" prop="contentZh">
<editor v-model="form.contentZh" :min-height="150"/>
</el-form-item>
<el-form-item label="英文内容" prop="contentEn">
<el-form-item :label="$t('英文内容')" prop="contentEn">
<editor v-model="form.contentEn" :min-height="150"/>
</el-form-item>
<el-form-item label="WEB端广告图片（建议尺寸210*902）" prop="bannerUrlWeb">
<el-form-item :label="$t('WEB端广告图片（建议尺寸')+'210*902）'" prop="bannerUrlWeb">
<el-col :span="8">
<el-input v-model="form.bannerUrlWeb" placeholder="请上传WEB端广告图片" />
<el-input v-model="form.bannerUrlWeb" :placeholder="$t('请上传WEB端广告图片')" />
</el-col>
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUploadWeb">
<el-button size="small">
上传图片
{{$t('上传图片')}}
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</el-upload>
</el-form-item>
<el-form-item label="APP端广告图片（建议尺寸688*294）" prop="bannerUrlApp">
<el-form-item :label="$t('APP端广告图片（建议尺寸')+'688*294）'" prop="bannerUrlApp">
<el-col :span="8">
<el-input v-model="form.bannerUrlApp" placeholder="请上传APP端广告图片" />
<el-input v-model="form.bannerUrlApp" :placeholder="$t('请上传APP端广告图片')" />
</el-col>
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUploadApp">
<el-button size="small">
上传图片
{{$t('上传图片')}}
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</el-upload>
</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>
......@@ -178,10 +178,10 @@ export default {
form: {},
// 表单校验
rules: {
titleZh: [{ required: true, message: "中文标题不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文标题不能为空", trigger: "blur" }],
bannerUrlWeb: [{ required: true, message: "web端广告图片不能为空", trigger: "blur" }],
bannerUrlApp: [{ required: true, message: "app端广告图片不能为空", trigger: "blur" }]
titleZh: [{ required: true, message: this.$t("中文标题不能为空"), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t("英文标题不能为空"), trigger: "blur" }],
bannerUrlWeb: [{ required: true, message: this.$t("web端广告图片不能为空"), trigger: "blur" }],
bannerUrlApp: [{ required: true, message: this.$t("app端广告图片不能为空"), trigger: "blur" }]
},
CommonStatusEnum: CommonStatusEnum,
......@@ -195,7 +195,7 @@ export default {
for(let index in this.statusDictDatas) {
let dictItem = this.statusDictDatas[index];
if(dictItem.value == value) {
return dictItem.value == CommonStatusEnum.ENABLE + '' ? '正常' : '禁用';
return dictItem.value == CommonStatusEnum.ENABLE + '' ? this.$t('正常') : this.$t('禁用');
}
}
}
......@@ -253,7 +253,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告设置";
this.title = this.$t("添加广告设置");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -262,7 +262,7 @@ export default {
getBanner(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改广告设置";
this.title = this.$t("修改广告设置");
});
},
/** 提交按钮 */
......@@ -274,7 +274,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateBanner(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -282,7 +282,7 @@ export default {
}
// 添加的提交
createBanner(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -291,11 +291,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除广告设置编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除广告设置编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteBanner(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -306,7 +306,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有广告设置数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有广告设置数据项?')).then(() => {
this.exportLoading = true;
return exportBannerExcel(params);
}).then(response => {
......@@ -321,7 +321,7 @@ export default {
// 上传预处理
beforeUploadWeb(file) {
if (file.type.indexOf("image/") == -1) {
this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
this.$modal.msgError(this.$t("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"));
} else {
//上传
let formData = new FormData();
......@@ -337,7 +337,7 @@ export default {
// 上传预处理
beforeUploadApp(file) {
if (file.type.indexOf("image/") == -1) {
this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
this.$modal.msgError(this.$t("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"));
} else {
//上传
let formData = new FormData();
......
src/views/ecw/bannerPop/index.vue
View file @ 1a9aea20
......@@ -3,17 +3,17 @@
<!-- 搜索工作栏 -->
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="中文标题" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入中文标题" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('中文标题')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入中文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="英文标题" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入英文标题" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('英文标题')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="有效期开始时间" prop="validateStart">
<el-input v-model="queryParams.validateStart" placeholder="请输入有效期开始时间" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('有效期开始时间')" prop="validateStart">
<el-input v-model="queryParams.validateStart" :placeholder="$t('请输入有效期开始时间')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="有效期结束时间" prop="validateEnd">
<el-input v-model="queryParams.validateEnd" placeholder="请输入有效期结束时间" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('有效期结束时间')" prop="validateEnd">
<el-input v-model="queryParams.validateEnd" :placeholder="$t('请输入有效期结束时间')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="web网页中文" prop="htmlWebZh">
<el-input v-model="queryParams.htmlWebZh" placeholder="请输入web网页中文" clearable @keyup.enter.native="handleQuery"/>
......@@ -26,16 +26,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="结束日期" />
type="daterange" range-separator="-" start-:placeholder="$t('开始日期')" end-:placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form> -->
......@@ -43,11 +43,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:banner-pop:create']">新增</el-button>
v-hasPermi="['ecw:banner-pop: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:banner-pop:export']">导出</el-button>
v-hasPermi="['ecw:banner-pop:export']">{{$t('导出')}}</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -55,33 +55,33 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="弹窗标题" align="center" prop="titleZh" />
<el-table-column label="弹窗时间" align="center" prop="validateDate" width="180">
<el-table-column :label="$t('弹窗标题')" align="center" prop="titleZh" />
<el-table-column :label="$t('弹窗时间')" align="center" prop="validateDate" width="180">
<template slot-scope="scope">
<span>{{ formatTime(scope.row.validateStart) }}~{{ formatTime(scope.row.validateEnd) }}</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">
<span>{{ statusName(scope.row.status) }}</span>
</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:banner-pop:update']">修改</el-button>
v-hasPermi="['ecw:banner-pop:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" @click="handleStatus(scope.row)"
v-hasPermi="['ecw:banner-pop:update']">{{scope.row.status == CommonStatusEnum.ENABLE ? '禁用' : '启用'}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:banner-pop:delete']">删除</el-button>
v-hasPermi="['ecw:banner-pop:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -93,12 +93,12 @@
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题(中文)" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入中文标题" />
<el-input v-model="form.titleZh" :placeholder="$t('请输入中文标题')" />
</el-form-item>
<el-form-item label="标题(英文)" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入英文标题" />
<el-input v-model="form.titleEn" :placeholder="$t('请输入英文标题')" />
</el-form-item>
<el-form-item label="有效期" prop="validateStart">
<el-form-item :label="$t('有效期')" prop="validateStart">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
</el-date-picker>
~
......@@ -107,10 +107,10 @@
<span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
</el-form-item>
<el-form-item label="网页中文" prop="htmlWebZh">
<el-form-item :label="$t('网页中文')" prop="htmlWebZh">
<editor v-model="form.htmlWebZh" :min-height="150"/>
</el-form-item>
<el-form-item label="网页英文" prop="htmlWebEn">
<el-form-item :label="$t('网页英文')" prop="htmlWebEn">
<editor v-model="form.htmlWebEn" :min-height="150"/>
</el-form-item>
<el-form-item label="APP中文" prop="htmlAppZh">
......@@ -173,9 +173,9 @@ export default {
form: {},
// 表单校验
rules: {
titleZh: [{ required: true, message: "中文标题不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文标题不能为空", trigger: "blur" }],
validateStart: [{ required: true, message: "有效期开始时间不能为空", trigger: "blur" }]
titleZh: [{ required: true, message: this.$t("中文标题不能为空"), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t("英文标题不能为空"), trigger: "blur" }],
validateStart: [{ required: true, message: this.$t("有效期开始时间不能为空"), trigger: "blur" }]
},
CommonStatusEnum: CommonStatusEnum,
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
......@@ -188,7 +188,7 @@ export default {
let startDate = new Date(this.form.validateStart)
let endDate = new Date(this.form.validateEnd)
if(startDate.getTime() > endDate.getTime()){
this.$message.error('开始时间不能大于结束时间');
this.$message.error(this.$t('开始时间不能大于结束时间'));
if(oldV) {
this.form.validateStart = oldV;
} else {
......@@ -203,7 +203,7 @@ export default {
let startDate = new Date(this.form.validateStart)
let endDate = new Date(this.form.validateEnd)
if(startDate.getTime() > endDate.getTime()){
this.$message.error('结束时间不能小于开始时间');
this.$message.error(this.$t('结束时间不能小于开始时间'));
if(oldV) {
this.form.validateEnd= oldV;
} else {
......@@ -230,7 +230,7 @@ export default {
for(let index in this.statusDictDatas) {
let dictItem = this.statusDictDatas[index];
if(dictItem.value == value) {
return dictItem.value == CommonStatusEnum.ENABLE + '' ? '正常' : '禁用';
return dictItem.value == CommonStatusEnum.ENABLE + '' ? this.$t('正常') : this.$t('禁用');
}
}
}
......@@ -279,7 +279,7 @@ export default {
handleStatus(row) {
row.status=row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE;
updateBannerPop(row).then(() => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
}).catch(function() {
row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE : CommonStatusEnum.ENABLE;
});
......@@ -305,7 +305,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告弹窗";
this.title = this.$t("添加广告弹窗");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -317,7 +317,7 @@ export default {
this.form.validateEnd = this.parseTime(response.data.validateEnd);
console.log(this.form);
this.open = true;
this.title = "修改广告弹窗";
this.title = this.$t("修改广告弹窗");
});
},
/** 提交按钮 */
......@@ -329,7 +329,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateBannerPop(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -337,7 +337,7 @@ export default {
}
// 添加的提交
createBannerPop(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -346,11 +346,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除广告弹窗编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除广告弹窗编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteBannerPop(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -361,7 +361,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有广告弹窗数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有广告弹窗数据项?')).then(() => {
this.exportLoading = true;
return exportBannerPopExcel(params);
}).then(response => {
......
src/views/ecw/currency/index.vue
View file @ 1a9aea20
......@@ -59,7 +59,12 @@
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="汇率" align="center" prop="huilv" />
<el-table-column label="100外币兑人民币汇率" align="center" prop="huilv" />
<el-table-column label="100人民币兑外币汇率" align="center" prop="huilv">
<template slot-scope="scope">
{{ scope.row.huilv ? (10000 / scope.row.huilv).toFixed(6) : ''}}
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="aorder" />
<!-- <el-table-column label="" align="center" prop="createAt" width="180">-->
<!-- <template slot-scope="scope">-->
......@@ -68,7 +73,7 @@
<!-- </el-table-column>-->
<el-table-column label="最后更新时间" align="center" prop="updateAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateAt) }}</span>
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -86,7 +91,7 @@
<!-- 对话框(添加 / 修改) -->
<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 ref="form" :model="form" :rules="rules" label-width="180px">
<el-form-item label="中文名称" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入中文名称" />
</el-form-item>
......@@ -99,8 +104,11 @@
<!-- <el-form-item label="状态" prop="show">-->
<!-- <el-input v-model="form.show" placeholder="请输入状态" />-->
<!-- </el-form-item>-->
<el-form-item label="汇率" prop="huilv">
<el-input v-model="form.huilv" placeholder="请输入汇率" />
<el-form-item label="100外币兑人民币汇率" prop="huilv">
<el-input v-model="form.huilv" placeholder="请输入100外币兑人民币汇率汇率" />
</el-form-item>
<el-form-item label="100人民币兑外币汇率" prop="huilv">
{{ form.huilv ? (10000 / form.huilv).toFixed(6) : ''}}
</el-form-item>
<el-form-item label="排序" prop="aorder">
<el-input v-model="form.aorder" placeholder="请输入排序" />
......
src/views/ecw/dock/index.vue
View file @ 1a9aea20
......@@ -5,23 +5,23 @@
<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:dock:create']">新增</el-button>
v-hasPermi="['ecw:dock: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:dock:export']">导出</el-button>
v-hasPermi="['ecw:dock: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="序号" type="index" width="50" />
<el-table-column :label="$t('序号')" type="index" width="50" />
<el-table-column label="中文名称" align="center" prop="titleZh" />
<el-table-column label="英文名称" align="center" prop="titleEn" />
<el-table-column :label="$t('中文名称')" align="center" prop="titleZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="titleEn" />
<el-table-column prop="portType" label="港口类型" align="center">
<el-table-column prop="portType" :label="$t('港口类型')" align="center">
<template slot-scope="scope">
<div>
{{ portTypeName(scope.row.portType) }}
......@@ -29,18 +29,30 @@
</template>
</el-table-column>
<el-table-column label="国家" align="center" prop="countryZh" />
<el-table-column label="省" align="center" prop="provinceZh" />
<el-table-column label="城市" align="center" prop="cityZh" />
<el-table-column label="码头编号" align="center" prop="number" />
<el-table-column label="码头类型" align="center" prop="type" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('国家')" align="center" prop="countryZh">
<template slot-scope="{row}">
{{$l(row,'country')}}
</template>
</el-table-column>
<el-table-column :label="$t('省')" align="center" prop="provinceZh">
<template slot-scope="{row}">
{{$l(row,'province')}}
</template>
</el-table-column>
<el-table-column :label="$t('城市')" align="center" prop="cityZh">
<template slot-scope="{row}">
{{$l(row,'city')}}
</template>
</el-table-column>
<el-table-column :label="$t('码头编号')" align="center" prop="number" />
<el-table-column :label="$t('码头类型')" align="center" prop="type" />
<el-table-column :label="$t('排序')" align="center" prop="sort" />
<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:dock:update']">修改</el-button>
v-hasPermi="['ecw:dock:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:dock:delete']">删除</el-button>
v-hasPermi="['ecw:dock:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -51,68 +63,68 @@
<!-- 对话框(添加 / 修改) -->
<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="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入中文名称" />
<el-form-item :label="$t('中文名称')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入中文名称')" />
</el-form-item>
<el-form-item label="英文名称" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入英文名称" />
<el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入英文名称')" />
</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-item label="国家" prop="countryId">
<el-select v-model="form.countryId" placeholder="请选择国家" @change="changeCountry">
<el-form-item :label="$t('国家')" prop="countryId">
<el-select v-model="form.countryId" :placeholder="$t('请选择国家')" @change="changeCountry">
<el-option
v-for="item in countryList"
:key="item.id"
:label="item.titleZh"
:label="$l(item,'title')"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="省" prop="provinceId">
<el-select v-model="form.provinceId" placeholder="请选择省" @change="changeProvince">
<el-form-item :label="$t('省')" prop="provinceId">
<el-select v-model="form.provinceId" :placeholder="$t('请选择省')" @change="changeProvince">
<el-option
v-for="item in provinceList"
:key="item.id"
:label="item.titleZh"
:label="$l(item,'title')"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityId">
<el-select v-model="form.cityId" placeholder="请选择城市" @change="changeCity">
<el-form-item :label="$t('城市')" prop="cityId">
<el-select v-model="form.cityId" :placeholder="$t('请选择城市')" @change="changeCity">
<el-option
v-for="item in cityList"
:key="item.id"
:label="item.titleZh"
:label="$l(item,'title')"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="港口类型" prop="portType">
<el-select v-model="form.portType" placeholder="请选择">
<el-form-item :label="$t('港口类型')" prop="portType">
<el-select v-model="form.portType" :placeholder="$t('请选择')">
<el-option v-for="dict in portTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="码头编号" prop="number">
<el-input v-model="form.number" placeholder="请输入码头编号" />
<el-form-item :label="$t('码头编号')" prop="number">
<el-input v-model="form.number" :placeholder="$t('请输入码头编号')" />
</el-form-item>
<el-form-item label="码头类型" prop="type">
<el-input v-model="form.type" placeholder="请输入码头类型" />
<el-form-item :label="$t('码头类型')" prop="type">
<el-input v-model="form.type" :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>
......@@ -175,9 +187,9 @@ export default {
form: {},
// 表单校验
rules: {
titleZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
sort: [{ required: true, message: "排序不能为空", trigger: "blur" }]
titleZh: [{ required: true, message: this.$t("中文名称不能为空"), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t("英文名称不能为空"), trigger: "blur" }],
sort: [{ required: true, message: this.$t("排序不能为空"), trigger: "blur" }]
},
portTypeDatas: getDictDatas(DICT_TYPE.ECW_PORT_TYPE)
};
......@@ -189,7 +201,7 @@ export default {
for(let index in this.portTypeDatas) {
let portTypeItem = this.portTypeDatas[index];
if(portTypeItem.value == portType) {
return portTypeItem.label;
return this.$l(portTypeItem,'label');
}
}
}
......@@ -321,7 +333,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加码头信息";
this.title = this.$t("添加码头信息");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -333,7 +345,7 @@ export default {
this.changeProvince(response.data.provinceId);
this.open = true;
this.title = "修改码头信息";
this.title = this.$t("修改码头信息");
});
},
/** 提交按钮 */
......@@ -345,7 +357,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateDock(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -353,7 +365,7 @@ export default {
}
// 添加的提交
createDock(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -362,11 +374,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除码头信息编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除码头信息编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteDock(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -377,7 +389,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有码头信息数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有码头信息数据项?')).then(() => {
this.exportLoading = true;
return exportDockExcel(params);
}).then(response => {
......
src/views/ecw/express/index.vue
View file @ 1a9aea20
......@@ -3,25 +3,25 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="快递公司名称" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入快递公司名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="queryParams.companyName" :placeholder="$t('请输入快递公司名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="账户名称" prop="accountName">
<el-input v-model="queryParams.accountName" placeholder="请输入账户名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="queryParams.accountName" :placeholder="$t('请输入账户名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="查件key" prop="queryKey">
<el-input v-model="queryParams.queryKey" placeholder="请输入查件key" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="queryParams.queryKey" :placeholder="$t('请输入查件key')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="查询url" prop="queryUrl">
<el-input v-model="queryParams.queryUrl" placeholder="请输入查询url" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="queryParams.queryUrl" :placeholder="$t('请输入查询url')" 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="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -29,33 +29,33 @@
<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:express:create']">新增</el-button>
v-hasPermi="['ecw:express: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:express:export']">导出</el-button>
v-hasPermi="['ecw:express: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="companyName" />
<el-table-column label="账户名称" align="center" prop="accountName" />
<el-table-column label="查件key" align="center" prop="queryKey" />
<el-table-column label="查询url" align="center" prop="queryUrl" />
<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="companyName" />
<el-table-column :label="$t('账户名称')" align="center" prop="accountName" />
<el-table-column :label="$t('查件key')" align="center" prop="queryKey" />
<el-table-column :label="$t('查询url')" align="center" prop="queryUrl" />
<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:express:update']">修改</el-button>
v-hasPermi="['ecw:express:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:express:delete']">删除</el-button>
v-hasPermi="['ecw:express:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -66,22 +66,22 @@
<!-- 对话框(添加 / 修改) -->
<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="companyName">
<el-input v-model="form.companyName" placeholder="请输入快递公司名称" />
<el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="form.companyName" :placeholder="$t('请输入快递公司名称')" />
</el-form-item>
<el-form-item label="账户名称" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入账户名称" />
<el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="form.accountName" :placeholder="$t('请输入账户名称')" />
</el-form-item>
<el-form-item label="查件key" prop="queryKey">
<el-input v-model="form.queryKey" placeholder="请输入查件key" />
<el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="form.queryKey" :placeholder="$t('请输入查件key')" />
</el-form-item>
<el-form-item label="查询url" prop="queryUrl">
<el-input v-model="form.queryUrl" placeholder="请输入查询url" />
<el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="form.queryUrl" :placeholder="$t('请输入查询url')" />
</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>
......@@ -124,7 +124,7 @@ export default {
form: {},
// 表单校验
rules: {
companyName: [{ required: true, message: "快递公司名称不能为空", trigger: "blur" }],
companyName: [{ required: true, message: this.$t("快递公司名称不能为空"), trigger: "blur" }],
}
};
},
......@@ -176,7 +176,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加配送管理";
this.title = this.$t("添加配送管理");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -185,7 +185,7 @@ export default {
getExpress(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改配送管理";
this.title = this.$t("修改配送管理");
});
},
/** 提交按钮 */
......@@ -197,7 +197,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateExpress(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -205,7 +205,7 @@ export default {
}
// 添加的提交
createExpress(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -214,11 +214,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除配送管理编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除配送管理编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteExpress(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -229,7 +229,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有配送管理数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有配送管理数据项?')).then(() => {
this.exportLoading = true;
return exportExpressExcel(params);
}).then(response => {
......
src/views/ecw/financial/creatCollection.vue
View file @ 1a9aea20
......@@ -342,7 +342,7 @@
<el-option
v-for="item in currencyList"
:key="item.id"
:label="item.titleZh"
:label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
:value="item.id"
/>
</el-select>
......@@ -367,7 +367,7 @@
<template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else>
<div v-for="itemAmount in scope.row.collectionAmount">{{itemAmount.currencyName}}: {{ itemAmount.amount}}</div>
<div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
<!-- <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
......@@ -852,7 +852,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
checkDiscount(e){
......@@ -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({currencyName:item.titleZh,amount:dollar})
amountList.push({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 @ 1a9aea20
......@@ -540,7 +540,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
getList() {
......
src/views/ecw/financial/openInvoice.vue
View file @ 1a9aea20
......@@ -154,7 +154,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
async getData() {
......
src/views/ecw/financial/payable.vue
View file @ 1a9aea20
......@@ -204,7 +204,7 @@
</el-form-item>
<el-form-item label="" label-width="0px">
<el-select v-model="costObj.currencyId" :placeholder="$t('请选择单位')">
<el-option v-for="item in currencyList" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
<el-option v-for="item in currencyList" :key="item.id" :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
......@@ -305,7 +305,7 @@ export default {
},
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
/** 搜索按钮操作 */
......
src/views/ecw/financial/paymentDetail.vue
View file @ 1a9aea20
......@@ -330,7 +330,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
getList() {
......
src/views/ecw/financial/paymentExamine.vue
View file @ 1a9aea20
......@@ -153,7 +153,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
getSummaries(param) {
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ 1a9aea20
......@@ -149,7 +149,7 @@
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
getCollectionData(){
......
src/views/ecw/financial/printVoucher.vue
View file @ 1a9aea20
......@@ -37,7 +37,7 @@
<td>{{ index + 1 }}</td>
<td>{{ orderData.tidanNo||''}}</td>
<td>{{ item.orderNo }}</td>
<td>{{ item.titleZh }}</td>
<td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td>
<td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
<td> {{item.totalAmount}}</td>
<td>{{getCurrencyLabel(item.currencyId)}}</td>
......@@ -209,7 +209,7 @@
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
getList() {
......
src/views/ecw/financial/receiptDetail.vue
View file @ 1a9aea20
......@@ -74,7 +74,15 @@
<el-option :value="0" label="不需要"></el-option>
</el-select> -->
</el-descriptions-item>
<el-descriptions-item :label="$t('核销基准币种')">
<el-descriptions-item>
<template slot="label">
{{$t('核销基准币种')}}
<span :title="$t('应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种')"><i class="el-icon-question"></i></span>
<!-- <el-tooltip class="item" effect="light" :content="$t('应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种')" placement="top">
<el-button icon="el-icon-question"></el-button>
</el-tooltip> -->
</template>
{{getCurrencyLabel(showCurrencyId)}}
</el-descriptions-item>
</el-descriptions>
......@@ -137,7 +145,7 @@
<span>{{ scope.row.writeOffRate }}</span>
</template>
<template v-else>
{{ $t('应收总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('应核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
</template>
</template>
</el-table-column>
......@@ -151,6 +159,7 @@
{{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }}
</template>
</el-table-column>
<el-table-column :label="$t('期望收款币种')" align="center">
<template slot-scope="scope">
<!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" /> -->
......@@ -169,14 +178,17 @@
<el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
</el-form-item> -->
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionRate }}</span>
<span v-else>{{ $t('期望收费金额') }}</span>
<span v-else>{{ $t('期望收费金额') }}
<span :title="$t('导出账单给客户时显示的收款金额与币种')"><i class="el-icon-question"></i></span>
</span>
</template>
</el-table-column>
<el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
<template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else>
<div v-for="itemAmount in scope.row.collectionAmount">{{itemAmount.currencyName}}: {{ itemAmount.amount}}</div>
<div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
<!-- <div v-if="scope.row.collectionAmount[0]">{{ $t('美元') }}: {{ scope.row.collectionAmount[0] }}</div>
<div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1] }}</div>
<div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2] }}</div> -->
......@@ -255,10 +267,15 @@
</el-card>
<el-card class="card hexiaoCard">
<el-descriptions :column="3" border>
<el-descriptions-item :label="$t('已核销实收总金额')">
<el-descriptions-item >
<!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
<el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
<el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> -->
<template slot="label">
{{ $t('实收已核销总金额') }} <span :title="$t('所有银行收款明细中状态为已核销的实收金额，币种根据实收币种分类统计')"><i class="el-icon-question"></i></span>
</template>
<template v-if="!Object.keys(writeOffTotal).length">
0
</template>
......@@ -267,16 +284,22 @@
{{amount}}{{getCurrencyLabel(currency)}}
</div>
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
{{ $t('已核销基准币种总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('核销基准币种已核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('为了方便统计收款单核销比例，将所有银行收款明细中状态为已核销的实收金额，转换为核销基准币种的金额累加')"><i class="el-icon-question"></i></span>
</template>
{{ writeOffAmount}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
{{ $t('已核销比例\n（已核销基准币种总金额/应收总金额）') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('总核销比例') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额')"><i class="el-icon-question"></i></span>
</template>
{{ WriteOffProportion }}%
</el-descriptions-item>
......@@ -286,9 +309,9 @@
<el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button>
<el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button>
</div>
<el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="40%" append-to-body>
<el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body>
<div style="padding: 0 24px">
<el-form ref="addForm" :model="addForm" label-width="150px">
<el-form ref="addForm" :model="addForm" label-width="250px">
<el-form-item :label="$t('收款单号')">{{ form.receiptNo }}</el-form-item>
<el-form-item :label="$t('剩余应收金额')">
<template v-if="surplusData.length==0">
......@@ -346,7 +369,7 @@
<el-option
v-for="item in currencyList"
:key="item.id"
:label="item.titleZh"
:label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
:value="item.id"
/>
</el-select>
......@@ -361,7 +384,10 @@
:rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }"
>
<template slot="label">
{{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
<!-- <el-tooltip class="item" effect="light" :content="$t('实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率')" placement="top-start">
<el-button> {{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）</el-button>
</el-tooltip> -->
<span :title="$t('实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率')">{{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）</span>
</template>
<el-input v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
<span v-else>{{ addForm.rate}}</span>
......@@ -415,6 +441,7 @@
</template>
<script>
import helpIcon from "@/assets/images/help.png"
import { getBankAccountPage } from "@/api/ecw/bankAccount";
import { getToken } from "@/utils/auth";
import { listSimpleDepts } from "@/api/system/dept";
......@@ -435,6 +462,7 @@ import {
import { getCurrencyPage } from "@/api/ecw/currency";
import NP from 'number-precision'
export default {
data() {
return {
......@@ -631,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({currencyName:item.titleZh, currencyId: item.id, amount:dollar})
amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
// }
}
......@@ -661,7 +689,7 @@ export default {
},
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
calculation() {
......
src/views/ecw/financial/receivable.vue
View file @ 1a9aea20
......@@ -321,7 +321,7 @@ export default {
methods: {
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
return ''
},
/** 查询列表 */
......
src/views/index_old.vue deleted 100644 → 0
View file @ 7668b8fb
<template>
<div class="app-container home">
<el-row :gutter="20">
<el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券
<br />
<el-link
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
type="primary"
target="_blank"
>https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
>
<br />
领取腾讯云通用云产品2860优惠券
<br />
<el-link
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
type="primary"
target="_blank"
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
>
<br />
阿里云服务器折扣区
<el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
>
&nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
<el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
><br />
<h4 class="text-danger">
云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
</h4>
</blockquote>
<hr />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>捷道后台管理框架</h2>
<p>
一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了捷道管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
</p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
<p>
<el-button
type="primary"
size="mini"
icon="el-icon-cloudy"
plain
@click="goTarget('https://gitee.com/zhijiantianya/ruoyi-vue-pro')"
>访问码云</el-button
>
<el-button
size="mini"
icon="el-icon-s-home"
plain
@click="goTarget('http://ruoyi.vip')"
>访问主页</el-button
>
</p>
</el-col>
<el-col :sm="24" :lg="12" style="padding-left: 50px">
<el-row>
<el-col :span="12">
<h2>技术选型</h2>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<h4>后端技术</h4>
<ul>
<li>SpringBoot</li>
<li>Spring Security</li>
<li>JWT</li>
<li>MyBatis</li>
<li>Druid</li>
<li>Fastjson</li>
<li>...</li>
</ul>
</el-col>
<el-col :span="6">
<h4>前端技术</h4>
<ul>
<li>Vue</li>
<li>Vuex</li>
<li>Element-ui</li>
<li>Axios</li>
<li>Sass</li>
<li>Quill</li>
<li>...</li>
</ul>
</el-col>
</el-row>
</el-col>
</el-row>
<el-divider />
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>联系信息</span>
</div>
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网：<el-link
href="http://www.ruoyi.vip"
target="_blank"
>http://www.ruoyi.vip</el-link
>
</p>
<p>
<i class="el-icon-user-solid"></i> QQ群：<s>满937441</s>
<s>满887144332</s> <s>满180251782</s>
<a href="https://jq.qq.com/?_wv=1027&k=4WWwqNxN" target="_blank"
> 104180207</a
>
</p>
<p>
<i class="el-icon-chat-dot-round"></i> 微信：<a
href="javascript:;"
>/ *捷道</a
>
</p>
<p>
<i class="el-icon-money"></i> 支付宝：<a
href="javascript:;"
class="支付宝信息"
>/ *捷道</a
>
</p>
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.3.0 - 2020-12-14">
<ol>
<li>新增缓存监控功能</li>
<li>支持主题风格配置</li>
<li>修复多级菜单之间切换无法缓存的问题</li>
<li>多级菜单自动配置组件</li>
<li>代码生成预览支持高亮显示</li>
<li>支持Get请求映射Params参数</li>
<li>删除用户和角色解绑关联</li>
<li>去除用户手机邮箱部门必填验证</li>
<li>Excel支持注解align对齐方式</li>
<li>Excel支持导入Boolean型数据</li>
<li>优化头像样式，鼠标移入悬停遮罩</li>
<li>代码生成预览提供滚动机制</li>
<li>代码生成删除多余的数字float类型</li>
<li>修正转换字符串的目标字符集属性</li>
<li>回显数据字典防止空值报错</li>
<li>日志记录增加过滤多文件场景</li>
<li>修改缓存Set方法可能导致嵌套的问题</li>
<li>移除前端一些多余的依赖</li>
<li>防止安全扫描YUI出现的风险提示</li>
<li>修改node-sass为dart-sass</li>
<li>升级SpringBoot到最新版本2.1.18</li>
<li>升级poi到最新版本4.1.2</li>
<li>升级oshi到最新版本v5.3.6</li>
<li>升级bitwalker到最新版本1.21</li>
<li>升级axios到最新版本0.21.0</li>
<li>升级element-ui到最新版本2.14.1</li>
<li>升级vue到最新版本2.6.12</li>
<li>升级vuex到最新版本3.6.0</li>
<li>升级vue-cli到版本4.5.9</li>
<li>升级vue-router到最新版本3.4.9</li>
<li>升级vue-cli到最新版本4.4.6</li>
<li>升级vue-cropper到最新版本0.5.5</li>
<li>升级clipboard到最新版本2.0.6</li>
<li>升级core-js到最新版本3.8.1</li>
<li>升级echarts到最新版本4.9.0</li>
<li>升级file-saver到最新版本2.0.4</li>
<li>升级fuse.js到最新版本6.4.3</li>
<li>升级js-beautify到最新版本1.13.0</li>
<li>升级js-cookie到最新版本2.2.1</li>
<li>升级path-to-regexp到最新版本6.2.0</li>
<li>升级quill到最新版本1.3.7</li>
<li>升级screenfull到最新版本5.0.2</li>
<li>升级sortablejs到最新版本1.10.2</li>
<li>升级vuedraggable到最新版本2.24.3</li>
<li>升级chalk到最新版本4.1.0</li>
<li>升级eslint到最新版本7.15.0</li>
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
<li>升级lint-staged到最新版本10.5.3</li>
<li>升级runjs到最新版本4.4.2</li>
<li>升级sass-loader到最新版本10.1.0</li>
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
<li>升级svg-sprite-loader到最新版本5.1.1</li>
<li>升级vue-template-compiler到最新版本2.6.12</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.1 - 2020-11-18">
<ol>
<li>阻止任意文件下载漏洞</li>
<li>代码生成支持上传控件</li>
<li>新增图片上传组件</li>
<li>调整默认首页</li>
<li>升级druid到最新版本v1.2.2</li>
<li>mapperLocations配置支持分隔符</li>
<li>权限信息调整</li>
<li>调整sql默认时间</li>
<li>解决代码生成没有bit类型的问题</li>
<li>升级pagehelper到最新版1.3.0</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2020-10-10">
<ol>
<li>升级springboot版本到2.1.17 提升安全性</li>
<li>升级oshi到最新版本v5.2.5</li>
<li>升级druid到最新版本v1.2.1</li>
<li>升级jjwt到版本0.9.1</li>
<li>升级fastjson到最新版1.2.74</li>
<li>修改sass为node-sass，避免el-icon图标乱码</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>代码生成页面时不忽略remark属性</li>
<li>代码生成添加select必填选项</li>
<li>Excel导出类型NUMERIC支持精度浮点类型</li>
<li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
<li>Excel注解支持自动统计数据总和</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
<li>允许用户分配到部门父节点</li>
<li>菜单新增是否缓存keep-alive</li>
<li>表格操作列间距调整</li>
<li>限制系统内置参数不允许删除</li>
<li>富文本组件优化，支持自定义高度&图片冲突问题</li>
<li>富文本工具栏样式对齐</li>
<li>导入excel整形值校验优化</li>
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
<li>左侧菜单文字过长显示省略号</li>
<li>修正根节点为子部门时，树状结构显示问题</li>
<li>修正调用目标字符串最大长度</li>
<li>修正菜单提示信息错误</li>
<li>修正定时任务执行一次权限标识</li>
<li>修正数据库字符串类型nvarchar</li>
<li>优化递归子节点</li>
<li>优化数据权限判断</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.1.0 - 2020-08-13">
<ol>
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
<li>后端支持CORS跨域请求</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持自定义路径</li>
<li>代码生成支持复选框</li>
<li>Excel导出导入支持dictType字典类型</li>
<li>Excel支持分割字符串组内容</li>
<li>验证码类型支持（数组计算、字符验证）</li>
<li>升级vue-cli版本到4.4.4</li>
<li>修改 node-sass 为 dart-sass</li>
<li>表单类型为Integer/Long设置整形默认值</li>
<li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
<li>优化防重复提交拦截器</li>
<li>优化上级菜单不能选择自己</li>
<li>修复角色的权限分配后，未实时生效问题</li>
<li>修复在线用户日志记录类型</li>
<li>修复富文本空格和缩进保存后不生效问题</li>
<li>修复在线用户判断逻辑</li>
<li>唯一限制条件只返回单条数据</li>
<li>添加获取当前的环境配置方法</li>
<li>超时登录后页面跳转到首页</li>
<li>全局异常状态汉化拦截处理</li>
<li>HTML过滤器改为将html转义</li>
<li>检查字符支持小数点&降级改成异常提醒</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.0.0 - 2020-07-20">
<ol>
<li>单应用调整为多模块项目</li>
<li>升级element-ui版本到2.13.2</li>
<li>删除babel，提高编译速度。</li>
<li>新增菜单默认主类目</li>
<li>编码文件名修改为uuid方式</li>
<li>定时任务cron表达式验证</li>
<li>角色权限修改时已有权限未自动勾选异常修复</li>
<li>防止切换权限用户后登录出现404</li>
<li>Excel支持sort导出排序</li>
<li>创建用户不允许选择超级管理员角色</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复热部署导致的强换异常问题</li>
<li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
<li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
<li>定时任务调整label-width，防止部署出现错位</li>
<li>调整表头固定列默认样式</li>
<li>代码生成模板调整，字段为String并且必填则加空串条件</li>
<li>代码生成字典Integer/Long使用parseInt</li>
<li>
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
</li>
<li>修正岗位导出权限注解</li>
<li>禁止加密密文返回前端</li>
<li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
<li>修复首页搜索菜单外链无法点击跳转问题</li>
<li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
<li>用户管理部门分支节点不可检查&显示计数</li>
<li>数据范围过滤属性调整</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.3.0 - 2020-06-01">
<ol>
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
<li>dev启动默认打开浏览器</li>
<li>vue-cli使用默认source-map</li>
<li>slidebar eslint报错优化</li>
<li>当tags-view滚动关闭右键菜单</li>
<li>字典管理添加缓存读取</li>
<li>参数管理支持缓存操作</li>
<li>支持一级菜单（和主页同级）在main区域显示</li>
<li>限制外链地址必须以http(s)开头</li>
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
<li>修改数据源类型优先级，先根据方法，再根据类</li>
<li>支持是否需要设置token属性，自定义返回码消息。</li>
<li>swagger请求前缀加入配置。</li>
<li>登录地点设置内容过长则隐藏显示</li>
<li>修复定时任务执行一次按钮后不提示消息问题</li>
<li>修改上级部门（选择项排除本身和下级）</li>
<li>通用http发送方法增加参数 contentType 编码类型</li>
<li>更换IP地址查询接口</li>
<li>修复页签变量undefined</li>
<li>添加校验部门包含未停用的子部门</li>
<li>修改定时任务详情下次执行时间日期显示错误</li>
<li>角色管理查询设置默认排序字段</li>
<li>swagger添加enable参数控制是否启用</li>
<li>只对json类型请求构建可重复读取inputStream的request</li>
<li>修改代码生成字典字段int类型没有自动选中问题</li>
<li>vuex用户名取值修正</li>
<li>表格树模板去掉多余的)</li>
<li>代码生成序号修正</li>
<li>全屏情况下不调整上外边距</li>
<li>代码生成Date字段添加默认格式</li>
<li>用户管理角色选择权限控制</li>
<li>修复路由懒加载报错问题</li>
<li>模板sql.vm添加菜单状态</li>
<li>设置用户名称不能修改</li>
<li>dialog添加append-to-body属性，防止ie遮罩</li>
<li>菜单区分状态和显示隐藏功能</li>
<li>升级fastjson到最新版1.2.68 修复安全加固</li>
<li>修复代码生成如果选择字典类型缺失逗号问题</li>
<li>登录请求params更换为data，防止暴露url</li>
<li>日志返回时间格式处理</li>
<li>添加handle控制允许拖动的元素</li>
<li>布局设置点击扩大范围</li>
<li>代码生成列属性排序查询</li>
<li>代码生成列支持拖动排序</li>
<li>修复时间格式不支持ios问题</li>
<li>表单构建添加父级class，防止冲突</li>
<li>定时任务并发属性修正</li>
<li>角色禁用&菜单隐藏不查询权限</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.2.0 - 2020-03-18">
<ol>
<li>系统监控新增定时任务功能</li>
<li>添加一个打包Web工程bat</li>
<li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
<li>修复点击退出登录有时会无提示问题</li>
<li>修复防重复提交注解无效问题</li>
<li>修复通知公告批量删除异常问题</li>
<li>添加菜单时路由地址必填限制</li>
<li>代码生成字段描述可编辑</li>
<li>修复用户修改个人信息导致缓存不过期问题</li>
<li>个人信息创建时间获取正确属性值</li>
<li>操作日志详细显示正确类型</li>
<li>导入表单击行数据时选中对应的复选框</li>
<li>批量替换表前缀逻辑调整</li>
<li>固定重定向路径表达式</li>
<li>升级element-ui版本到2.13.0</li>
<li>操作日志排序调整</li>
<li>修复charts切换侧边栏或者缩放窗口显示bug</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.1.0 - 2020-02-24">
<ol>
<li>新增表单构建</li>
<li>代码生成支持树表结构</li>
<li>新增用户导入</li>
<li>修复动态加载路由页面刷新问题</li>
<li>修复地址开关无效问题</li>
<li>汉化错误提示页面</li>
<li>代码生成已知问题修改</li>
<li>修复多数据源下配置关闭出现异常处理</li>
<li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
<li>修复上传头像控制台出现异常</li>
<li>修改用户管理分页不正确的问题</li>
<li>修复验证码记录提示错误</li>
<li>修复request.js缺少Message引用</li>
<li>修复表格时间为空出现的异常</li>
<li>添加Jackson日期反序列化时区配置</li>
<li>调整根据用户权限加载菜单数据树形结构</li>
<li>调整成功登录不恢复按钮，防止多次点击</li>
<li>修改用户个人资料同步缓存信息</li>
<li>修复页面同时出现el-upload和Editor不显示处理</li>
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
<li>配置文件新增redis密码属性</li>
<li>设置mybatis全局的配置文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.0.0 - 2019-12-02">
<ol>
<li>新增代码生成</li>
<li>新增@RepeatSubmit注解，防止重复提交</li>
<li>新增菜单主目录添加/删除操作</li>
<li>日志记录过滤特殊对象，防止转换异常</li>
<li>修改代码生成路由脚本错误</li>
<li>用户上传头像实时同步缓存，无需重新登录</li>
<li>调整切换页签后不重新加载数据</li>
<li>添加jsencrypt实现参数的前端加密</li>
<li>系统退出删除用户缓存记录</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.1.0 - 2019-11-11">
<ol>
<li>新增在线用户管理</li>
<li>新增按钮组功能实现（批量删除、导出、清空）</li>
<li>新增查询条件重置按钮</li>
<li>新增Swagger全局Token配置</li>
<li>新增后端参数校验</li>
<li>修复字典管理页面的日期查询异常</li>
<li>修改时间函数命名防止冲突</li>
<li>去除菜单上级校验，默认为顶级</li>
<li>修复用户密码无法修改问题</li>
<li>修复菜单类型为按钮时不显示权限标识</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2019-10-08">
<ol>
<li>捷道前后端分离系统正式发布</li>
</ol>
</el-collapse-item>
</el-collapse>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>捐赠支持</span>
</div>
<div class="body">
<img
src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
alt="donate"
width="100%"
/>
<span style="display: inline-block; height: 30px; line-height: 30px"
>你可以请作者喝杯咖啡表示鼓励</span
>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
name: "Index",
data() {
return {
// 版本号
version: "3.3.0",
};
},
methods: {
goTarget(href) {
window.open(href, "_blank");
},
},
};
</script>
<style scoped lang="scss">
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eee;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
}
.col-item {
margin-bottom: 20px;
}
ul {
padding: 0;
margin: 0;
}
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
overflow-x: hidden;
ul {
list-style-type: none;
}
h4 {
margin-top: 0px;
}
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
}
p {
margin-top: 10px;
b {
font-weight: 700;
}
}
.update-log {
ol {
display: block;
list-style-type: decimal;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0;
margin-inline-end: 0;
padding-inline-start: 40px;
}
}
}
</style>
src/views/member/user/index.vue
View file @ 1a9aea20
......@@ -54,7 +54,7 @@
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
</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">
<div v-if="!scope.row.identityAuditStatus">{{$t('未提交')}}</div>
<dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.identityAuditStatus" ></dict-tag>
......@@ -77,7 +77,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<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" @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button>
<el-button size="mini" type="text" @click="operationLogFn(scope.row)">{{$t('操作日志')}}</el-button>
......
src/views/system/helpDoc/index.vue
View file @ 1a9aea20
......@@ -3,26 +3,26 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :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.HELP_DOC_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="结束日期" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -30,11 +30,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="['system:help-doc:create']">新增</el-button>
v-hasPermi="['system:help-doc: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="['system:help-doc:export']">导出</el-button>
v-hasPermi="['system:help-doc:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -42,26 +42,26 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" />
<el-table-column label="内容中文" align="center" prop="contentZh" />
<el-table-column label="内容英语" align="center" prop="contentEn" />
<el-table-column label="状态" align="center" prop="status">
<el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />
<el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.HELP_DOC_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="['system:help-doc:update']">修改</el-button>
v-hasPermi="['system:help-doc:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:help-doc:delete']">删除</el-button>
v-hasPermi="['system:help-doc:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -72,19 +72,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="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" />
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
<el-form-item label="内容中文" prop="contentZh">
<el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :min-height="192"/>
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :min-height="192"/>
</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.HELP_DOC_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
......@@ -92,8 +92,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>
......@@ -190,7 +190,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加帮助文档";
this.title = this.$t("添加帮助文档");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -199,7 +199,7 @@ export default {
getHelpDoc(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改帮助文档";
this.title = this.$t("修改帮助文档");
});
},
/** 提交按钮 */
......@@ -211,7 +211,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -219,7 +219,7 @@ export default {
}
// 添加的提交
createHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -228,11 +228,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除帮助文档编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteHelpDoc(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -243,7 +243,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有帮助文档数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有帮助文档数据项?')).then(() => {
this.exportLoading = true;
return exportHelpDocExcel(params);
}).then(response => {
......
src/views/system/internalHelpDoc/index.vue
View file @ 1a9aea20
......@@ -3,25 +3,25 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :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="结束日期" />
type="daterange" range-separator="-" start-:placeholder="$t('开始日期')" end-:placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -29,11 +29,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="['system:internal-help-doc:create']">新增</el-button>
v-hasPermi="['system:internal-help-doc: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="['system:internal-help-doc:export']">导出</el-button>
v-hasPermi="['system:internal-help-doc:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -41,25 +41,25 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" />
<!-- <el-table-column label="内容中文" align="center" prop="contentZh" />-->
<!-- <el-table-column label="内容英语" align="center" prop="contentEn" />-->
<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="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<!-- <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />-->
<!-- <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />-->
<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="['system:internal-help-doc:update']">修改</el-button>
v-hasPermi="['system:internal-help-doc:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:internal-help-doc:delete']">删除</el-button>
v-hasPermi="['system:internal-help-doc:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
......@@ -67,17 +67,17 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" />
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
<el-form-item label="内容中文" prop="contentZh">
<editor v-model="form.contentZh" placeholder="请输入内容中文" />
<el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :placeholder="$t('请输入内容中文')" />
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<editor v-model="form.contentEn" placeholder="请输入内容英语" />
<el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :placeholder="$t('请输入内容英语')" />
</el-form-item>
<el-form-item label="0-启用,1-停用" prop="status">
<el-radio-group v-model="form.status">
......@@ -185,7 +185,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加对内帮助文档";
this.title = this.$t("添加对内帮助文档");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -194,7 +194,7 @@ export default {
getInternalHelpDoc(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改对内帮助文档";
this.title = this.$t("修改对内帮助文档");
});
},
/** 提交按钮 */
......@@ -206,7 +206,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -214,7 +214,7 @@ export default {
}
// 添加的提交
createInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -223,11 +223,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除对内帮助文档编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除对内帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteInternalHelpDoc(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -238,7 +238,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有对内帮助文档数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有对内帮助文档数据项?')).then(() => {
this.exportLoading = true;
return exportInternalHelpDocExcel(params);
}).then(response => {
......
src/views/system/needKnow/index.vue
View file @ 1a9aea20
......@@ -3,31 +3,31 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="须知类型" prop="knowType">
<el-select v-model="queryParams.knowType" placeholder="请选择须知类型" clearable size="small">
<el-form-item :label="$t('须知类型')" prop="knowType">
<el-select v-model="queryParams.knowType" :placeholder="$t('请选择须知类型')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :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.NEED_KNOW_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="结束日期" />
type="daterange" range-separator="-" start-:placeholder="$t('开始日期')" end-:placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -35,11 +35,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="['system:need-know:create']">新增</el-button>
v-hasPermi="['system:need-know: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="['system:need-know:export']">导出</el-button>
v-hasPermi="['system:need-know:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -47,31 +47,31 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="须知类型" align="center" prop="knowType">
<el-table-column :label="$t('须知类型')" align="center" prop="knowType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.NEED_KNOW_TYPE" :value="scope.row.knowType" />
</template>
</el-table-column>
<el-table-column label="标题中文" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" />
<!-- <el-table-column label="内容中文" align="center" prop="contentZh" />-->
<!-- <el-table-column label="内容英语" align="center" prop="contentEn" />-->
<el-table-column label="状态" align="center" prop="status">
<el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<!-- <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />-->
<!-- <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />-->
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.NEED_KNOW_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="['system:need-know:update']">修改</el-button>
v-hasPermi="['system:need-know:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:need-know:delete']">删除</el-button>
v-hasPermi="['system:need-know:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -82,25 +82,25 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="须知类型" prop="knowType">
<el-select v-model="form.knowType" placeholder="请选择须知类型">
<el-form-item :label="$t('须知类型')" prop="knowType">
<el-select v-model="form.knowType" :placeholder="$t('请选择须知类型')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" />
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
<el-form-item label="内容中文" prop="contentZh">
<ueditor v-model="form.contentZh" :min-height="192" placeholder="请输入内容中文"/>
<el-form-item :label="$t('内容中文')" prop="contentZh">
<ueditor v-model="form.contentZh" :min-height="192" :placeholder="$t('请输入内容中文')"/>
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<el-form-item :label="$t('内容英语')" prop="contentEn">
<ueditor v-model="form.contentEn" :min-height="192" placeholder="plese entry english"/>
</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.NEED_KNOW_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
......@@ -108,8 +108,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>
......@@ -206,7 +206,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加须知";
this.title = this.$t("添加须知");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -215,7 +215,7 @@ export default {
getNeedKnow(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改须知";
this.title = this.$t("修改须知");
});
},
/** 提交按钮 */
......@@ -227,7 +227,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateNeedKnow(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -235,7 +235,7 @@ export default {
}
// 添加的提交
createNeedKnow(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -244,11 +244,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除须知编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除须知编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteNeedKnow(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -259,7 +259,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有须知数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有须知数据项?')).then(() => {
this.exportLoading = true;
return exportNeedKnowExcel(params);
}).then(response => {
......
src/views/system/notice/index.vue
View file @ 1a9aea20
<template>
<div class="app-container">
<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="操作人员" prop="createBy">
<el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('操作人员')" prop="createBy">
<el-input v-model="queryParams.createBy" :placeholder="$t('请输入操作人员')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<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 noticeTypeDictDatas" :key="parseInt(dict.value)" :label="$l(dict, 'label')" :value="parseInt(dict.value)"/>
</el-select>
</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>
<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="['system:notice:create']"s>新增</el-button>
v-hasPermi="['system:notice:create']"s>{{$t('新增')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="noticeList">
<el-table-column label="序号" align="center" prop="id" width="100" />
<el-table-column label="公告标题" align="center" prop="title" :show-overflow-tooltip="true"/>
<el-table-column label="公告类型" align="center" prop="type" width="100">
<el-table-column :label="$t('序号')" align="center" prop="id" width="100" />
<el-table-column :label="$t('公告标题')" align="center" prop="title" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('公告类型')" align="center" prop="type" width="100">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_NOTICE_TYPE" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="100">
<el-table-column :label="$t('状态')" align="center" prop="status" width="100">
<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="validateDate" width="150" >
<el-table-column :label="$t('有效日期')" align="center" prop="validateDate" width="150" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.validateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="创建者" align="center" prop="createBy" width="150"/>-->
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <el-table-column :label="$t('创建者')" align="center" prop="createBy" width="150"/>-->
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</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-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:update']">修改</el-button>
v-hasPermi="['system:notice:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:notice:delete']">删除</el-button>
v-hasPermi="['system:notice:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -68,18 +68,18 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<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-col>
<el-col :span="12">
<el-form-item label="标题英文" prop="title">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="title">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
</el-col>
<el-col :span="12">
<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 noticeTypeDictDatas"
:key="parseInt(dict.value)"
......@@ -90,7 +90,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-form-item :label="$t('状态')">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusDictDatas"
......@@ -101,27 +101,27 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效日期">
<el-form-item :label="$t('有效日期')">
<el-date-picker type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :editable="false"
v-model="form.validateDate"
style="width: 100%;"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="内容">
<el-form-item :label="$t('内容')">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="内容英文">
<el-form-item :label="$t('内容英文')">
<editor v-model="form.contentEn" :min-height="192"/>
</el-form-item>
</el-col>
</el-row>
</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>
......@@ -166,10 +166,10 @@ export default {
// 表单校验
rules: {
title: [
{ required: true, message: "公告标题不能为空", trigger: "blur" }
{ required: true, message: this.$t("公告标题不能为空"), trigger: "blur" }
],
type: [
{ required: true, message: "公告类型不能为空", trigger: "change" }
{ required: true, message: this.$t("公告类型不能为空"), trigger: "change" }
]
},
......@@ -225,7 +225,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加公告";
this.title = this.$t("添加公告");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -234,7 +234,7 @@ export default {
getNotice(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改公告";
this.title = this.$t("修改公告");
});
},
/** 提交按钮 */
......@@ -243,13 +243,13 @@ export default {
if (valid) {
if (this.form.id !== undefined) {
updateNotice(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
} else {
addNotice(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -260,11 +260,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除公告编号为"' + ids + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除公告编号为"') + ids + this.$t('"的数据项?')).then(function() {
return delNotice(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
}
}
......
yarn.lock
View file @ 1a9aea20
This source diff could not be displayed because it is too large. You can view the blob instead.
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