|
1
|
<template>
|
1
|
<template>
|
|
2
|
<section>
|
2
|
<section>
|
|
3
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px">
|
3
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px">
|
|
4
|
- <el-form :inline="true" :model="formInline">
|
4
|
+ <el-form :inline="true" :model="filters">
|
|
5
|
<el-form-item>
|
5
|
<el-form-item>
|
|
6
|
- <el-input v-model="formInline.user" placeholder="用户编号"></el-input>
|
6
|
+ <el-input v-model="filters.orderNumber" placeholder="订单号"></el-input>
|
|
7
|
</el-form-item>
|
7
|
</el-form-item>
|
|
8
|
<el-form-item>
|
8
|
<el-form-item>
|
|
9
|
<div class="block">
|
9
|
<div class="block">
|
|
10
|
<el-date-picker
|
10
|
<el-date-picker
|
|
11
|
- v-model="formInline.date1"
|
11
|
+ v-model="filters.payTime"
|
|
12
|
type="daterange"
|
12
|
type="daterange"
|
|
13
|
align="right"
|
13
|
align="right"
|
|
14
|
unlink-panels
|
14
|
unlink-panels
|
|
@@ -29,10 +29,7 @@ |
|
@@ -29,10 +29,7 @@ |
|
29
|
:data="tableData"
|
29
|
:data="tableData"
|
|
30
|
stripe
|
30
|
stripe
|
|
31
|
style="width: 100%">
|
31
|
style="width: 100%">
|
|
32
|
- <el-table-column
|
|
|
|
33
|
- prop="ordernumber"
|
|
|
|
34
|
- label="订单号"
|
|
|
|
35
|
- width="150">
|
32
|
+ <el-table-column prop="ordernumber" label="订单号" width="180">
|
|
36
|
</el-table-column>
|
33
|
</el-table-column>
|
|
37
|
<el-table-column
|
34
|
<el-table-column
|
|
38
|
prop="payuserid"
|
35
|
prop="payuserid"
|
|
@@ -52,34 +49,39 @@ |
|
@@ -52,34 +49,39 @@ |
|
52
|
<el-table-column
|
49
|
<el-table-column
|
|
53
|
prop="paytime"
|
50
|
prop="paytime"
|
|
54
|
label="充值日期"
|
51
|
label="充值日期"
|
|
55
|
- width="100">
|
|
|
|
56
|
- </el-table-column>
|
|
|
|
57
|
- <el-table-column
|
|
|
|
58
|
- prop="payType"
|
|
|
|
59
|
- label="充值类型">
|
52
|
+ width="160">
|
|
60
|
</el-table-column>
|
53
|
</el-table-column>
|
|
61
|
<el-table-column
|
54
|
<el-table-column
|
|
62
|
- prop="payFees"
|
55
|
+ prop="payfees"
|
|
63
|
label="充值金额"
|
56
|
label="充值金额"
|
|
64
|
width="100">
|
57
|
width="100">
|
|
65
|
</el-table-column>
|
58
|
</el-table-column>
|
|
66
|
- <el-table-column
|
|
|
|
67
|
- prop="payfees"
|
|
|
|
68
|
- label="支付方式"
|
|
|
|
69
|
- width="100">
|
59
|
+ <el-table-column prop="paytype" label="充值类型" width="100">
|
|
|
|
60
|
+ <template slot-scope="scope">
|
|
|
|
61
|
+ <div v-if="scope.row.paytype === false" style="color:#20a0ff">水</div>
|
|
|
|
62
|
+ <div v-else="scope.row.paytype === true" style="color: #42d885">电</div>
|
|
|
|
63
|
+ </template>
|
|
70
|
</el-table-column>
|
64
|
</el-table-column>
|
|
71
|
- <el-table-column
|
|
|
|
72
|
- prop="payStatus"
|
|
|
|
73
|
- label="支付状态"
|
|
|
|
74
|
- width="100">
|
65
|
+
|
|
|
|
66
|
+ <el-table-column prop="payfesstype" label="支付方式" width="100">
|
|
|
|
67
|
+ <template slot-scope="scope">
|
|
|
|
68
|
+ <div v-if="scope.row.payfesstype === false" style="color:#42d885">微信</div>
|
|
|
|
69
|
+ <div v-else="scope.row.payfesstype === true" style="color: #20a0ff">支付宝</div>
|
|
|
|
70
|
+ </template>
|
|
|
|
71
|
+ </el-table-column>
|
|
|
|
72
|
+ <el-table-column prop="paystatus" label="支付状态" width="100">
|
|
|
|
73
|
+ <template slot-scope="scope">
|
|
|
|
74
|
+ <div v-if="scope.row.payfesstype === false" style="color:#ff4d51">未完成</div>
|
|
|
|
75
|
+ <div v-else="scope.row.payfesstype === true" style="color: #42d885">已完成</div>
|
|
|
|
76
|
+ </template>
|
|
75
|
</el-table-column>
|
77
|
</el-table-column>
|
|
76
|
<el-table-column
|
78
|
<el-table-column
|
|
77
|
fixed="right"
|
79
|
fixed="right"
|
|
78
|
label="操作"
|
80
|
label="操作"
|
|
79
|
- width="180">
|
|
|
|
80
|
- <template slot-scope="scope">
|
81
|
+ >
|
|
|
|
82
|
+ <template slot-scope="scope" align="center" class-name="small-padding fixed-width" >
|
|
81
|
<el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
|
83
|
<el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
|
|
82
|
- <el-button type="text" size="small">移除订单</el-button>
|
84
|
+ <el-button type="primary" @click="payDelete(scope.$index,scope.row)" size="small">移除订单</el-button>
|
|
83
|
</template>
|
85
|
</template>
|
|
84
|
</el-table-column>
|
86
|
</el-table-column>
|
|
85
|
</el-table>
|
87
|
</el-table>
|
|
@@ -94,10 +96,15 @@ |
|
@@ -94,10 +96,15 @@ |
|
94
|
</section>
|
96
|
</section>
|
|
95
|
</template>
|
97
|
</template>
|
|
96
|
<script>
|
98
|
<script>
|
|
97
|
- import { getOrder,addOrder,ediOrder,delOrder} from '../../api/empt/PayOrder';
|
99
|
+ import { getOrder,addOrder,ediOrder,remove} from '../../api/empt/PayOrder';
|
|
|
|
100
|
+ import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
|
|
98
|
export default {
|
101
|
export default {
|
|
|
|
102
|
+ components: {ElButton},
|
|
99
|
data() {
|
103
|
data() {
|
|
100
|
return {
|
104
|
return {
|
|
|
|
105
|
+ filters: {
|
|
|
|
106
|
+ orderNumber: ''
|
|
|
|
107
|
+ },
|
|
101
|
total: 0,
|
108
|
total: 0,
|
|
102
|
pageNum: 1,
|
109
|
pageNum: 1,
|
|
103
|
pageSize: 5,
|
110
|
pageSize: 5,
|
|
@@ -140,6 +147,7 @@ |
|
@@ -140,6 +147,7 @@ |
|
140
|
this.QueryOrder();
|
147
|
this.QueryOrder();
|
|
141
|
},
|
148
|
},
|
|
142
|
methods: {
|
149
|
methods: {
|
|
|
|
150
|
+
|
|
143
|
handleCurrentChange(val) {
|
151
|
handleCurrentChange(val) {
|
|
144
|
this.pageNum = val;
|
152
|
this.pageNum = val;
|
|
145
|
},
|
153
|
},
|
|
@@ -147,6 +155,7 @@ |
|
@@ -147,6 +155,7 @@ |
|
147
|
let params = {
|
155
|
let params = {
|
|
148
|
pageNum: this.pageNum,
|
156
|
pageNum: this.pageNum,
|
|
149
|
pageSize: this.pageSize,
|
157
|
pageSize: this.pageSize,
|
|
|
|
158
|
+ orderNumber: this.filters.orderNumber,
|
|
150
|
};
|
159
|
};
|
|
151
|
getOrder(params).then(res=>{
|
160
|
getOrder(params).then(res=>{
|
|
152
|
let resData = res.data;
|
161
|
let resData = res.data;
|
|
@@ -162,6 +171,29 @@ |
|
@@ -162,6 +171,29 @@ |
|
162
|
}
|
171
|
}
|
|
163
|
})
|
172
|
})
|
|
164
|
},
|
173
|
},
|
|
|
|
174
|
+
|
|
|
|
175
|
+ //删除
|
|
|
|
176
|
+ payDelete: function (index, row) {
|
|
|
|
177
|
+ this.$confirm('确认移出该订单吗?', '提示', {
|
|
|
|
178
|
+ type: 'warning'
|
|
|
|
179
|
+ }).then(() => {
|
|
|
|
180
|
+ this.listLoading = true;
|
|
|
|
181
|
+ let para = { id: row.id };
|
|
|
|
182
|
+ remove(para).then((res) => {
|
|
|
|
183
|
+ this.listLoading = false;
|
|
|
|
184
|
+ //NProgress.done();
|
|
|
|
185
|
+ this.$message({
|
|
|
|
186
|
+ message: '移出成功',
|
|
|
|
187
|
+ type: 'success'
|
|
|
|
188
|
+ });
|
|
|
|
189
|
+ this.QueryOrder();
|
|
|
|
190
|
+ }).catch((error) => {
|
|
|
|
191
|
+ this.listLoading = false;
|
|
|
|
192
|
+ alert(error);
|
|
|
|
193
|
+ });
|
|
|
|
194
|
+ }).catch();
|
|
|
|
195
|
+ },
|
|
|
|
196
|
+
|
|
165
|
Pay(row){
|
197
|
Pay(row){
|
|
166
|
this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
|
198
|
this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
|
|
167
|
},
|
199
|
},
|
