liweiliang
/
bitcopay-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

otc订单

master
yyc 3 years ago
parent
fde4ba10a5
commit
19d73676d1
3 changed files with 333 additions and 247 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/views/otc/otcAppealConfig/index.vue
  2. 295
      src/views/otc/otcOrder/index.vue
  3. 249
      src/views/otc/otcStoreOrder/index.vue

36
src/views/otc/otcAppealConfig/index.vue
View File

@ -69,7 +69,7 @@
<el-table-column label="流水编号" align="center" prop="id" /> <el-table-column label="流水编号" align="center" prop="id" />
<el-table-column label="申诉描述" align="center" prop="remark" /> <el-table-column label="申诉描述" align="center" prop="remark" />
<el-table-column label="申诉终端" align="center" prop="terminalSource" /> <el-table-column label="申诉终端" align="center" prop="terminalSource" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<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 <el-button
@ -107,19 +107,27 @@
<el-form-item label="申诉终端" prop="terminalSource"> <el-form-item label="申诉终端" prop="terminalSource">
<el-input v-model="form.terminalSource" placeholder="请输入申诉终端" /> <el-input v-model="form.terminalSource" placeholder="请输入申诉终端" />
</el-form-item> </el-form-item>
<el-form-item label="是否启用YN"> <el-form-item label="是否">
<el-radio-group v-model="form.status"> <!-- <el-radio-group v-model="form.status">-->
<el-radio label="1">请选择字典生成</el-radio> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <el-select v-model="form.status" placeholder="请选择状态" clearable size="small">
<el-form-item label="添加时间" prop="createTime"> <el-option
<el-date-picker clearable size="small" v-for="dict in statusOptions"
v-model="form.createTime" :key="dict.dictValue"
type="date" :label="dict.dictLabel"
value-format="yyyy-MM-dd" :value="dict.dictValue"
placeholder="选择添加时间"> />
</el-date-picker> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="添加时间" prop="createTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="form.createTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择添加时间">-->
<!-- </el-date-picker>-->
<!-- </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">确 定</el-button>
@ -203,7 +211,7 @@ export default {
id: null, id: null,
remark: null, remark: null,
terminalSource: null, terminalSource: null,
status: "0", status: "Y",
createTime: null createTime: null
}; };
this.resetForm("form"); this.resetForm("form");

295
src/views/otc/otcOrder/index.vue
View File

@ -13,8 +13,8 @@
<el-form-item label="交易类型" prop="appealStatus"> <el-form-item label="交易类型" prop="tradeType">
<el-select v-model="queryParams.tradeTypeStatus" placeholder="请选择交易类型" clearable size="small"> <el-select v-model="queryParams.tradeType" placeholder="请选择交易类型" clearable size="small">
<el-option <el-option
v-for="dict in tradeTypeStatusOptions" v-for="dict in tradeTypeStatusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -25,19 +25,19 @@
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="feeType"> <!-- <el-form-item label="类型" prop="feeType">-->
<el-select v-model="queryParams.feeType" placeholder="请选择类型" clearable size="small"> <!-- <el-select v-model="queryParams.feeType" placeholder="请选择类型" clearable size="small">-->
<el-option <!-- <el-option-->
v-for="dict in feeTypeOptions" <!-- v-for="dict in feeTypeOptions"-->
:key="dict.dictValue" <!-- :key="dict.dictValue"-->
:label="dict.dictLabel" <!-- :label="dict.dictLabel"-->
:value="dict.dictValue" <!-- :value="dict.dictValue"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.feeTypeStatus" placeholder="请选择订单状态" clearable size="small"> <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable size="small">
<el-option <el-option
v-for="dict in orderStatusOptions" v-for="dict in orderStatusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -56,38 +56,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['otc:otcOrder:add']" <!-- v-hasPermi="['otc:otcOrder:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['otc:otcOrder:edit']" <!-- v-hasPermi="['otc:otcOrder:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['otc:otcOrder:remove']" <!-- v-hasPermi="['otc:otcOrder:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -103,41 +103,41 @@
<el-table v-loading="loading" :data="otcOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="otcOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="流水编号" align="center" prop="id" /> <!-- <el-table-column label="流水编号" align="center" prop="id" />-->
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="总订单编号" align="center" prop="storeOrder" /> <el-table-column label="总订单id" align="center" prop="storeOrder" />
<el-table-column label="交易类型" align="center" prop="tradeType" :formatter="tradeTypeFormat" /> <el-table-column label="交易类型" align="center" prop="tradeType" :formatter="tradeTypeFormat" />
<el-table-column label="商家编号" align="center" prop="storeId" /> <el-table-column label="商家昵称" align="center" prop="storeName" />
<el-table-column label="用户编号" align="center" prop="userId" /> <el-table-column label="用户名称" align="center" prop="userName" />
<el-table-column label="币种" align="center" prop="coin" /> <el-table-column label="币种" align="center" prop="coin" />
<el-table-column label="买入或卖出数量" align="center" prop="realityCoinNum" /> <el-table-column label="交易数量" align="center" prop="realityCoinNum" />
<el-table-column label="实际买入或者卖出的法币金额" align="center" prop="realityLegalNums" /> <el-table-column label="实际数量" align="center" prop="realitySettleCoinNums" />
<el-table-column label="结算得到数量" align="center" prop="realitySettleCoinNums" /> <el-table-column label="法币金额" align="center" prop="realityLegalNums" />
<el-table-column label="法币价格" align="center" prop="legalCurrency" /> <el-table-column label="法币价格" align="center" prop="legalCurrency" />
<el-table-column label="类型" align="center" prop="feeType" :formatter="feeTypeFormat"/> <!-- <el-table-column label="手续费类型" align="center" prop="feeType" :formatter="feeTypeFormat"/>-->
<el-table-column label="手续费" align="center" prop="fee" /> <el-table-column label="手续费" align="center" prop="fee" />
<el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" /> <el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" />
<el-table-column label="支付方式" align="center" prop="paymentType" /> <el-table-column label="支付方式" align="center" prop="paymentType" />
<el-table-column label="付款时间倒计时" align="center" prop="paymentEndTime" width="180"> <!-- <el-table-column label="付款时间倒计时" align="center" prop="paymentEndTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.paymentEndTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.paymentEndTime, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="确定放行时间" align="center" prop="releaseTime" width="180"> <!-- <el-table-column label="确定放行时间" align="center" prop="releaseTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.releaseTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.releaseTime) }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="支付时间" align="center" prop="paymentTime" width="180"> <!-- <el-table-column label="支付时间" align="center" prop="paymentTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.paymentTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.paymentTime) }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="完成时间" align="center" prop="closeTime" width="180"> <!-- <el-table-column label="完成时间" align="center" prop="closeTime" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.closeTime, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.closeTime) }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="收款人" align="center" prop="payee" /> <el-table-column label="收款人" align="center" prop="payee" />
<el-table-column label="收款银行" align="center" prop="collectionBank" /> <el-table-column label="收款银行" align="center" prop="collectionBank" />
<el-table-column label="收款账号" align="center" prop="collectionAccount" /> <el-table-column label="收款账号" align="center" prop="collectionAccount" />
@ -154,14 +154,14 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['otc:otcOrder:edit']" v-hasPermi="['otc:otcOrder:edit']"
>修改</el-button> >详情</el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['otc:otcOrder:remove']" <!-- v-hasPermi="['otc:otcOrder:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -175,8 +175,8 @@
/> />
<!-- 添加或修改用户otc订单对话框 --> <!-- 添加或修改用户otc订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单编号" /> <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
</el-form-item> </el-form-item>
@ -185,77 +185,95 @@
</el-form-item> </el-form-item>
<el-form-item label="交易类型" prop="tradeType"> <el-form-item label="交易类型" prop="tradeType">
<el-select v-model="form.tradeType" placeholder="请选择交易类型"> <el-select v-model="form.tradeType" placeholder="请选择交易类型">
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in tradeTypeStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商家编号" prop="storeId"> <el-form-item label="商家编号" prop="storeId">
<el-input v-model="form.storeId" placeholder="请输入商家编号" /> <el-input v-model="form.storeName" placeholder="请输入商家编号" />
</el-form-item> </el-form-item>
<el-form-item label="用户编号" prop="userId"> <el-form-item label="用户编号" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户编号" /> <el-input v-model="form.userName" placeholder="请输入用户编号" />
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="coin"> <el-form-item label="币种" prop="coin">
<el-input v-model="form.coin" placeholder="请输入币种" /> <el-input v-model="form.coin" placeholder="请输入币种" />
</el-form-item> </el-form-item>
<el-form-item label="买入或卖出数量" prop="realityCoinNum"> <el-form-item label="交易数量" prop="realityCoinNum">
<el-input v-model="form.realityCoinNum" placeholder="请输入买入或卖出数量" /> <el-input v-model="form.realityCoinNum" placeholder="请输入交易数量" />
</el-form-item>
<el-form-item label="实际买入或者卖出的法币金额" prop="realityLegalNums">
<el-input v-model="form.realityLegalNums" placeholder="请输入实际买入或者卖出的法币金额" />
</el-form-item> </el-form-item>
<el-form-item label="结算得到数量" prop="realitySettleCoinNums"> <el-form-item label="得到数量" prop="realitySettleCoinNums">
<el-input v-model="form.realitySettleCoinNums" placeholder="请输入结算得到数量" /> <el-input v-model="form.realitySettleCoinNums" placeholder="请输入结算得到数量" />
</el-form-item> </el-form-item>
<el-form-item label="法币金额" prop="realityLegalNums">
<el-input v-model="form.realityLegalNums" placeholder="请输入法币金额" />
</el-form-item>
<el-form-item label="法币价格" prop="legalCurrency"> <el-form-item label="法币价格" prop="legalCurrency">
<el-input v-model="form.legalCurrency" placeholder="请输入法币价格" /> <el-input v-model="form.legalCurrency" placeholder="请输入法币价格" />
</el-form-item> </el-form-item>
<el-form-item label="类型：pen：按笔，percentage：百分比" prop="feeType"> <el-form-item label="手续费类型" prop="feeType">
<el-select v-model="form.feeType" placeholder="请选择类型：pen：按笔，percentage：百分比"> <el-select v-model="form.feeType" placeholder="请选择类型">
<el-option label="请选择字典生成" value="" /> <el-option
v-for="dict in feeTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手续费" prop="fee"> <el-form-item label="手续费" prop="fee">
<el-input v-model="form.fee" placeholder="请输入手续费" /> <el-input v-model="form.fee" placeholder="请输入手续费" />
</el-form-item> </el-form-item>
<el-form-item label="订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）"> <el-form-item label="订单状态">
<el-radio-group v-model="form.orderStatus"> <!-- <el-radio-group v-model="form.orderStatus">-->
<el-radio label="1">请选择字典生成</el-radio> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
<el-select v-model="form.orderStatus" placeholder="请选择订单状态">
<el-option
v-for="dict in orderStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="支付方式" prop="paymentType"> <el-form-item label="支付方式" prop="paymentType">
<el-select v-model="form.paymentType" placeholder="请选择支付方式"> <el-select v-model="form.paymentType" placeholder="请选择支付方式">
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="付款时间倒计时" prop="paymentEndTime"> <!-- <el-form-item label="付款结束时间" prop="paymentEndTime">-->
<el-date-picker clearable size="small" <!-- <el-date-picker clearable size="small"-->
v-model="form.paymentEndTime" <!-- v-model="form.paymentEndTime"-->
type="date" <!-- type="dateTime"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd hh:mm:ss"-->
placeholder="选择付款时间倒计时"> <!-- placeholder="选择付款结束时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="确定放行时间" prop="releaseTime"> <!-- <el-form-item label="确定放行时间" prop="releaseTime">-->
<el-date-picker clearable size="small" <!-- <el-date-picker clearable size="small"-->
v-model="form.releaseTime" <!-- v-model="form.releaseTime"-->
type="date" <!-- type="dateTime"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd hh:mm:ss"-->
placeholder="选择确定放行时间"> <!-- placeholder="选择确定放行时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="支付时间" prop="paymentTime"> <el-form-item label="支付时间" prop="paymentTime">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="form.paymentTime" v-model="form.paymentTime"
type="date" type="dateTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss"
placeholder="选择支付时间"> placeholder="选择支付时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="完成时间" prop="closeTime"> <el-form-item label="完成时间" prop="closeTime">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="form.closeTime" v-model="form.closeTime"
type="date" type="dateTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd hh:mm:ss"
placeholder="选择完成时间"> placeholder="选择完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -278,18 +296,32 @@
<el-input v-model="form.appealOrderId" placeholder="请输入申诉订单编号" /> <el-input v-model="form.appealOrderId" placeholder="请输入申诉订单编号" />
</el-form-item> </el-form-item>
<el-form-item label="申诉状态"> <el-form-item label="申诉状态">
<el-radio-group v-model="form.appealStatus"> <!-- <el-radio-group v-model="form.appealStatus">-->
<el-radio label="1">请选择字典生成</el-radio> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
<el-select v-model="form.appealStatus" placeholder="请选择订单状态">
<el-option
v-for="dict in appealStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="取消类型" prop="cancelType"> <el-form-item label="取消类型" prop="cancelType">
<el-select v-model="form.cancelType" placeholder="请选择取消类型"> <el-select v-model="form.cancelType" placeholder="请选择取消类型">
<el-option label="请选择字典生成" value="" /> <!-- <el-option label="请选择字典生成" value="" />-->
<el-option
v-for="dict in cancelTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</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">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -320,8 +352,11 @@ export default {
// 用户otc订单表格数据 // 用户otc订单表格数据
otcOrderList: [], otcOrderList: [],
feeTypeOptions: [], feeTypeOptions: [],
orderStatusOptions: [], orderStatusOptions: [],
tradeTypeStatusOptions: [], tradeTypeStatusOptions: [],
//申诉字典
appealStatusOptions:[],
cancelTypeOptions:[],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -388,6 +423,12 @@ export default {
this.getDicts("fee_type").then(response => { this.getDicts("fee_type").then(response => {
this.feeTypeOptions = response.data; this.feeTypeOptions = response.data;
}); });
this.getDicts("appeal_status").then(response => {
this.appealStatusOptions = response.data;
});
this.getDicts("cancel_type").then(response => {
this.cancelTypeOptions = response.data;
});
}, },
@ -481,7 +522,7 @@ export default {
getOtcOrder(id).then(response => { getOtcOrder(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改用户otc订单"; this.title = "查询用户otc订单";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

249
src/views/otc/otcStoreOrder/index.vue
View File

@ -11,7 +11,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="交易类型" prop="appealStatus"> <el-form-item label="交易类型" prop="appealStatus">
<el-select v-model="queryParams.tradeTypeStatus" placeholder="请选择交易类型" clearable size="small"> <el-select v-model="queryParams.tradeType" placeholder="请选择交易类型" clearable size="small">
<el-option <el-option
v-for="dict in tradeTypeStatusOptions" v-for="dict in tradeTypeStatusOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -21,10 +21,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商家编号" prop="storeId"> <el-form-item label="商家昵称" prop="storeId">
<el-input <el-input
v-model="queryParams.storeId" v-model="queryParams.storeName"
placeholder="请输入商家编号" placeholder="请输入商家昵称"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -41,28 +41,16 @@
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-form-item label="类型" prop="feeType"> <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable size="small">
<el-select v-model="queryParams.feeType" placeholder="请选择类型" clearable size="small"> <el-option
<el-option v-for="dict in orderStatusOptions"
v-for="dict in feeTypeOptions" :key="dict.dictValue"
:key="dict.dictValue" :label="dict.dictLabel"
:label="dict.dictLabel" :value="dict.dictValue"
:value="dict.dictValue" />
/> </el-select>
</el-select> </el-form-item>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.feeTypeStatus" placeholder="请选择订单状态" clearable size="small">
<el-option
v-for="dict in orderStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
@ -72,38 +60,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['otc:otcStoreOrder:add']" <!-- v-hasPermi="['otc:otcStoreOrder:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['otc:otcStoreOrder:edit']" <!-- v-hasPermi="['otc:otcStoreOrder:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['otc:otcStoreOrder:remove']" <!-- v-hasPermi="['otc:otcStoreOrder:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -119,41 +107,54 @@
<el-table v-loading="loading" :data="otcStoreOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="otcStoreOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="流水编号" align="center" prop="id" /> <!-- <el-table-column label="流水编号" align="center" prop="id" />-->
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="交易类型" align="center" prop="tradeType" :formatter="tradeTypeFormat" /> <el-table-column label="交易类型" align="center" prop="tradeType" :formatter="tradeTypeFormat" />
<el-table-column label="商家编号" align="center" prop="storeId" /> <!-- <el-table-column label="商家编号" align="center" prop="storeId" />-->
<el-table-column label="商家昵称" align="center" prop="storeName" />
<el-table-column label="币种" align="center" prop="coin" /> <el-table-column label="币种" align="center" prop="coin" />
<el-table-column label="币种数量" align="center" prop="coinNum" /> <!-- <el-table-column label="币种数量" align="center" prop="coinNum" />-->
<el-table-column label="实际币种数量" align="center" prop="realityCoinNum" /> <el-table-column label="实际币种数量" align="center" prop="realityCoinNum" />
<el-table-column label="剩余数量" align="center" prop="remainNum" /> <el-table-column label="剩余数量" align="center" prop="remainNum" />
<el-table-column label="法币价格" align="center" prop="legalCurrency" /> <el-table-column label="法币价格" align="center" prop="legalCurrency" />
<el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" /> <el-table-column label="订单状态" align="center" prop="orderStatus" :formatter="orderStatusFormat" />
<el-table-column label="最小限额" align="center" prop="minLimit" /> <!-- <el-table-column label="最小限额" align="center" prop="minLimit" />-->
<el-table-column label="最大限额" align="center" prop="maxLimit" /> <!-- <el-table-column label="最大限额" align="center" prop="maxLimit" />-->
<el-table-column label="限额币种" align="center" prop="limitCoin" /> <el-table-column label="法币币种" align="center" prop="limitCoin" />
<el-table-column label="类型" align="center" prop="feeType" :formatter="feeTypeFormat"/> <!-- <el-table-column label="类型" align="center" prop="feeType" :formatter="feeTypeFormat"/>-->
<el-table-column label="手续费" align="center" prop="fee" /> <el-table-column label="手续费" align="center" prop="fee" />
<el-table-column label="百分比的时" align="center" prop="feeRate" /> <!-- <el-table-column label="费率" align="center" prop="feeRate" />-->
<el-table-column label="已扣除手续费" align="center" prop="deductedFee" /> <el-table-column label="已扣除手续费" align="center" prop="deductedFee" />
<el-table-column label="收款方式 多个逗号分割" align="center" prop="walletType" /> <!-- <el-table-column label="收款方式多个逗号分割" align="center" prop="walletType" />-->
<el-table-column label="交易说明" align="center" prop="transactionDesc" /> <el-table-column label="交易说明" align="center" prop="transactionDesc" />
<el-table-column label="添加时间" align="center" prop="crateTime" width="180">
<template slot-scope="scope">
<span>{{parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" 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)"-->
<!-- v-hasPermi="['otc:otcStoreOrder:edit']"-->
<!-- >修改</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleDetail(scope.row)"
v-hasPermi="['otc:otcStoreOrder:edit']" v-hasPermi="['otc:otcStoreOrder:edit']"
>修改</el-button> >详情</el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['otc:otcStoreOrder:remove']" <!-- v-hasPermi="['otc:otcStoreOrder:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -167,18 +168,27 @@
/> />
<!-- 添加或修改otc订单信息对话框 --> <!-- 添加或修改otc订单信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" 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="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单编号" /> <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
</el-form-item> </el-form-item>
<el-form-item label="交易类型" prop="tradeType"> <el-form-item label="交易类型" prop="tradeType">
<el-select v-model="form.tradeType" placeholder="请选择交易类型"> <el-select v-model="form.tradeType" placeholder="请选择交易类型">
<el-option label="请选择字典生成" value="" /> <!-- <el-option label="请选择字典生成" value="" />-->
<el-option
v-for="dict in tradeTypeStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商家编号" prop="storeId"> <!-- <el-form-item label="商家编号" prop="storeId">-->
<el-input v-model="form.storeId" placeholder="请输入商家编号" /> <!-- <el-input v-model="form.storeId" placeholder="请输入商家编号" />-->
<!-- </el-form-item>-->
<el-form-item label="商家昵称" prop="storeId">
<el-input v-model="form.storeName" placeholder="请输入商家编号" />
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="coin"> <el-form-item label="币种" prop="coin">
<el-input v-model="form.coin" placeholder="请输入币种" /> <el-input v-model="form.coin" placeholder="请输入币种" />
@ -195,10 +205,18 @@
<el-form-item label="法币价格" prop="legalCurrency"> <el-form-item label="法币价格" prop="legalCurrency">
<el-input v-model="form.legalCurrency" placeholder="请输入法币价格" /> <el-input v-model="form.legalCurrency" placeholder="请输入法币价格" />
</el-form-item> </el-form-item>
<el-form-item label="订单状态(挂单中 pending_order、已锁住is_lock、已完成 close、已取消 cancel、待放行released,申诉中in_appeal）"> <el-form-item label="订单状态">
<el-radio-group v-model="form.orderStatus"> <!-- <el-radio-group v-model="form.orderStatus">-->
<el-radio label="1">请选择字典生成</el-radio> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
<el-select v-model="form.orderStatus" placeholder="订单状态">
<el-option
v-for="dict in orderStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="最小限额" prop="minLimit"> <el-form-item label="最小限额" prop="minLimit">
<el-input v-model="form.minLimit" placeholder="请输入最小限额" /> <el-input v-model="form.minLimit" placeholder="请输入最小限额" />
@ -209,39 +227,46 @@
<el-form-item label="限额币种" prop="limitCoin"> <el-form-item label="限额币种" prop="limitCoin">
<el-input v-model="form.limitCoin" placeholder="请输入限额币种" /> <el-input v-model="form.limitCoin" placeholder="请输入限额币种" />
</el-form-item> </el-form-item>
<el-form-item label="类型：pen：按笔，percentage：百分比" prop="feeType"> <el-form-item label="手续费类型：" prop="feeType">
<el-select v-model="form.feeType" placeholder="请选择类型：pen：按笔，percentage：百分比"> <el-select v-model="form.feeType" placeholder="手续费类型">
<el-option label="请选择字典生成" value="" /> <!-- <el-option label="请选择字典生成" value="" />-->
<el-option
v-for="dict in feeTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手续费" prop="fee"> <el-form-item label="手续费" prop="fee">
<el-input v-model="form.fee" placeholder="请输入手续费" /> <el-input v-model="form.fee" placeholder="请输入手续费" />
</el-form-item> </el-form-item>
<el-form-item label="百分比的时" prop="feeRate"> <el-form-item label="手续费率" prop="feeRate">
<el-input v-model="form.feeRate" placeholder="请输入百分比的时" /> <el-input v-model="form.feeRate" placeholder="手续费率" />
</el-form-item> </el-form-item>
<el-form-item label="已扣除手续费" prop="deductedFee"> <el-form-item label="已扣除手续费" prop="deductedFee">
<el-input v-model="form.deductedFee" placeholder="请输入已扣除手续费" /> <el-input v-model="form.deductedFee" placeholder="请输入已扣除手续费" />
</el-form-item> </el-form-item>
<el-form-item label="添加时间" prop="createTime"> <!-- <el-form-item label="添加时间" prop="createTime">-->
<el-date-picker clearable size="small" <!-- <el-date-picker clearable size="small"-->
v-model="form.createTime" <!-- v-model="form.createTime"-->
type="date" <!-- type="date"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
placeholder="选择添加时间"> <!-- placeholder="选择添加时间">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="收款方式 多个逗号分割" prop="walletType"> <!-- <el-form-item label="收款方式" prop="walletType">-->
<el-select v-model="form.walletType" placeholder="请选择收款方式 多个逗号分割"> <!-- <el-input v-model="form.walletType" placeholder="收款方式" />-->
<el-option label="请选择字典生成" value="" /> <!-- </el-form-item>-->
</el-select> <el-form-item label="收款方式" prop="walletType">
<el-input v-model="form.walletTypeName" placeholder="收款方式" />
</el-form-item> </el-form-item>
<el-form-item label="交易说明" prop="transactionDesc"> <el-form-item label="交易说明" prop="transactionDesc">
<el-input v-model="form.transactionDesc" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.transactionDesc" type="textarea" placeholder="请输入内容" />
</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">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -299,7 +324,8 @@ export default {
feeRate: null, feeRate: null,
deductedFee: null, deductedFee: null,
walletType: null, walletType: null,
transactionDesc: null transactionDesc: null,
storeName: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -361,9 +387,9 @@ export default {
return this.selectDictLabel(this.feeTypeOptions, row.feeType); return this.selectDictLabel(this.feeTypeOptions, row.feeType);
}, },
tradeTypeFormat(row, column) { tradeTypeFormat(row, column) {
return this.selectDictLabel(this.tradeTypeStatusOptions, row.tradeType); return this.selectDictLabel(this.tradeTypeStatusOptions, row.tradeType);
}, },
// 取消按钮 // 取消按钮
@ -394,7 +420,8 @@ export default {
createTime: null, createTime: null,
updateTime: null, updateTime: null,
walletType: null, walletType: null,
transactionDesc: null transactionDesc: null,
walletTypeName:null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -430,6 +457,16 @@ export default {
this.title = "修改otc订单信息"; this.title = "修改otc订单信息";
}); });
}, },
/** 详情按钮操作 */
handleDetail(row) {
this.reset();
const id = row.id || this.ids
getOtcStoreOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "查询otc订单信息";
});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {

Write Preview
Loading…
Cancel
Save