|
@@ -20,11 +20,6 @@ |
|
@@ -20,11 +20,6 @@ |
20
|
</div>
|
20
|
</div>
|
21
|
</el-form-item>
|
21
|
</el-form-item>
|
22
|
<el-form-item>
|
22
|
<el-form-item>
|
23
|
-<!-- <el-radio-group v-model="filters.payType">-->
|
|
|
24
|
-<!-- <el-radio v-model="radio" label="0">水</el-radio>-->
|
|
|
25
|
-<!-- <el-radio label="1">电</el-radio>-->
|
|
|
26
|
-<!-- <el-radio label="">水电全部</el-radio>-->
|
|
|
27
|
-<!-- </el-radio-group>-->
|
|
|
28
|
<el-select v-model="filters.payType" placeholder="请选择">
|
23
|
<el-select v-model="filters.payType" placeholder="请选择">
|
29
|
<el-option
|
24
|
<el-option
|
30
|
v-for="item in optionList"
|
25
|
v-for="item in optionList"
|
|
@@ -33,6 +28,14 @@ |
|
@@ -33,6 +28,14 @@ |
33
|
:value="item.value">
|
28
|
:value="item.value">
|
34
|
</el-option>
|
29
|
</el-option>
|
35
|
</el-select>
|
30
|
</el-select>
|
|
|
31
|
+ <el-select v-model="filters.paystatus" placeholder="请选择">
|
|
|
32
|
+ <el-option
|
|
|
33
|
+ v-for="item in paystatusList"
|
|
|
34
|
+ :key="item.value"
|
|
|
35
|
+ :label="item.label"
|
|
|
36
|
+ :value="item.value">
|
|
|
37
|
+ </el-option>
|
|
|
38
|
+ </el-select>
|
36
|
</el-form-item>
|
39
|
</el-form-item>
|
37
|
<el-form-item>
|
40
|
<el-form-item>
|
38
|
<el-button type="primary" v-on:click="QueryOrder()">查询</el-button>
|
41
|
<el-button type="primary" v-on:click="QueryOrder()">查询</el-button>
|
|
@@ -132,7 +135,8 @@ |
|
@@ -132,7 +135,8 @@ |
132
|
filters: {
|
135
|
filters: {
|
133
|
orderNumber: '',
|
136
|
orderNumber: '',
|
134
|
payTime: '',
|
137
|
payTime: '',
|
135
|
- payType: ''
|
138
|
+ payType: '',
|
|
|
139
|
+ paystatus: ''
|
136
|
},
|
140
|
},
|
137
|
radio:'水',
|
141
|
radio:'水',
|
138
|
username: JSON.parse(sessionStorage.getItem('user')).username,
|
142
|
username: JSON.parse(sessionStorage.getItem('user')).username,
|
|
@@ -182,6 +186,16 @@ |
|
@@ -182,6 +186,16 @@ |
182
|
}, {
|
186
|
}, {
|
183
|
value: '',
|
187
|
value: '',
|
184
|
label: '水电表'
|
188
|
label: '水电表'
|
|
|
189
|
+ }],
|
|
|
190
|
+ paystatusList:[{
|
|
|
191
|
+ value: '1',
|
|
|
192
|
+ label: '已支付'
|
|
|
193
|
+ }, {
|
|
|
194
|
+ value: '0',
|
|
|
195
|
+ label: '未支付'
|
|
|
196
|
+ },{
|
|
|
197
|
+ value: '',
|
|
|
198
|
+ label: '全部'
|
185
|
}]
|
199
|
}]
|
186
|
}
|
200
|
}
|
187
|
},
|
201
|
},
|
|
@@ -210,7 +224,8 @@ |
|
@@ -210,7 +224,8 @@ |
210
|
orderNumber: this.filters.orderNumber,
|
224
|
orderNumber: this.filters.orderNumber,
|
211
|
payTime: payTimes,
|
225
|
payTime: payTimes,
|
212
|
username: this.username,
|
226
|
username: this.username,
|
213
|
- payType: this.filters.payType
|
227
|
+ payType: this.filters.payType,
|
|
|
228
|
+ paystatus: this.filters.paystatus
|
214
|
|
229
|
|
215
|
};
|
230
|
};
|
216
|
this.listLoading = true;
|
231
|
this.listLoading = true;
|
|
@@ -307,12 +322,11 @@ |
|
@@ -307,12 +322,11 @@ |
307
|
}
|
322
|
}
|
308
|
|
323
|
|
309
|
let params = {
|
324
|
let params = {
|
310
|
- pageNum: this.pageNum,
|
|
|
311
|
- pageSize: this.pageSize,
|
|
|
312
|
orderNumber: this.filters.orderNumber,
|
325
|
orderNumber: this.filters.orderNumber,
|
313
|
payTime: payTimes,
|
326
|
payTime: payTimes,
|
314
|
username: this.username,
|
327
|
username: this.username,
|
315
|
- payType: this.filters.payType
|
328
|
+ payType: this.filters.payType,
|
|
|
329
|
+ paystatus: this.filters.paystatus
|
316
|
|
330
|
|
317
|
};
|
331
|
};
|
318
|
this.listLoading = true;//缓冲条加载
|
332
|
this.listLoading = true;//缓冲条加载
|