Browse Source

民宿管理下单后响应订单时间修改

soft5566 2 years ago
parent
commit
ba030aa868

+ 24 - 21
src/views/perimeterMgr/index.vue

@@ -689,35 +689,38 @@
 					}]
 					}]
 				},
 				},
 				rtypeOptions: [{
 				rtypeOptions: [{
+					rtypeId: 0,
+					rtype: '民宿'
+				},{
 					rtypeId: 1,
 					rtypeId: 1,
 					rtype: '美食'
 					rtype: '美食'
 				}, {
 				}, {
 					rtypeId: 2,
 					rtypeId: 2,
 					rtype: '景点'
 					rtype: '景点'
-				}, {
-					rtypeId: 3,
-					rtype: '停车场'
-				}, {
-					rtypeId: 4,
-					rtype: '洗浴'
-				}, {
-					rtypeId: 5,
-					rtype: '健身'
-				}, {
-					rtypeId: 6,
-					rtype: 'KTV'
-				}, {
-					rtypeId: 7,
-					rtype: '电影院'
-				}, {
-					rtypeId: 8,
-					rtype: '酒吧'
+				// }, {
+				// 	rtypeId: 3,
+				// 	rtype: '停车场'
+				// }, {
+				// 	rtypeId: 4,
+				// 	rtype: '洗浴'
+				// }, {
+				// 	rtypeId: 5,
+				// 	rtype: '健身'
+				// }, {
+				// 	rtypeId: 6,
+				// 	rtype: 'KTV'
+				// }, {
+				// 	rtypeId: 7,
+				// 	rtype: '电影院'
+				// }, {
+				// 	rtypeId: 8,
+				// 	rtype: '酒吧'
 				}, {
 				}, {
 					rtypeId: 9,
 					rtypeId: 9,
 					rtype: '加油站'
 					rtype: '加油站'
-				}, {
-					rtypeId: 10,
-					rtype: '其它'
+				// }, {
+				// 	rtypeId: 10,
+				// 	rtype: '其它'
 				}],
 				}],
 				// 查询数据
 				// 查询数据
 				formInline: {
 				formInline: {

+ 8 - 0
src/views/residentialhostelMgr/index.vue

@@ -1175,6 +1175,14 @@
 				})
 				})
 				return
 				return
 			}
 			}
+
+			this.otherConfig[0].miniteOptions = []
+			for (var i = 1; i <= 60; i++) {
+				this.otherConfig[0].miniteOptions.push({
+					value: i,
+					label: i + ' 分钟'
+				})
+			}
 			// 获取消费记录,表格数据
 			// 获取消费记录,表格数据
 			this.get_table_data('list')
 			this.get_table_data('list')
 			// 获取乡镇
 			// 获取乡镇

+ 1 - 1
src/views/stdbookMgr/index.vue

@@ -106,7 +106,7 @@
 							</el-table-column>
 							</el-table-column>
 							<el-table-column label="入账金额(元)" align="center" width="160">
 							<el-table-column label="入账金额(元)" align="center" width="160">
 								<template slot-scope="scope">
 								<template slot-scope="scope">
-									<span>{{ scope.row.houseTotalPrice }}</span>
+									<span>{{ scope.row.inAccount }}</span>
 								</template>
 								</template>
 							</el-table-column>
 							</el-table-column>
 							<el-table-column label="退房时间" align="center" width="155" fixed="right">
 							<el-table-column label="退房时间" align="center" width="155" fixed="right">