|
@@ -30,8 +30,6 @@
|
|
<a-input v-model.trim="searchForm.bundleName" id="purchasedSetmeal-bundleName" placeholder="请输入套餐名称" allowClear />
|
|
<a-input v-model.trim="searchForm.bundleName" id="purchasedSetmeal-bundleName" placeholder="请输入套餐名称" allowClear />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <!-- <a-col :span="6">
|
|
|
|
- <a-form-item label="订单状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}"> -->
|
|
|
|
<v-select
|
|
<v-select
|
|
v-show="false"
|
|
v-show="false"
|
|
v-model="searchForm.orderFlag"
|
|
v-model="searchForm.orderFlag"
|
|
@@ -40,8 +38,6 @@
|
|
code="PAY_STATUS"
|
|
code="PAY_STATUS"
|
|
placeholder="请选择订单状态"
|
|
placeholder="请选择订单状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
- <!-- </a-form-item>
|
|
|
|
- </a-col> -->
|
|
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="结算状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<a-form-item label="结算状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<v-select
|
|
<v-select
|
|
@@ -53,6 +49,19 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="销售合作商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
|
+ <a-select
|
|
|
|
+ id="purchasedSetmeal-partner"
|
|
|
|
+ allowClear
|
|
|
|
+ show-search
|
|
|
|
+ option-filter-prop="children"
|
|
|
|
+ placeholder="请选择销售合作商"
|
|
|
|
+ v-model="searchForm.partner">
|
|
|
|
+ <a-select-option v-for="(item,index) in partnerList" :key="index" :value="item.value">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
<a-button class="handle-btn serach-btn" id="purchasedSetmeal-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button class="handle-btn serach-btn" id="purchasedSetmeal-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button class="handle-btn" type="" id="purchasedSetmeal-reset" @click="handleReset">重置</a-button>
|
|
<a-button class="handle-btn" type="" id="purchasedSetmeal-reset" @click="handleReset">重置</a-button>
|
|
@@ -116,7 +125,8 @@ export default {
|
|
number: '', // 订单号
|
|
number: '', // 订单号
|
|
queryWord: '', // 客户信息
|
|
queryWord: '', // 客户信息
|
|
orderFlag: '', // 订单状态
|
|
orderFlag: '', // 订单状态
|
|
- salesChannelSettleStatus: '' // 结算状态
|
|
|
|
|
|
+ salesChannelSettleStatus: '', // 结算状态
|
|
|
|
+ partner: undefined // 销售合作商
|
|
},
|
|
},
|
|
loading: false, // 导出loading
|
|
loading: false, // 导出loading
|
|
orderTotal: '', // 合计开单数量
|
|
orderTotal: '', // 合计开单数量
|
|
@@ -133,6 +143,7 @@ export default {
|
|
{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
|
|
{ title: '订单号', dataIndex: 'number', width: 100, align: 'center' },
|
|
{ title: '订单号', dataIndex: 'number', width: 100, align: 'center' },
|
|
{ title: '下单时间', dataIndex: 'orderDate', width: 100, align: 'center' },
|
|
{ title: '下单时间', dataIndex: 'orderDate', width: 100, align: 'center' },
|
|
|
|
+ { title: '销售合作商', dataIndex: 'partner', width: 100, align: 'center' },
|
|
{ title: '套餐名称', dataIndex: 'bundleName', width: 100, align: 'center' },
|
|
{ title: '套餐名称', dataIndex: 'bundleName', width: 100, align: 'center' },
|
|
{ title: '客户信息', scopedSlots: { customRender: 'custInfo' }, width: 100, align: 'center' },
|
|
{ title: '客户信息', scopedSlots: { customRender: 'custInfo' }, width: 100, align: 'center' },
|
|
{ title: '收款金额(¥)', dataIndex: 'payedAmount', width: 80, align: 'center' },
|
|
{ title: '收款金额(¥)', dataIndex: 'payedAmount', width: 80, align: 'center' },
|
|
@@ -155,7 +166,8 @@ export default {
|
|
return res.data
|
|
return res.data
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ partnerList: [] // 销售合作商 下拉数据
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -184,7 +196,8 @@ export default {
|
|
number: this.searchForm.number,
|
|
number: this.searchForm.number,
|
|
queryWord: this.searchForm.queryWord,
|
|
queryWord: this.searchForm.queryWord,
|
|
orderFlag: this.searchForm.orderFlag,
|
|
orderFlag: this.searchForm.orderFlag,
|
|
- salesChannelSettleStatus: this.searchForm.salesChannelSettleStatus
|
|
|
|
|
|
+ salesChannelSettleStatus: this.searchForm.salesChannelSettleStatus,
|
|
|
|
+ partner: this.searchForm.partner
|
|
}
|
|
}
|
|
params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
|
|
params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
|
|
params.endDate == null ? params.endDate = getDate.getToday().endtime : null
|
|
params.endDate == null ? params.endDate = getDate.getToday().endtime : null
|
|
@@ -222,6 +235,7 @@ export default {
|
|
this.searchForm.queryWord = ''
|
|
this.searchForm.queryWord = ''
|
|
this.searchForm.orderFlag = null
|
|
this.searchForm.orderFlag = null
|
|
this.searchForm.salesChannelSettleStatus = null
|
|
this.searchForm.salesChannelSettleStatus = null
|
|
|
|
+ this.searchForm.partner = undefined
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
// 导出
|
|
// 导出
|
|
@@ -233,7 +247,8 @@ export default {
|
|
number: this.searchForm.number,
|
|
number: this.searchForm.number,
|
|
queryWord: this.searchForm.queryWord,
|
|
queryWord: this.searchForm.queryWord,
|
|
orderFlag: this.searchForm.orderFlag,
|
|
orderFlag: this.searchForm.orderFlag,
|
|
- salesChannelSettleStatus: this.searchForm.salesChannelSettleStatus
|
|
|
|
|
|
+ salesChannelSettleStatus: this.searchForm.salesChannelSettleStatus,
|
|
|
|
+ partner: this.searchForm.partner
|
|
}
|
|
}
|
|
if (!params.beginDate && !params.endDate) {
|
|
if (!params.beginDate && !params.endDate) {
|
|
this.$message.error('请先选择需要导出的下单时间区间再进行导出!')
|
|
this.$message.error('请先选择需要导出的下单时间区间再进行导出!')
|