订单增加了几个时间的查询和导出

src/api/order.js

@@ -17,9 +17,31 @@ export function getTableData(forData) {
 	if (typeof forData.refund_start_time != 'undefined') {
 		data.append('refund_start_time', forData.refund_start_time)
 	}
-	if (typeof forData.end_time != 'undefined') {
+	if (typeof forData.refund_end_time != 'undefined') {
 		data.append('refund_end_time', forData.refund_end_time)
 	}
+	
+	if (typeof forData.cancel_start_time != 'undefined') {
+		data.append('cancel_start_time', forData.cancel_start_time)
+	}
+	if (typeof forData.cancel_end_time != 'undefined') {
+		data.append('cancel_end_time', forData.cancel_end_time)
+	}
+	
+	if (typeof forData.hx_start_time != 'undefined') {
+		data.append('hx_start_time', forData.hx_start_time)
+	}
+	if (typeof forData.hx_end_time != 'undefined') {
+		data.append('hx_end_time', forData.hx_end_time)
+	}
+	
+	if (typeof forData.tf_start_time != 'undefined') {
+		data.append('tf_start_time', forData.tf_start_time)
+	}
+	if (typeof forData.tf_end_time != 'undefined') {
+		data.append('tf_end_time', forData.tf_end_time)
+	}
+	
 	if (typeof forData.status != 'undefined') {
 		data.append('status', forData.status)
 	}
@@ -104,6 +126,27 @@ export function downloadExcel(forData) {
 	if (typeof forData.refund_end_time != 'undefined') {
 		data.append('refund_end_time', forData.refund_end_time)
 	}
+	
+	if (typeof forData.cancel_start_time != 'undefined') {
+		data.append('cancel_start_time', forData.cancel_start_time)
+	}
+	if (typeof forData.cancel_end_time != 'undefined') {
+		data.append('cancel_end_time', forData.cancel_end_time)
+	}
+	
+	if (typeof forData.hx_start_time != 'undefined') {
+		data.append('hx_start_time', forData.hx_start_time)
+	}
+	if (typeof forData.hx_end_time != 'undefined') {
+		data.append('hx_end_time', forData.hx_end_time)
+	}
+	
+	if (typeof forData.tf_start_time != 'undefined') {
+		data.append('tf_start_time', forData.tf_start_time)
+	}
+	if (typeof forData.tf_end_time != 'undefined') {
+		data.append('tf_end_time', forData.tf_end_time)
+	}
 	if (typeof forData.status != 'undefined') {
 		data.append('status', forData.status)
 	}

src/views/order/index.vue

@@ -26,12 +26,6 @@
 										format="yyyy-MM-dd HH:mm:ss" clearable>
 									</el-date-picker>
 								</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-select v-model="formInline.status" placeholder="支付状态" @change="search_state_change">
 										<el-option label="全部" value=""></el-option>
@@ -44,17 +38,23 @@
 										<el-option label="已退房" value="6"></el-option>
 									</el-select>
 								</el-form-item>
+								<el-form-item :label="lbl_time_txt" v-show="showDatatime">
+									<el-date-picker v-model="bind_datatime" type="datetimerange" align="right" start-placeholder="开始日期" end-placeholder="结束日期"
+										@change="bind_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>
 							<el-button type="primary" class="export" @click="handler_download_excel">导出订单</el-button>
 						</div>
-						<el-table :data="tableData" height="525" style="width: 100%" :cell-style="cell_style" v-loading="loading"
-							:header-cell-style="header_cell_style">
-							<el-table-column label="订单号" align="center">
+						<el-table :data="tableData" height="538" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+							:header-cell-style="header_cell_style" border>
+							<el-table-column label="订单号" fixed align="center" width="150">
 								<template slot-scope="scope">
 									<span>{{ scope.row.order_num }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="状态" align="center" width="100">
+							<el-table-column label="状态" fixed align="center" width="100">
 								<template slot-scope="scope">
 									<span v-if="scope.row.status === '1'" class="txt-cell-red">待支付</span>
 									<span v-else-if="scope.row.status === '2'" class="txt-cell-green">已支付</span>
@@ -66,47 +66,62 @@
 									<span v-else class="txt-cell-red">未知</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="预订人" align="center" width="100">
+							<el-table-column label="预订人" fixed align="center" width="100">
 								<template slot-scope="scope">
 									<span>{{ scope.row.user_name }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="手机号" align="center">
+							<el-table-column label="手机号" fixed align="center" width="150">
 								<template slot-scope="scope">
 									<span>{{ scope.row.phone }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="入住时间" align="center" width="100">
+							<el-table-column label="入住时间" fixed align="center" width="100">
 								<template slot-scope="scope">
 									<span>{{ scope.row.live_time }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="离店时间" align="center" width="100">
+							<el-table-column label="离店时间" fixed align="center" width="100">
 								<template slot-scope="scope">
 									<span>{{ scope.row.end_time }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="预定房型" align="center">
+							<el-table-column label="预定房型" fixed align="center" width="100">
 								<template slot-scope="scope">
 									<span>{{ scope.row.h_type }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="房费（元）" align="center" width="100">
+							<el-table-column label="房费（元）" fixed align="center" width="120">
 								<template slot-scope="scope">
 									<span>{{ scope.row.pay_account.toFixed(2) }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="支付时间" align="center">
+							<el-table-column label="支付时间" align="center" width="158">
 								<template slot-scope="scope">
 									<span>{{ scope.row.create_time }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="退款时间" align="center">
+							<el-table-column label="核销时间" align="center" width="158">
+								<template slot-scope="scope">
+									<span>{{ scope.row.hx_time }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="取消时间" align="center" width="158">
+								<template slot-scope="scope">
+									<span>{{ scope.row.cancel_time }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="退款时间" align="center" width="158">
 								<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="158">
+								<template slot-scope="scope">
+									<span>{{ scope.row.tf_time }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作" fixed="right" align="center" width="220">
 								<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="danger" @click="refund_handler(scope.$index, scope.row)">退款</el-button>
@@ -229,7 +244,12 @@
 					'font-family': 'Microsoft YaHei-3970(82674968)'
 				},
 				search_datatime: '', // 支付时间
+				bind_datatime: '', // 绑定时间
 				refund_datatime: '', // 退款时间
+				hx_datatime: '', // 核销时间
+				tf_datatime: '', // 退房时间
+				lbl_time_txt: '', // 筛选时间文本
+				showDatatime: false, // 显示和隐藏时间选择
 				// 表单数据
 				formInline: {
 					order_name_phone: '',
@@ -237,6 +257,12 @@
 					end_time: '',
 					refund_start_time: '',
 					refund_end_time: '',
+					hx_start_time: '',
+					hx_end_time: '',
+					cancel_start_time: '',
+					cancel_end_time: '',
+					tf_start_time: '',
+					tf_end_time: '',
 					status: ''
 				},
 				formInline_tongji: {
@@ -439,16 +465,40 @@
 				this.get_table_data('search')
 			},
 			/**
-			 * 选取的退款时间进行格式化，赋值给formInline
+			 * 绑定时间转化成其他时间，进行格式化，赋值给formInline
+			 * bind_datetime
 			 */
-			refund_datetime_change() {
-				if (this.refund_datatime == null) {
-					this.formInline.refund_start_time = ''
-					this.formInline.refund_end_time = ''
+			bind_datetime_change() {
+				if (this.formInline.status == 5) {
+					// this.lbl_time_txt = '退款时间：';
+					this.formInline.refund_start_time = this.bind_datatime[0]
+					this.formInline.refund_end_time = this.bind_datatime[1]
+				} else if (this.formInline.status == 4) {
+					// this.lbl_time_txt = '取消时间：';
+					this.formInline.cancel_start_time = this.bind_datatime[0]
+					this.formInline.cancel_end_time = this.bind_datatime[1]
+				} else if (this.formInline.status == 3) {
+					// this.lbl_time_txt = '核销时间：';
+					this.formInline.hx_start_time = this.bind_datatime[0]
+					this.formInline.hx_end_time = this.bind_datatime[1]
+				} else if (this.formInline.status == 6) {
+					// this.lbl_time_txt = '退房时间：';
+					this.formInline.tf_start_time = this.bind_datatime[0]
+					this.formInline.tf_end_time = this.bind_datatime[1]
 				} else {
-					this.formInline.refund_start_time = this.refund_datatime[0]
-					this.formInline.refund_end_time = this.refund_datatime[1]
+					this.formInline.refund_start_time = undefined
+					this.formInline.refund_end_time = undefined
+
+					this.formInline.cancel_start_time = undefined
+					this.formInline.cancel_end_time = undefined
+
+					this.formInline.hx_start_time = undefined
+					this.formInline.hx_end_time = undefined
+
+					this.formInline.tf_start_time = undefined
+					this.formInline.tf_end_time = undefined
 				}
+
 				// 刷新列表
 				this.get_table_data('search')
 			},
@@ -456,9 +506,35 @@
 			 * 搜索状态
 			 */
 			search_state_change() {
+				if (this.formInline.status == 5) {
+					this.change_value('退款时间：');
+				} else if (this.formInline.status == 4) {
+					this.change_value('取消时间：');
+				} else if (this.formInline.status == 3) {
+					this.change_value('核销时间：');
+				} else if (this.formInline.status == 6) {
+					this.change_value('退房时间：');
+				} else {
+					this.lbl_time_txt = '';
+					this.bind_datatime = '';
+					this.showDatatime = false;
+				}
 				// 刷新列表
 				this.get_table_data('search')
 			},
+			change_value(param) {
+				this.lbl_time_txt = param;
+				this.bind_datatime = '';
+				this.formInline.refund_start_time = ''
+				this.formInline.refund_end_time = ''
+				this.formInline.cancel_start_time = ''
+				this.formInline.cancel_end_time = ''
+				this.formInline.hx_start_time = ''
+				this.formInline.hx_end_time = ''
+				this.formInline.tf_start_time = ''
+				this.formInline.tf_end_time = ''
+				this.showDatatime = true;
+			},
 			// 统计表格数据
 			get_tongji_data(param) {
 				this.loading = true
@@ -558,6 +634,24 @@
 				if (this.formInline.refund_end_time !== '') {
 					data.refund_end_time = this.formInline.refund_end_time
 				}
+				if (this.formInline.cancel_start_time !== '') {
+					data.cancel_start_time = this.formInline.cancel_start_time
+				}
+				if (this.formInline.cancel_end_time !== '') {
+					data.cancel_end_time = this.formInline.cancel_end_time
+				}
+				if (this.formInline.hx_start_time !== '') {
+					data.hx_start_time = this.formInline.hx_start_time
+				}
+				if (this.formInline.hx_end_time !== '') {
+					data.hx_end_time = this.formInline.hx_end_time
+				}
+				if (this.formInline.tf_start_time !== '') {
+					data.tf_start_time = this.formInline.tf_start_time
+				}
+				if (this.formInline.tf_end_time !== '') {
+					data.tf_end_time = this.formInline.tf_end_time
+				}
 				if (this.formInline.status !== '') {
 					data.status = this.formInline.status
 				}