|
|
@@ -11,12 +11,12 @@
|
|
|
<el-form :inline="true"
|
|
|
class="searchForm"
|
|
|
v-model.trim="searchForm">
|
|
|
- <el-form-item prop='organId'>
|
|
|
+ <el-form-item prop='routingOrganId'>
|
|
|
<el-select class='multiple'
|
|
|
- v-model.trim="searchForm.organId"
|
|
|
+ v-model.trim="searchForm.routingOrganId"
|
|
|
filterable
|
|
|
clearable
|
|
|
- @clear="onClear('organId')"
|
|
|
+ @clear="onClear('routingOrganId')"
|
|
|
placeholder="请选择分部">
|
|
|
<el-option v-for="(item,index) in organList"
|
|
|
:key="index"
|
|
|
@@ -170,7 +170,7 @@ export default {
|
|
|
orderEndDate: null,
|
|
|
paymentStatus: 'SUCCESS',
|
|
|
paymentType: null,
|
|
|
- organId: null
|
|
|
+ routingOrganId: null
|
|
|
},
|
|
|
tableList: [],
|
|
|
organList: [],
|
|
|
@@ -206,8 +206,8 @@ this.orderDate.push(endDate)
|
|
|
this.searchForm.paymentType = null
|
|
|
} else if (type == 'paymentStatus') {
|
|
|
this.searchForm.paymentStatus = null
|
|
|
- } else if (type == 'organId') {
|
|
|
- this.searchForm.organId = null
|
|
|
+ } else if (type == 'routingOrganId') {
|
|
|
+ this.searchForm.routingOrganId = null
|
|
|
}
|
|
|
},
|
|
|
onOrderExport () { // 报表导出
|
|
|
@@ -224,8 +224,8 @@ this.orderDate.push(endDate)
|
|
|
data.paymentType = searchForm.paymentType
|
|
|
}
|
|
|
|
|
|
- if (searchForm.organId) {
|
|
|
- data.organId = searchForm.organId
|
|
|
+ if (searchForm.routingOrganId) {
|
|
|
+ data.routingOrganId = searchForm.routingOrganId
|
|
|
}
|
|
|
|
|
|
if (searchForm.orderStartDate && searchForm.orderEndDate) {
|
|
|
@@ -276,7 +276,7 @@ this.orderDate.push(endDate)
|
|
|
let params = this.searchForm
|
|
|
params.rows = this.pageInfo.limit
|
|
|
params.page = this.pageInfo.page
|
|
|
- if (this.orderDate && this.orderDate.length > 0) {
|
|
|
+ if (this.orderDate && this.orderDate.length > 0) {
|
|
|
params.orderStartDate = this.orderDate[0];
|
|
|
params.orderEndDate = this.orderDate[1];
|
|
|
} else {
|
|
|
@@ -309,7 +309,7 @@ this.orderDate.push(endDate)
|
|
|
orderEndDate: null,
|
|
|
paymentStatus: null,
|
|
|
paymentType: null,
|
|
|
- organId: null
|
|
|
+ routingOrganId: null
|
|
|
}
|
|
|
this.getList()
|
|
|
},
|
