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
Expand all 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 @@ ...@@ -8,7 +8,7 @@
"重置": "Reset", "重置": "Reset",
"新建订单": "New Order", "新建订单": "New Order",
"订舱": "Book space", "订舱": "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", "您确认要反核销吗": "Are you sure you want to cancel the write-off",
"捷道货运收款单": "Shortway Freight Collection Note", "捷道货运收款单": "Shortway Freight Collection Note",
"是否确认删除该应付款": "Are you sure to delete the account payable", "是否确认删除该应付款": "Are you sure to delete the account payable",
...@@ -2172,5 +2172,134 @@ ...@@ -2172,5 +2172,134 @@
"待审核会员": "Member to be reviewed", "待审核会员": "Member to be reviewed",
"是否确认删除昵称为{nickname}的会员?": "Are you sure to delete the member whose nickname is {nickname}?", "是否确认删除昵称为{nickname}的会员?": "Are you sure to delete the member whose nickname is {nickname}?",
"取消删除": "Cancel Delete", "取消删除": "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 @@ ...@@ -196,7 +196,7 @@
"请输入项目": "请输入项目", "请输入项目": "请输入项目",
"请选择": "请选择", "请选择": "请选择",
"请选择业务员": "请选择业务员", "请选择业务员": "请选择业务员",
"请选择业务员": "请选择供应商", "请选择供应商": "请选择供应商",
"请选择出货渠道": "请选择出货渠道", "请选择出货渠道": "请选择出货渠道",
"请选择单位": "请选择单位", "请选择单位": "请选择单位",
"请选择始发仓": "请选择始发仓", "请选择始发仓": "请选择始发仓",
...@@ -256,8 +256,6 @@ ...@@ -256,8 +256,6 @@
"审核备注":"审核备注", "审核备注":"审核备注",
"审核请款单":"审核请款单", "审核请款单":"审核请款单",
"费用类型":"费用类型", "费用类型":"费用类型",
"未开票":"未开票",
"已开票":"已开票",
"反审核成功":"反审核成功", "反审核成功":"反审核成功",
"待审核":"待审核", "待审核":"待审核",
"已审核待核销":"已审核待核销", "已审核待核销":"已审核待核销",
......
src/views/customer/credit/index.vue
View file @ 1a9aea20
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="最高分值" prop="scoreMax"> <el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.scoreMax" :placeholder="$t('请输入最高分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="最低分值" prop="scoreMin"> <el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="queryParams.scoreMin" placeholder="请输入最低分值" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.scoreMin" :placeholder="$t('请输入最低分值')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -19,34 +19,34 @@ ...@@ -19,34 +19,34 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column label="中文名称" align="center" prop="nameZh" /> <el-table-column :label="$t('中文名称')" align="center" prop="nameZh" />
<el-table-column label="英文名称" align="center" prop="nameEn" /> <el-table-column :label="$t('英文名称')" align="center" prop="nameEn" />
<el-table-column label="最低分值" align="center" prop="scoreMin" /> <el-table-column :label="$t('最低分值')" align="center" prop="scoreMin" />
<el-table-column label="最高分值" align="center" prop="scoreMax" /> <el-table-column :label="$t('最高分值')" align="center" prop="scoreMax" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column :label="$t('备注')" align="center" prop="remark" />
<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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -57,25 +57,25 @@ ...@@ -57,25 +57,25 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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="80px">
<el-form-item label="中文名称" prop="nameZh"> <el-form-item :label="$t('中文名称')" prop="nameZh">
<el-input v-model="form.nameZh" placeholder="请输入中文名称" /> <el-input v-model="form.nameZh" :placeholder="$t('请输入中文名称')" />
</el-form-item> </el-form-item>
<el-form-item label="英文名称" prop="nameEn"> <el-form-item :label="$t('英文名称')" prop="nameEn">
<el-input v-model="form.nameEn" placeholder="请输入英文名称" /> <el-input v-model="form.nameEn" :placeholder="$t('请输入英文名称')" />
</el-form-item> </el-form-item>
<el-form-item label="最高分值" prop="scoreMax"> <el-form-item :label="$t('最高分值')" prop="scoreMax">
<el-input v-model="form.scoreMax" placeholder="请输入最高分值" /> <el-input v-model="form.scoreMax" :placeholder="$t('请输入最高分值')" />
</el-form-item> </el-form-item>
<el-form-item label="最低分值" prop="scoreMin"> <el-form-item :label="$t('最低分值')" prop="scoreMin">
<el-input v-model="form.scoreMin" placeholder="请输入最低分值" /> <el-input v-model="form.scoreMin" :placeholder="$t('请输入最低分值')" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -115,10 +115,10 @@ export default { ...@@ -115,10 +115,10 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }], nameZh: [{ required: true, message: this.$t('中文名称不能为空'), trigger: "blur" }],
nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }], nameEn: [{ required: true, message: this.$t('英文名称不能为空'), trigger: "blur" }],
scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }], scoreMax: [{ required: true, message: this.$t('最大分值不能为空'), trigger: "blur" }],
scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }], scoreMin: [{ required: true, message: this.$t('最小分值不能为空'), trigger: "blur" }],
} }
}; };
}, },
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加信用等级"; this.title = this.$t('添加信用等级');
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
getCredit(id).then(response => { getCredit(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改信用等级"; this.title = this.$t('修改信用等级');
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateCredit(this.form).then(response => { updateCredit(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createCredit(this.form).then(response => { createCredit(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -207,11 +207,11 @@ export default { ...@@ -207,11 +207,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除信用等级编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除信用等级编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCredit(id); return deleteCredit(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有信用等级数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有信用等级数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportCreditExcel(params); return exportCreditExcel(params);
}).then(response => { }).then(response => {
......
src/views/customer/creditRule/index.vue
View file @ 1a9aea20
...@@ -3,22 +3,22 @@ ...@@ -3,22 +3,22 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name"> <el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="规则分类" prop="type"> <el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small"> <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)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </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" <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -26,37 +26,37 @@ ...@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" /> <el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type"> <el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规则得分" align="center" prop="score" /> <el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column :label="$t('备注')" align="center" prop="remark" />
<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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -67,25 +67,25 @@ ...@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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="80px">
<el-form-item label="规则名称" prop="name"> <el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" /> <el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item> </el-form-item>
<el-form-item label="规则分类" prop="type"> <el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类"> <el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="规则得分" prop="score"> <el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" /> <el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -129,9 +129,9 @@ export default { ...@@ -129,9 +129,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }], name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }], type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }], score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
} }
}; };
}, },
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加信用规则"; this.title = this.$t('添加信用规则');
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
getCreditRule(id).then(response => { getCreditRule(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改信用规则"; this.title = this.$t('修改信用规则');
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateCreditRule(this.form).then(response => { updateCreditRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createCreditRule(this.form).then(response => { createCreditRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -221,11 +221,11 @@ export default { ...@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除信用规则编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除信用规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCreditRule(id); return deleteCreditRule(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -236,7 +236,7 @@ export default { ...@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有信用规则数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有信用规则数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportCreditRuleExcel(params); return exportCreditRuleExcel(params);
}).then(response => { }).then(response => {
......
src/views/customer/level/index.vue
View file @ 1a9aea20
This diff is collapsed.
src/views/customer/levelRule/index.vue
View file @ 1a9aea20
...@@ -3,22 +3,22 @@ ...@@ -3,22 +3,22 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="规则名称" prop="name"> <el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.name" :placeholder="$t('请输入规则名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="规则分类" prop="type"> <el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small"> <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)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </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" <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -26,37 +26,37 @@ ...@@ -26,37 +26,37 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column label="规则名称" align="center" prop="name" /> <el-table-column :label="$t('规则名称')" align="center" prop="name" />
<el-table-column label="规则分类" align="center" prop="type"> <el-table-column :label="$t('规则分类')" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规则得分" align="center" prop="score" /> <el-table-column :label="$t('规则得分')" align="center" prop="score" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column :label="$t('备注')" align="center" prop="remark" />
<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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -67,25 +67,25 @@ ...@@ -67,25 +67,25 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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="80px">
<el-form-item label="规则名称" prop="name"> <el-form-item :label="$t('规则名称')" prop="name">
<el-input v-model="form.name" placeholder="请输入规则名称" /> <el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
</el-form-item> </el-form-item>
<el-form-item label="规则分类" prop="type"> <el-form-item :label="$t('规则分类')" prop="type">
<el-select v-model="form.type" placeholder="请选择规则分类"> <el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="规则得分" prop="score"> <el-form-item :label="$t('规则得分')" prop="score">
<el-input v-model="form.score" placeholder="请输入规则得分" /> <el-input v-model="form.score" :placeholder="$t('请输入规则得分')" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -129,9 +129,9 @@ export default { ...@@ -129,9 +129,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }], name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
type: [{ required: true, message: "规则分类不能为空", trigger: "change" }], type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }], score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
} }
}; };
}, },
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加客户等级规则"; this.title = this.$t('添加客户等级规则');
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
getLevelRule(id).then(response => { getLevelRule(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改客户等级规则"; this.title = this.$t('修改客户等级规则');
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateLevelRule(this.form).then(response => { updateLevelRule(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createLevelRule(this.form).then(response => { createLevelRule(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -221,11 +221,11 @@ export default { ...@@ -221,11 +221,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除客户等级规则编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除客户等级规则编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteLevelRule(id); return deleteLevelRule(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -236,7 +236,7 @@ export default { ...@@ -236,7 +236,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有客户等级规则数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有客户等级规则数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportLevelRuleExcel(params); return exportLevelRuleExcel(params);
}).then(response => { }).then(response => {
......
src/views/dashboard/PanelGroup.vue
View file @ 1a9aea20
...@@ -109,6 +109,8 @@ export default { ...@@ -109,6 +109,8 @@ export default {
} }
.card-panel { .card-panel {
display: flex;
justify-content: space-between;
height: 108px; height: 108px;
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: 12px;
...@@ -158,7 +160,6 @@ export default { ...@@ -158,7 +160,6 @@ export default {
} }
.card-panel-icon-wrapper { .card-panel-icon-wrapper {
float: left;
margin: 14px 0 0 14px; margin: 14px 0 0 14px;
padding: 16px; padding: 16px;
transition: all 0.38s ease-out; transition: all 0.38s ease-out;
...@@ -166,12 +167,10 @@ export default { ...@@ -166,12 +167,10 @@ export default {
} }
.card-panel-icon { .card-panel-icon {
float: left;
font-size: 48px; font-size: 48px;
} }
.card-panel-description { .card-panel-description {
float: right;
font-weight: bold; font-weight: bold;
margin: 26px; margin: 26px;
margin-left: 0px; margin-left: 0px;
......
src/views/ecw/banner/index.vue
View file @ 1a9aea20
This diff is collapsed.
src/views/ecw/bannerPop/index.vue
View file @ 1a9aea20
This diff is collapsed.
src/views/ecw/currency/index.vue
View file @ 1a9aea20
...@@ -59,7 +59,12 @@ ...@@ -59,7 +59,12 @@
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" /> <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
</template> </template>
</el-table-column> </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="aorder" />
<!-- <el-table-column label="" align="center" prop="createAt" width="180">--> <!-- <el-table-column label="" align="center" prop="createAt" width="180">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
...@@ -68,7 +73,7 @@ ...@@ -68,7 +73,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="最后更新时间" align="center" prop="updateAt" width="180"> <el-table-column label="最后更新时间" align="center" prop="updateAt" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateAt) }}</span> <span>{{ parseTime(scope.row.updateTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
...@@ -86,7 +91,7 @@ ...@@ -86,7 +91,7 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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-form-item label="中文名称" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入中文名称" /> <el-input v-model="form.titleZh" placeholder="请输入中文名称" />
</el-form-item> </el-form-item>
...@@ -99,8 +104,11 @@ ...@@ -99,8 +104,11 @@
<!-- <el-form-item label="状态" prop="show">--> <!-- <el-form-item label="状态" prop="show">-->
<!-- <el-input v-model="form.show" placeholder="请输入状态" />--> <!-- <el-input v-model="form.show" placeholder="请输入状态" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="汇率" prop="huilv"> <el-form-item label="100外币兑人民币汇率" prop="huilv">
<el-input v-model="form.huilv" placeholder="请输入汇率" /> <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>
<el-form-item label="排序" prop="aorder"> <el-form-item label="排序" prop="aorder">
<el-input v-model="form.aorder" placeholder="请输入排序" /> <el-input v-model="form.aorder" placeholder="请输入排序" />
......
src/views/ecw/dock/index.vue
View file @ 1a9aea20
This diff is collapsed.
src/views/ecw/express/index.vue
View file @ 1a9aea20
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="快递公司名称" prop="companyName"> <el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入快递公司名称" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.companyName" :placeholder="$t('请输入快递公司名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="账户名称" prop="accountName"> <el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="queryParams.accountName" placeholder="请输入账户名称" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.accountName" :placeholder="$t('请输入账户名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="查件key" prop="queryKey"> <el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="queryParams.queryKey" placeholder="请输入查件key" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.queryKey" :placeholder="$t('请输入查件key')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="查询url" prop="queryUrl"> <el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="queryParams.queryUrl" placeholder="请输入查询url" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.queryUrl" :placeholder="$t('请输入查询url')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </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" <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -29,33 +29,33 @@ ...@@ -29,33 +29,33 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" /> <el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column label="快递公司名称" align="center" prop="companyName" /> <el-table-column :label="$t('快递公司名称')" align="center" prop="companyName" />
<el-table-column label="账户名称" align="center" prop="accountName" /> <el-table-column :label="$t('账户名称')" align="center" prop="accountName" />
<el-table-column label="查件key" align="center" prop="queryKey" /> <el-table-column :label="$t('查件key')" align="center" prop="queryKey" />
<el-table-column label="查询url" align="center" prop="queryUrl" /> <el-table-column :label="$t('查询url')" align="center" prop="queryUrl" />
<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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -66,22 +66,22 @@ ...@@ -66,22 +66,22 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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="80px">
<el-form-item label="快递公司名称" prop="companyName"> <el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入快递公司名称" /> <el-input v-model="form.companyName" :placeholder="$t('请输入快递公司名称')" />
</el-form-item> </el-form-item>
<el-form-item label="账户名称" prop="accountName"> <el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入账户名称" /> <el-input v-model="form.accountName" :placeholder="$t('请输入账户名称')" />
</el-form-item> </el-form-item>
<el-form-item label="查件key" prop="queryKey"> <el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="form.queryKey" placeholder="请输入查件key" /> <el-input v-model="form.queryKey" :placeholder="$t('请输入查件key')" />
</el-form-item> </el-form-item>
<el-form-item label="查询url" prop="queryUrl"> <el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="form.queryUrl" placeholder="请输入查询url" /> <el-input v-model="form.queryUrl" :placeholder="$t('请输入查询url')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
companyName: [{ required: true, message: "快递公司名称不能为空", trigger: "blur" }], companyName: [{ required: true, message: this.$t("快递公司名称不能为空"), trigger: "blur" }],
} }
}; };
}, },
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加配送管理"; this.title = this.$t("添加配送管理");
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -185,7 +185,7 @@ export default { ...@@ -185,7 +185,7 @@ export default {
getExpress(id).then(response => { getExpress(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改配送管理"; this.title = this.$t("修改配送管理");
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateExpress(this.form).then(response => { updateExpress(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createExpress(this.form).then(response => { createExpress(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -214,11 +214,11 @@ export default { ...@@ -214,11 +214,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除配送管理编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除配送管理编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteExpress(id); return deleteExpress(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有配送管理数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有配送管理数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportExpressExcel(params); return exportExpressExcel(params);
}).then(response => { }).then(response => {
......
src/views/ecw/financial/creatCollection.vue
View file @ 1a9aea20
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
<el-option <el-option
v-for="item in currencyList" v-for="item in currencyList"
:key="item.id" :key="item.id"
:label="item.titleZh" :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span> <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else> <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[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[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> --> <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
...@@ -852,7 +852,7 @@ export default { ...@@ -852,7 +852,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
checkDiscount(e){ checkDiscount(e){
...@@ -893,7 +893,7 @@ export default { ...@@ -893,7 +893,7 @@ export default {
var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id) var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
if(dollarList.length>0){ if(dollarList.length>0){
var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6) 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) // 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 { ...@@ -540,7 +540,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
getList() { getList() {
......
src/views/ecw/financial/openInvoice.vue
View file @ 1a9aea20
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
async getData() { async getData() {
......
src/views/ecw/financial/payable.vue
View file @ 1a9aea20
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
</el-form-item> </el-form-item>
<el-form-item label="" label-width="0px"> <el-form-item label="" label-width="0px">
<el-select v-model="costObj.currencyId" :placeholder="$t('请选择单位')"> <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-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -305,7 +305,7 @@ export default { ...@@ -305,7 +305,7 @@ export default {
}, },
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
src/views/ecw/financial/paymentDetail.vue
View file @ 1a9aea20
...@@ -330,7 +330,7 @@ export default { ...@@ -330,7 +330,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
getList() { getList() {
......
src/views/ecw/financial/paymentExamine.vue
View file @ 1a9aea20
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
getSummaries(param) { getSummaries(param) {
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ 1a9aea20
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
getCollectionData(){ getCollectionData(){
......
src/views/ecw/financial/printVoucher.vue
View file @ 1a9aea20
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<td>{{ index + 1 }}</td> <td>{{ index + 1 }}</td>
<td>{{ orderData.tidanNo||''}}</td> <td>{{ orderData.tidanNo||''}}</td>
<td>{{ item.orderNo }}</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><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
<td> {{item.totalAmount}}</td> <td> {{item.totalAmount}}</td>
<td>{{getCurrencyLabel(item.currencyId)}}</td> <td>{{getCurrencyLabel(item.currencyId)}}</td>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
getList() { getList() {
......
src/views/ecw/financial/receiptDetail.vue
View file @ 1a9aea20
...@@ -74,7 +74,15 @@ ...@@ -74,7 +74,15 @@
<el-option :value="0" label="不需要"></el-option> <el-option :value="0" label="不需要"></el-option>
</el-select> --> </el-select> -->
</el-descriptions-item> </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)}} {{getCurrencyLabel(showCurrencyId)}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
...@@ -137,7 +145,7 @@ ...@@ -137,7 +145,7 @@
<span>{{ scope.row.writeOffRate }}</span> <span>{{ scope.row.writeOffRate }}</span>
</template> </template>
<template v-else> <template v-else>
{{ $t('应收总金额') }}（{{getCurrencyLabel(showCurrencyId)}}） {{ $t('应核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -151,6 +159,7 @@ ...@@ -151,6 +159,7 @@
{{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }} {{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('期望收款币种')" align="center"> <el-table-column :label="$t('期望收款币种')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" /> --> <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" /> -->
...@@ -169,14 +178,17 @@ ...@@ -169,14 +178,17 @@
<el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input> <el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
</el-form-item> --> </el-form-item> -->
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionRate }}</span> <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> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount"> <el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span> <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else> <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[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[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1] }}</div>
<div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2] }}</div> --> <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2] }}</div> -->
...@@ -255,10 +267,15 @@ ...@@ -255,10 +267,15 @@
</el-card> </el-card>
<el-card class="card hexiaoCard"> <el-card class="card hexiaoCard">
<el-descriptions :column="3" border> <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.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
<el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag> <el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
<el-tag>{{ verificationData.nairaCount.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"> <template v-if="!Object.keys(writeOffTotal).length">
0 0
</template> </template>
...@@ -267,16 +284,22 @@ ...@@ -267,16 +284,22 @@
{{amount}}{{getCurrencyLabel(currency)}} {{amount}}{{getCurrencyLabel(currency)}}
</div> </div>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
{{ $t('已核销基准币种总金额') }}（{{getCurrencyLabel(showCurrencyId)}}） {{ $t('核销基准币种已核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('为了方便统计收款单核销比例，将所有银行收款明细中状态为已核销的实收金额，转换为核销基准币种的金额累加')"><i class="el-icon-question"></i></span>
</template> </template>
{{ writeOffAmount}} {{ writeOffAmount}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
{{ $t('已核销比例\n（已核销基准币种总金额/应收总金额）') }}（{{getCurrencyLabel(showCurrencyId)}}） {{ $t('总核销比例') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额')"><i class="el-icon-question"></i></span>
</template> </template>
{{ WriteOffProportion }}% {{ WriteOffProportion }}%
</el-descriptions-item> </el-descriptions-item>
...@@ -286,9 +309,9 @@ ...@@ -286,9 +309,9 @@
<el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button> <el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button>
<el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button> <el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button>
</div> </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"> <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('收款单号')">{{ form.receiptNo }}</el-form-item>
<el-form-item :label="$t('剩余应收金额')"> <el-form-item :label="$t('剩余应收金额')">
<template v-if="surplusData.length==0"> <template v-if="surplusData.length==0">
...@@ -346,7 +369,7 @@ ...@@ -346,7 +369,7 @@
<el-option <el-option
v-for="item in currencyList" v-for="item in currencyList"
:key="item.id" :key="item.id"
:label="item.titleZh" :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
...@@ -361,7 +384,10 @@ ...@@ -361,7 +384,10 @@
:rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }" :rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }"
> >
<template slot="label"> <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> </template>
<el-input v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input> <el-input v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
<span v-else>{{ addForm.rate}}</span> <span v-else>{{ addForm.rate}}</span>
...@@ -415,6 +441,7 @@ ...@@ -415,6 +441,7 @@
</template> </template>
<script> <script>
import helpIcon from "@/assets/images/help.png"
import { getBankAccountPage } from "@/api/ecw/bankAccount"; import { getBankAccountPage } from "@/api/ecw/bankAccount";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { listSimpleDepts } from "@/api/system/dept"; import { listSimpleDepts } from "@/api/system/dept";
...@@ -435,6 +462,7 @@ import { ...@@ -435,6 +462,7 @@ import {
import { getCurrencyPage } from "@/api/ecw/currency"; import { getCurrencyPage } from "@/api/ecw/currency";
import NP from 'number-precision' import NP from 'number-precision'
export default { export default {
data() { data() {
return { return {
...@@ -631,7 +659,7 @@ export default { ...@@ -631,7 +659,7 @@ export default {
// if(n && n.discountTotal&&n.discountTotal>0){ // if(n && n.discountTotal&&n.discountTotal>0){
// amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)}) // amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)})
// }else{ // }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 { ...@@ -661,7 +689,7 @@ export default {
}, },
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
calculation() { calculation() {
......
src/views/ecw/financial/receivable.vue
View file @ 1a9aea20
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
methods: { methods: {
getCurrencyLabel(id){ getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == 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 '' return ''
}, },
/** 查询列表 */ /** 查询列表 */
......
src/views/index_old.vue deleted 100644 → 0
View file @ 7668b8fb
This diff is collapsed.
src/views/member/user/index.vue
View file @ 1a9aea20
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" /> <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<div v-if="!scope.row.identityAuditStatus">{{$t('未提交')}}</div> <div v-if="!scope.row.identityAuditStatus">{{$t('未提交')}}</div>
<dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.identityAuditStatus" ></dict-tag> <dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.identityAuditStatus" ></dict-tag>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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" > <template slot-scope="scope" >
<el-button size="mini" type="text" @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button> <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> <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 @@ ...@@ -3,26 +3,26 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh"> <el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="标题英文" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> <el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </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" <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -42,26 +42,26 @@ ...@@ -42,26 +42,26 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" /> <el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" /> <el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" /> <el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<el-table-column label="内容中文" align="center" prop="contentZh" /> <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />
<el-table-column label="内容英语" align="center" prop="contentEn" /> <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.HELP_DOC_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.HELP_DOC_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -72,19 +72,19 @@ ...@@ -72,19 +72,19 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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="80px">
<el-form-item label="标题中文" prop="titleZh"> <el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" /> <el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item> </el-form-item>
<el-form-item label="标题英文" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item> </el-form-item>
<el-form-item label="内容中文" prop="contentZh"> <el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :min-height="192"/> <editor v-model="form.contentZh" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item label="内容英语" prop="contentEn"> <el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :min-height="192"/> <editor v-model="form.contentEn" :min-height="192"/>
</el-form-item> </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-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_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> :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加帮助文档"; this.title = this.$t("添加帮助文档");
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
getHelpDoc(id).then(response => { getHelpDoc(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改帮助文档"; this.title = this.$t("修改帮助文档");
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateHelpDoc(this.form).then(response => { updateHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createHelpDoc(this.form).then(response => { createHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -228,11 +228,11 @@ export default { ...@@ -228,11 +228,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除帮助文档编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteHelpDoc(id); return deleteHelpDoc(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -243,7 +243,7 @@ export default { ...@@ -243,7 +243,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有帮助文档数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有帮助文档数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportHelpDocExcel(params); return exportHelpDocExcel(params);
}).then(response => { }).then(response => {
......
src/views/system/internalHelpDoc/index.vue
View file @ 1a9aea20
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh"> <el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="标题英文" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> <el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </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" <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <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>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -41,25 +41,25 @@ ...@@ -41,25 +41,25 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" /> <el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" /> <el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" /> <el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<!-- <el-table-column label="内容中文" align="center" prop="contentZh" />--> <!-- <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />-->
<!-- <el-table-column label="内容英语" align="center" prop="contentEn" />--> <!-- <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />-->
<el-table-column label="状态" align="center" prop="status" /> <el-table-column :label="$t('状态')" align="center" prop="status" />
<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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <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)" <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/> @pagination="getList"/>
...@@ -67,17 +67,17 @@ ...@@ -67,17 +67,17 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题中文" prop="titleZh"> <el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" /> <el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item> </el-form-item>
<el-form-item label="标题英文" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item> </el-form-item>
<el-form-item label="内容中文" prop="contentZh"> <el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" placeholder="请输入内容中文" /> <editor v-model="form.contentZh" :placeholder="$t('请输入内容中文')" />
</el-form-item> </el-form-item>
<el-form-item label="内容英语" prop="contentEn"> <el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" placeholder="请输入内容英语" /> <editor v-model="form.contentEn" :placeholder="$t('请输入内容英语')" />
</el-form-item> </el-form-item>
<el-form-item label="0-启用,1-停用" prop="status"> <el-form-item label="0-启用,1-停用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
...@@ -185,7 +185,7 @@ export default { ...@@ -185,7 +185,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加对内帮助文档"; this.title = this.$t("添加对内帮助文档");
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
getInternalHelpDoc(id).then(response => { getInternalHelpDoc(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改对内帮助文档"; this.title = this.$t("修改对内帮助文档");
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateInternalHelpDoc(this.form).then(response => { updateInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -214,7 +214,7 @@ export default { ...@@ -214,7 +214,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createInternalHelpDoc(this.form).then(response => { createInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -223,11 +223,11 @@ export default { ...@@ -223,11 +223,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除对内帮助文档编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除对内帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteInternalHelpDoc(id); return deleteInternalHelpDoc(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有对内帮助文档数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有对内帮助文档数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportInternalHelpDocExcel(params); return exportInternalHelpDocExcel(params);
}).then(response => { }).then(response => {
......
src/views/system/needKnow/index.vue
View file @ 1a9aea20
This diff is collapsed.
src/views/system/notice/index.vue
View file @ 1a9aea20
This diff is collapsed.
yarn.lock
View file @ 1a9aea20
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment