mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-05 10:30:12 +08:00
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts: # jsowell-ui/src/views/financial/merchant.vue
This commit is contained in:
admin-lmm
@@ -1,36 +1,106 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- <el-form
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
label-width="110px"
|
||||
label-width="168px"
|
||||
@submit.native.prevent
|
||||
>
|
||||
<el-form-item label="运营商名称" prop="merchantName">
|
||||
<el-form-item label="订单编号" prop="orderCode">
|
||||
<el-input
|
||||
v-model="queryParams.merchantName"
|
||||
placeholder="请输入运营商名称"
|
||||
v-model="queryParams.orderCode"
|
||||
placeholder="请输入订单编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
|
||||
<el-form-item label="手机号码" prop="mobileNumber">
|
||||
<el-input
|
||||
v-model="queryParams.mobileNumber"
|
||||
placeholder="请输入手机号码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<div v-if="buttonBoolean">
|
||||
<el-form-item label="订单编号" prop="orderCode">
|
||||
<el-input
|
||||
v-model="queryParams.orderCode"
|
||||
placeholder="请输入订单编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="订单编号" prop="orderCode">
|
||||
<el-input
|
||||
v-model="queryParams.orderCode"
|
||||
placeholder="请输入订单编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="订单编号" prop="orderCode">
|
||||
<el-input
|
||||
v-model="queryParams.orderCode"
|
||||
placeholder="请输入订单编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-button
|
||||
@click="showOrHide()"
|
||||
style="
|
||||
border-color: white;
|
||||
background-color: white;
|
||||
font-size: x-small;
|
||||
color: #50bfff;
|
||||
padding: 1px 2px;
|
||||
margin-left: 40%;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 15px;
|
||||
"
|
||||
:icon="icon"
|
||||
>{{ showOrHideText }}
|
||||
</el-button>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="handleQuery"
|
||||
>搜索</el-button
|
||||
>搜索
|
||||
</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
icon="el-icon-refresh"
|
||||
size="mini"
|
||||
@click="resetQuery"
|
||||
>重置</el-button
|
||||
>重置
|
||||
</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form> -->
|
||||
</el-col>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['order:order:export']"
|
||||
>导出
|
||||
</el-button
|
||||
>
|
||||
</el-row>
|
||||
<el-table
|
||||
:data="merchantList"
|
||||
stripe
|
||||
@@ -83,7 +153,7 @@
|
||||
<template slot-scope="scope">
|
||||
<!-- :to="'/merchant/detail/index/' + scope.row.id" -->
|
||||
<router-link
|
||||
:to="'/financial/merchant/merchantVirtual/'+scope.row.id"
|
||||
to="/financial/merchant/merchantVirtual"
|
||||
class="link-type"
|
||||
>
|
||||
<span>虚拟财务</span>
|
||||
@@ -102,7 +172,7 @@
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
@pagination="getFinancialMerchantList"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -137,10 +207,27 @@ export default {
|
||||
servicePhone: null,
|
||||
logoUrl: null,
|
||||
},
|
||||
tableData: [{
|
||||
date: '2016-05-02',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1518 弄'
|
||||
}, {
|
||||
date: '2016-05-04',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1517 弄'
|
||||
}, {
|
||||
date: '2016-05-01',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1519 弄'
|
||||
}, {
|
||||
date: '2016-05-03',
|
||||
name: '王小虎',
|
||||
address: '上海市普陀区金沙江路 1516 弄'
|
||||
}]
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getFinancialMerchantList();
|
||||
},
|
||||
methods: {
|
||||
showOrHide() {
|
||||
@@ -155,16 +242,15 @@ export default {
|
||||
}
|
||||
},
|
||||
// 获取运营商列表
|
||||
getList() {
|
||||
getFinancialMerchantList() {
|
||||
const params = {
|
||||
pageNum:1,
|
||||
pageSize:2
|
||||
}
|
||||
getFinancialMerchantList(params).then((response) => {
|
||||
// console.log("response", response)
|
||||
console.log("response", response)
|
||||
this.merchantList = response.rows;
|
||||
console.log('this.merchantList',this.merchantList)
|
||||
// console.log("response.total", response.total)
|
||||
console.log("response.total", response.total)
|
||||
this.total = response.total;
|
||||
})
|
||||
},
|
||||
@@ -173,17 +259,18 @@ export default {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
console.log('搜索事件');
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
// 获取订单列表
|
||||
// this.getList();
|
||||
// 获取订单总金额
|
||||
// this.getOrderTotalData();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
// this.handleQuery();
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
||||
Reference in New Issue
Block a user