|
@@ -65,15 +65,17 @@
|
|
</span>
|
|
</span>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<span slot="action" slot-scope="text, record">
|
|
<span slot="action" slot-scope="text, record">
|
|
- <a-button type="primary" @click="openDetailsModal=true">查看</a-button>
|
|
|
|
|
|
+ <!-- <a-button type="primary" @click="openDetailModal=true">查看</a-button> -->
|
|
|
|
+ <a-button type="primary" @click="seeDetail(record)">查看</a-button>
|
|
<!-- 本期暂不做 -->
|
|
<!-- 本期暂不做 -->
|
|
<!-- <a-button type="danger" @click="refund(record)">退款</a-button> -->
|
|
<!-- <a-button type="danger" @click="refund(record)">退款</a-button> -->
|
|
</span>
|
|
</span>
|
|
</s-table>
|
|
</s-table>
|
|
<!-- 查看详情弹窗 -->
|
|
<!-- 查看详情弹窗 -->
|
|
<order-detail-modal
|
|
<order-detail-modal
|
|
- :openModal="openDetailsModal"
|
|
|
|
- @close="openDetailsModal=false"/>
|
|
|
|
|
|
+ :openModal="openDetailModal"
|
|
|
|
+ :nowId="detailId"
|
|
|
|
+ @close="openDetailModal=false"/>
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -109,7 +111,8 @@
|
|
incomeHJ:'2000',
|
|
incomeHJ:'2000',
|
|
itemOptionData:[], // 服务项目数据
|
|
itemOptionData:[], // 服务项目数据
|
|
storeOptionData:[], // 网点名称数据
|
|
storeOptionData:[], // 网点名称数据
|
|
- openDetailsModal:false, // 查看详情弹窗 默认关闭
|
|
|
|
|
|
+ openDetailModal:false, // 查看详情弹窗 默认关闭
|
|
|
|
+ detailId:null, // 初始化id
|
|
time: [
|
|
time: [
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
@@ -161,12 +164,12 @@
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
- {
|
|
|
|
- title: '优惠(¥)',
|
|
|
|
- dataIndex: 'couponAmount',
|
|
|
|
- minWidth: '40',
|
|
|
|
- align: 'center'
|
|
|
|
- },
|
|
|
|
|
|
+ // {
|
|
|
|
+ // title: '优惠(¥)',
|
|
|
|
+ // dataIndex: 'couponAmount',
|
|
|
|
+ // minWidth: '40',
|
|
|
|
+ // align: 'center'
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title: '状态',
|
|
title: '状态',
|
|
dataIndex: 'orderStatus',
|
|
dataIndex: 'orderStatus',
|
|
@@ -189,7 +192,7 @@
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
- console.log(this.searchForm.storeId)
|
|
|
|
|
|
+ // console.log(this.searchForm.storeId)
|
|
this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
|
|
this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
|
|
this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
|
|
this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
|
|
this.searchForm.storeIdList = this.storeId
|
|
this.searchForm.storeIdList = this.storeId
|
|
@@ -240,10 +243,13 @@
|
|
// 合计
|
|
// 合计
|
|
getTotal(){},
|
|
getTotal(){},
|
|
// 查看详情--跳转到对应的详情页
|
|
// 查看详情--跳转到对应的详情页
|
|
- // seeDetail(record) {
|
|
|
|
- // this.$router.push({name: 'OrderDetail',query: {id: record.id}
|
|
|
|
- // })
|
|
|
|
- // },
|
|
|
|
|
|
+ seeDetail(record) {
|
|
|
|
+ // this.$router.push({name: 'OrderDetail',query: {id: record.id}
|
|
|
|
+ // })
|
|
|
|
+ this.detailId = record.id
|
|
|
|
+ this.openDetailModal = true
|
|
|
|
+ console.log(this.detailId)
|
|
|
|
+ },
|
|
// 退款---暂不做
|
|
// 退款---暂不做
|
|
// refund(row) {
|
|
// refund(row) {
|
|
// const _this = this
|
|
// const _this = this
|