Skip to content

J
jiedao-app-operator-master
Commit c7ac5734 authored by Marcus's avatar Marcus
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 8b5d1375 457d8c36
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 267 deletions
src/utils/dict.js
View file @ c7ac5734
...@@ -142,7 +142,7 @@ export const DICT_TYPE = { ...@@ -142,7 +142,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 ECASH_INIT:'ecash_init', //e-cash
} }
/** /**
......
src/views/ecw/currencyEcash/index.vue
View file @ c7ac5734
<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-item label="中文名称" prop="titleZh">-->
<!-- <el-input v-model="queryParams.titleZh" placeholder="请输入中文名称" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="英文名称" prop="titleEn">-->
<!-- <el-input v-model="queryParams.titleEn" placeholder="请输入英文名称" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货币符号" prop="fuhao">-->
<!-- <el-input v-model="queryParams.fuhao" placeholder="请输入货币符号" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态" prop="status">-->
<!-- <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-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="汇率" prop="huilv">-->
<!-- <el-input v-model="queryParams.huilv" placeholder="请输入汇率" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="排序" prop="aorder">-->
<!-- <el-input v-model="queryParams.aorder" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" prop="createAt">-->
<!-- <el-input v-model="queryParams.createAt" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" prop="updateAt">-->
<!-- <el-input v-model="queryParams.updateAt" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>-->
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
<!-- </el-form-item>-->
<!-- </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="warning" plain icon="el-icon-plus" size="mini" @click="handleUpdate" <el-button type="warning" plain icon="el-icon-plus" size="mini" @click="handleUpdate"
v-hasPermi="['ecw:currency:update']">修改</el-button> v-hasPermi="['ecw:currency:update']">修改
</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="fromFee"> <el-table-column label="金额" align="center" prop="fromFee">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.fromFee}}{{ scope.row.fromCurrency | currencyDataFilter(currencyDictDatas) }}</span> <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="fromCurrency">-->
<!-- <template slot-scope="scope">-->
<!-- <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">=</el-table-column>
<el-table-column label="兑换金额" align="center"> <el-table-column label="兑换金额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -76,53 +29,35 @@ ...@@ -76,53 +29,35 @@
<span>{{ scope.row.toCurrency | currencyDataFilter(currencyDictDatas) }}</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">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row,scope)"-->
<!-- v-hasPermi="['ecw:currency:update']">修改</el-button>-->
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['ecw:currency:delete']">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
<el-card> <el-card>
<el-form ref="retForm" :model="retForm"> <el-form ref="retForm" :model="retForm">
<el-form-item label="有效时间（尼日利亚）"> <el-form-item label="有效时间（尼日利亚）">
<el-col :span="3"> <el-col :span="3">
<el-date-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" v-model="this.ecashDatas.find(item=>item.value == 1).label" style="width: 100%;"></el-date-picker> <el-date-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
v-model="this.ecashDatas.find(item=>item.value == 1).label"
style="width: 100%;"></el-date-picker>
</el-col> </el-col>
<el-col :span="1" align="center">-</el-col> <el-col :span="1" align="center">-</el-col>
<el-col :span="3"> <el-col :span="3">
<el-time-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" v-model="this.ecashDatas.find(item=>item.value == 2).label" style="width: 100%;"></el-time-picker> <el-time-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
v-model="this.ecashDatas.find(item=>item.value == 2).label"
style="width: 100%;"></el-time-picker>
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form> <el-form>
<el-form-item label="有效时间（北京）"> <el-form-item label="有效时间（北京）">
<el-col :span="3"> <el-col :span="3">
<el-date-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" v-model="this.ecashDatas.find(item=>item.value == 3).label" style="width: 100%;"></el-date-picker> <el-date-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
v-model="this.ecashDatas.find(item=>item.value == 3).label"
style="width: 100%;"></el-date-picker>
</el-col> </el-col>
<el-col align="center" :span="1">-</el-col> <el-col align="center" :span="1">-</el-col>
<el-col :span="3"> <el-col :span="3">
<el-time-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" v-model="this.ecashDatas.find(item=>item.value == 4).label" style="width: 100%;"></el-time-picker> <el-time-picker type="datetime" disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
v-model="this.ecashDatas.find(item=>item.value == 4).label"
style="width: 100%;"></el-time-picker>
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -132,15 +67,15 @@ ...@@ -132,15 +67,15 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<!-- &lt;!&ndash; 分页组件 &ndash;&gt;--> <!-- &lt;!&ndash; 分页组件 &ndash;&gt;-->
<!-- <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"/>-->
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="700px" 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="fromFee"> <el-form-item label="金额" prop="fromFee">
<el-input v-model="form.fromFee" placeholder="请输入金额" /> <el-input v-model="form.fromFee" placeholder="请输入金额"/>
</el-form-item> </el-form-item>
<el-form-item label="货币类型" prop="fromCurrency"> <el-form-item label="货币类型" prop="fromCurrency">
<el-select v-model="form.fromCurrency" clearable> <el-select v-model="form.fromCurrency" clearable>
...@@ -149,7 +84,7 @@ ...@@ -149,7 +84,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="兑换金额" prop="toFee"> <el-form-item label="兑换金额" prop="toFee">
<el-input v-model="form.toFee" 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="请输入状态" />-->
...@@ -161,16 +96,20 @@ ...@@ -161,16 +96,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="开始时间（尼日利亚）" prop="nrlyStartTime"> <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-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="nrlyEndTime"> <el-form-item label="结束时间（尼日利亚）" prop="nrlyEndTime">
<el-date-picker v-model="form.nrlyEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择结束时间"></el-date-picker> <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>
<el-form-item label="开始时间（北京）" prop="bjStartTime"> <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-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>
<el-form-item label="结束时间（北京）" prop="bjEndTime"> <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-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>
<el-form-item label="过期提示语" prop="remark"> <el-form-item label="过期提示语" prop="remark">
<el-input v-model="form.remark" type="textarea"></el-input> <el-input v-model="form.remark" type="textarea"></el-input>
...@@ -191,21 +130,27 @@ ...@@ -191,21 +130,27 @@
</template> </template>
<script> <script>
import { createCurrencyEcash, updateCurrencyEcash, deleteCurrencyEcash, getCurrencyEcash, getCurrencyEcashPage, exportCurrencyEcashExcel } from "@/api/ecw/currencyEcash"; import {
import {CommonStatusEnum} from "@/utils/constants"; createCurrencyEcash,
import {changeUserStatus} from "@/api/system/user"; updateCurrencyEcash,
import {DICT_TYPE, getDictDatas} from "@/utils/dict"; deleteCurrencyEcash,
getCurrencyEcash,
getCurrencyEcashPage,
exportCurrencyEcashExcel
} from "@/api/ecw/currencyEcash";
import {CommonStatusEnum} from "@/utils/constants";
import {changeUserStatus} from "@/api/system/user";
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
export default { export default {
name: "CurrencyEcash", name: "CurrencyEcash",
components: { components: {},
filters: {
currencyDataFilter(e, currencyDictDatas) {
if (e) return currencyDictDatas.find(item => item.value == e).label
}, },
filters:{ ecashDataFilter(e, ecashDatas) {
currencyDataFilter(e,currencyDictDatas) { if (e) return ecashDatas.find(item => item.value == e).label
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() {
...@@ -225,8 +170,8 @@ export default { ...@@ -225,8 +170,8 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
dateRangeCreateTime: [], dateRangeCreateTime: [],
showFlag:false, showFlag: false,
startTime:"", startTime: "",
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
...@@ -238,15 +183,14 @@ export default { ...@@ -238,15 +183,14 @@ export default {
huilv: null, huilv: null,
aorder: null, aorder: null,
}, },
retForm:{}, retForm: {},
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
},
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS), statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
currencyDictDatas: getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE), currencyDictDatas: getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE),
ecashDatas:getDictDatas(DICT_TYPE.ECASH_INIT), ecashDatas: getDictDatas(DICT_TYPE.ECASH_INIT),
}; };
}, },
created() { created() {
...@@ -313,11 +257,11 @@ export default { ...@@ -313,11 +257,11 @@ export default {
// this.title = "修改E-Cash汇率单位"; // this.title = "修改E-Cash汇率单位";
// }); // });
}, },
updateEcash(row){ updateEcash(row) {
updateCurrencyEcash(row).then(response => { updateCurrencyEcash(row).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.getList(); this.getList();
this.showFlag=false; this.showFlag = false;
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -346,12 +290,13 @@ export default { ...@@ -346,12 +290,13 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除E-Cash汇率单位编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除E-Cash汇率单位编号为"' + id + '"的数据项?').then(function () {
return deleteCurrencyEcash(id); return deleteCurrencyEcash(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
...@@ -367,8 +312,9 @@ export default { ...@@ -367,8 +312,9 @@ export default {
}).then(response => { }).then(response => {
this.$download.excel(response, '${table.classComment}.xls'); this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {
});
} }
} }
}; };
</script> </script>
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