Browse Source

增加退款的筛选、导出

soft5566 2 years ago
parent
commit
d1deade0bb
2 changed files with 48 additions and 2 deletions
  1. 12 0
      src/api/order.js
  2. 36 2
      src/views/order/index.vue

+ 12 - 0
src/api/order.js

@@ -14,6 +14,12 @@ export function getTableData(forData) {
 	if (typeof forData.end_time != 'undefined') {
 	if (typeof forData.end_time != 'undefined') {
 		data.append('end_time', forData.end_time)
 		data.append('end_time', forData.end_time)
 	}
 	}
+	if (typeof forData.refund_start_time != 'undefined') {
+		data.append('refund_start_time', forData.refund_start_time)
+	}
+	if (typeof forData.end_time != 'undefined') {
+		data.append('refund_end_time', forData.refund_end_time)
+	}
 	if (typeof forData.status != 'undefined') {
 	if (typeof forData.status != 'undefined') {
 		data.append('status', forData.status)
 		data.append('status', forData.status)
 	}
 	}
@@ -92,6 +98,12 @@ export function downloadExcel(forData) {
 	if (typeof forData.end_time != 'undefined') {
 	if (typeof forData.end_time != 'undefined') {
 		data.append('end_time', forData.end_time)
 		data.append('end_time', forData.end_time)
 	}
 	}
+	if (typeof forData.refund_start_time != 'undefined') {
+		data.append('refund_start_time', forData.refund_start_time)
+	}
+	if (typeof forData.refund_end_time != 'undefined') {
+		data.append('refund_end_time', forData.refund_end_time)
+	}
 	if (typeof forData.status != 'undefined') {
 	if (typeof forData.status != 'undefined') {
 		data.append('status', forData.status)
 		data.append('status', forData.status)
 	}
 	}

+ 36 - 2
src/views/order/index.vue

@@ -26,6 +26,12 @@
 										format="yyyy-MM-dd HH:mm:ss" clearable>
 										format="yyyy-MM-dd HH:mm:ss" clearable>
 									</el-date-picker>
 									</el-date-picker>
 								</el-form-item>
 								</el-form-item>
+								<el-form-item label="退款时间:">
+									<el-date-picker v-model="refund_datatime" type="datetimerange" align="right" start-placeholder="开始日期" end-placeholder="结束日期"
+										@change="refund_datetime_change" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
+										format="yyyy-MM-dd HH:mm:ss" clearable>
+									</el-date-picker>
+								</el-form-item>
 								<el-form-item label="">
 								<el-form-item label="">
 									<el-select v-model="formInline.status" placeholder="支付状态" @change="search_state_change">
 									<el-select v-model="formInline.status" placeholder="支付状态" @change="search_state_change">
 										<el-option label="全部" value=""></el-option>
 										<el-option label="全部" value=""></el-option>
@@ -95,6 +101,11 @@
 									<span>{{ scope.row.create_time }}</span>
 									<span>{{ scope.row.create_time }}</span>
 								</template>
 								</template>
 							</el-table-column>
 							</el-table-column>
+							<el-table-column label="退款时间" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.refund_time }}</span>
+								</template>
+							</el-table-column>
 							<el-table-column label="操作" align="center" width="220">
 							<el-table-column label="操作" align="center" width="220">
 								<template slot-scope="scope">
 								<template slot-scope="scope">
 									<el-button size="mini" round type="primary" @click="collate_handler(scope.$index, scope.row)">核销</el-button>
 									<el-button size="mini" round type="primary" @click="collate_handler(scope.$index, scope.row)">核销</el-button>
@@ -217,12 +228,15 @@
 					'font-size': '16px',
 					'font-size': '16px',
 					'font-family': 'Microsoft YaHei-3970(82674968)'
 					'font-family': 'Microsoft YaHei-3970(82674968)'
 				},
 				},
-				search_datatime: '',
+				search_datatime: '', // 支付时间
+				refund_datatime: '', // 退款时间
 				// 表单数据
 				// 表单数据
 				formInline: {
 				formInline: {
 					order_name_phone: '',
 					order_name_phone: '',
 					start_time: '',
 					start_time: '',
 					end_time: '',
 					end_time: '',
+					refund_start_time: '',
+					refund_end_time: '',
 					status: ''
 					status: ''
 				},
 				},
 				formInline_tongji: {
 				formInline_tongji: {
@@ -410,7 +424,7 @@
 				})
 				})
 			},
 			},
 			/**
 			/**
-			 * 选取的时间进行格式化,赋值给formInline
+			 * 选取的支付时间进行格式化,赋值给formInline
 			 */
 			 */
 			search_datetime_change() {
 			search_datetime_change() {
 				// console.log(this.search_datatime);
 				// console.log(this.search_datatime);
@@ -425,6 +439,20 @@
 				this.get_table_data('search')
 				this.get_table_data('search')
 			},
 			},
 			/**
 			/**
+			 * 选取的退款时间进行格式化,赋值给formInline
+			 */
+			refund_datetime_change() {
+				if (this.refund_datatime == null) {
+					this.formInline.refund_start_time = ''
+					this.formInline.refund_end_time = ''
+				} else {
+					this.formInline.refund_start_time = this.refund_datatime[0]
+					this.formInline.refund_end_time = this.refund_datatime[1]
+				}
+				// 刷新列表
+				this.get_table_data('search')
+			},
+			/**
 			 * 搜索状态
 			 * 搜索状态
 			 */
 			 */
 			search_state_change() {
 			search_state_change() {
@@ -524,6 +552,12 @@
 				if (this.formInline.end_time !== '') {
 				if (this.formInline.end_time !== '') {
 					data.end_time = this.formInline.end_time
 					data.end_time = this.formInline.end_time
 				}
 				}
+				if (this.formInline.refund_start_time !== '') {
+					data.refund_start_time = this.formInline.refund_start_time
+				}
+				if (this.formInline.refund_end_time !== '') {
+					data.refund_end_time = this.formInline.refund_end_time
+				}
 				if (this.formInline.status !== '') {
 				if (this.formInline.status !== '') {
 					data.status = this.formInline.status
 					data.status = this.formInline.status
 				}
 				}