Skip to content

J
jiedao-app-operator-master
Commit 9f6eac52 authored by huyufeng's avatar huyufeng
Browse files
Options

ecash

parent 6b54d1d9
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 73 deletions
src/utils/dict.js
View file @ 9f6eac52
...@@ -140,7 +140,7 @@ export const DICT_TYPE = { ...@@ -140,7 +140,7 @@ export const DICT_TYPE = {
BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别 BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
ORDER_ERROR_TYPE:'order_error_type',//订单异常类型 ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态 ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
ECASH_INIT:'ecash_init',//e-cash
} }
/** /**
......
src/views/ecw/currencyEcash/index.vue
View file @ 9f6eac52
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<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="中文名称" prop="titleZh">-->
<el-input v-model="queryParams.titleZh" placeholder="请输入中文名称" clearable @keyup.enter.native="handleQuery"/> <!-- <el-input v-model="queryParams.titleZh" placeholder="请输入中文名称" clearable @keyup.enter.native="handleQuery"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="英文名称" prop="titleEn"> <!-- <el-form-item label="英文名称" prop="titleEn">-->
<el-input v-model="queryParams.titleEn" placeholder="请输入英文名称" clearable @keyup.enter.native="handleQuery"/> <!-- <el-input v-model="queryParams.titleEn" placeholder="请输入英文名称" clearable @keyup.enter.native="handleQuery"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="货币符号" prop="fuhao"> <!-- <el-form-item label="货币符号" prop="fuhao">-->
<el-input v-model="queryParams.fuhao" placeholder="请输入货币符号" clearable @keyup.enter.native="handleQuery"/> <!-- <el-input v-model="queryParams.fuhao" placeholder="请输入货币符号" clearable @keyup.enter.native="handleQuery"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="状态" prop="status"> <!-- <el-form-item label="状态" prop="status">-->
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px"> <!-- <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">-->
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> <!-- <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="汇率" prop="huilv">--> <!-- <el-form-item label="汇率" prop="huilv">-->
<!-- <el-input v-model="queryParams.huilv" placeholder="请输入汇率" clearable @keyup.enter.native="handleQuery"/>--> <!-- <el-input v-model="queryParams.huilv" placeholder="请输入汇率" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
...@@ -28,81 +28,142 @@ ...@@ -28,81 +28,142 @@
<!-- <el-form-item label="" prop="updateAt">--> <!-- <el-form-item label="" prop="updateAt">-->
<!-- <el-input v-model="queryParams.updateAt" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>--> <!-- <el-input v-model="queryParams.updateAt" placeholder="请输入" 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">搜索</el-button>-->
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
<!-- v-hasPermi="['ecw:currency:create']">新增</el-button>-->
<!-- </el-col>-->
<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="warning" plain icon="el-icon-plus" size="mini" @click="handleUpdate"
v-hasPermi="['ecw:currency:create']">新增</el-button> v-hasPermi="['ecw:currency:update']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:currency:export']">导出</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
<!-- v-hasPermi="['ecw:currency:export']">导出</el-button>-->
<!-- </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="" align="center" prop="id" />
<el-table-column label="中文名称" align="center" prop="titleZh" /> <el-table-column label="金额" align="center" prop="fromFee">
<el-table-column label="英文名称" align="center" prop="titleEn" />
<el-table-column label="货币符号" align="center" prop="fuhao" />
<el-table-column label="状态" align="center" prop="show" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" /> <span>{{scope.row.fromFee}}{{ scope.row.fromCurrency | currencyDataFilter(currencyDictDatas) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="汇率" align="center" prop="huilv" /> <!-- <el-table-column label="货币类型" align="center" prop="fromCurrency">-->
<el-table-column label="排序" align="center" prop="aorder" /> <!-- <template slot-scope="scope">-->
<el-table-column label="" align="center" prop="createAt" width="180"> <!-- <span>{{ scope.row.fromCurrency | currencyDataFilter(currencyDictDatas) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="" align="center">=</el-table-column>
<el-table-column label="兑换金额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createAt) }}</span> <el-input v-show="showFlag" v-model="scope.row.toFee" type="text" @blur="updateEcash(scope.row)"></el-input>
<span v-show="!showFlag">{{ scope.row.toFee}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" align="center" prop="updateAt" width="180"> <el-table-column label="兑换货币类型" align="center" prop="toCurrency">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateAt) }}</span> <span>{{ scope.row.toCurrency | currencyDataFilter(currencyDictDatas) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="货币符号" align="center" prop="fuhao" />-->
<!-- <el-table-column label="状态" align="center" prop="show" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="汇率" align="center" prop="huilv" />-->
<!-- <el-table-column label="排序" align="center" prop="aorder" />-->
<!-- <el-table-column label="" align="center" prop="createAt" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createAt) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="" align="center" prop="updateAt" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.updateAt) }}</span>-->
<!-- </template>-->
<!-- </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">
<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,scope)"-->
v-hasPermi="['ecw:currency:update']">修改</el-button> <!-- v-hasPermi="['ecw:currency:update']">修改</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:currency:delete']">删除</el-button> <!-- v-hasPermi="['ecw:currency:delete']">删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <el-card>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <el-form ref="retForm" :model="retForm">
@pagination="getList"/> <el-form-item label="开始时间（尼日利亚）:" prop="nrlyStartTime">
<span>{{ 1 | ecashDataFilter(ecashDatas) }}</span>
</el-form-item>
<el-form-item label="结束时间（尼日利亚）:" prop="nrlyEndTime">
<span>{{ 2 | ecashDataFilter(ecashDatas) }}</span>
</el-form-item>
<el-form-item label="开始时间（北京）:" prop="bjStartTime">
<span>{{ 3 | ecashDataFilter(ecashDatas) }}</span>
</el-form-item>
<el-form-item label="结束时间（北京）:" prop="bjEndTime">
<span>{{ 4 | ecashDataFilter(ecashDatas) }}</span>
</el-form-item>
<el-form-item label="过期提示语:" prop="remark">
<span>{{ 5 | ecashDataFilter(ecashDatas) }}</span>
</el-form-item>
</el-form>
</el-card>
<!-- &lt;!&ndash; 分页组件 &ndash;&gt;-->
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"/>-->
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="中文名称" prop="titleZh"> <el-form-item label="金额" prop="fromFee">
<el-input v-model="form.titleZh" placeholder="请输入中文名称" /> <el-input v-model="form.fromFee" placeholder="请输入金额" />
</el-form-item> </el-form-item>
<el-form-item label="英文名称" prop="titleEn"> <el-form-item label="货币类型" prop="fromCurrency">
<el-input v-model="form.titleEn" placeholder="请输入英文名称" /> <el-select v-model="form.fromCurrency" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)" :key="parseInt(dict.value)"
:label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="货币符号" prop="fuhao"> <el-form-item label="兑换金额" prop="toFee">
<el-input v-model="form.fuhao" placeholder="请输入货币符号" /> <el-input v-model="form.toFee" placeholder="请输入兑换金额" />
</el-form-item> </el-form-item>
<!-- <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="兑换货币类型" prop="toCurrency">
<el-input v-model="form.huilv" placeholder="请输入汇率" /> <el-select v-model="form.toCurrency" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)" :key="parseInt(dict.value)"
:label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间（尼日利亚）" prop="nrlyStartTime">
<el-date-picker v-model="form.nrlyStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择开始时间"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="aorder"> <el-form-item label="结束时间（尼日利亚）" prop="nrlyEndTime">
<el-input v-model="form.aorder" placeholder="请输入排序" /> <el-date-picker v-model="form.nrlyEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择结束时间"></el-date-picker>
</el-form-item>
<el-form-item label="开始时间（北京）" prop="bjStartTime">
<el-date-picker v-model="form.bjStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择开始时间"></el-date-picker>
</el-form-item>
<el-form-item label="结束时间（北京）" prop="bjEndTime">
<el-date-picker v-model="form.bjEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择结束时间"></el-date-picker>
</el-form-item>
<el-form-item label="过期提示语" prop="remark">
<el-input v-model="form.remark" type="textarea"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="" prop="createAt">--> <!-- <el-form-item label="" prop="createAt">-->
<!-- <el-input v-model="form.createAt" placeholder="请输入" />--> <!-- <el-input v-model="form.createAt" placeholder="请输入" />-->
...@@ -129,6 +190,14 @@ export default { ...@@ -129,6 +190,14 @@ export default {
name: "CurrencyEcash", name: "CurrencyEcash",
components: { components: {
}, },
filters:{
currencyDataFilter(e,currencyDictDatas) {
if(e) return currencyDictDatas.find(item=>item.value == e).label
},
ecashDataFilter(e,ecashDatas) {
if(e) return ecashDatas.find(item=>item.value == e).label
}
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -146,6 +215,7 @@ export default { ...@@ -146,6 +215,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateRangeCreateTime: [], dateRangeCreateTime: [],
showFlag:false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
...@@ -157,13 +227,15 @@ export default { ...@@ -157,13 +227,15 @@ export default {
huilv: null, huilv: null,
aorder: null, aorder: null,
}, },
retForm:{},
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
}, },
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS), statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
currencyDictDatas: getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE),
ecashDatas:getDictDatas(DICT_TYPE.ECASH_INIT),
}; };
}, },
created() { created() {
...@@ -179,6 +251,7 @@ export default { ...@@ -179,6 +251,7 @@ export default {
// 执行查询 // 执行查询
getCurrencyEcashPage(params).then(response => { getCurrencyEcashPage(params).then(response => {
this.list = response.data.list; this.list = response.data.list;
this.retForm = response.data.list[0];
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
}); });
...@@ -219,13 +292,21 @@ export default { ...@@ -219,13 +292,21 @@ export default {
this.title = "添加E-Cash汇率单位"; this.title = "添加E-Cash汇率单位";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate() {
this.reset(); this.showFlag = true;
const id = row.id; // this.reset();
getCurrencyEcash(id).then(response => { // const id = row.id;
this.form = response.data; // getCurrencyEcash(id).then(response => {
this.open = true; // this.form = response.data;
this.title = "修改E-Cash汇率单位"; // this.open = true;
// this.title = "修改E-Cash汇率单位";
// });
},
updateEcash(row){
updateCurrencyEcash(row).then(response => {
this.$modal.msgSuccess("修改成功");
this.getList();
this.showFlag=false;
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -235,14 +316,14 @@ export default { ...@@ -235,14 +316,14 @@ export default {
return; return;
} }
// 修改的提交 // 修改的提交
if (this.form.id != null) { // if (this.form.id != null) {
updateCurrencyEcash(this.form).then(response => { // updateCurrencyEcash(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); // this.$modal.msgSuccess("修改成功");
this.open = false; // this.open = false;
this.getList(); // this.getList();
}); // });
return; // return;
} // }
// 添加的提交 // 添加的提交
createCurrencyEcash(this.form).then(response => { createCurrencyEcash(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
......
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