完成

src/views/accountMgr/index.vue

@@ -245,7 +245,7 @@
 				setTimeout(() => {
 					var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
 					if (!reg.test(value)) {
-						callback(new Error('包含大小写字母、数字、特殊符号，长度大于8-20位'));
+						callback(new Error('包含大小写字母、数字、特殊符号，长度8-20位'));
 					} else {
 						callback();
 					}
@@ -258,7 +258,7 @@
 				setTimeout(() => {
 					var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
 					if (!reg.test(value)) {
-						callback(new Error('确认密码包含大小写字母、数字、特殊符号，长度大于8-20位'));
+						callback(new Error('确认密码包含大小写字母、数字、特殊符号，长度8-20位'));
 					} else if (this.formAddAcount.password !== this.formAddAcount.confirmPassword) {
 						callback(new Error('确认密码与密码不一致！'));
 					} else {
@@ -271,7 +271,7 @@
 					setTimeout(() => {
 						var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
 						if (!reg.test(value)) {
-							callback(new Error('密码包含大小写字母、数字、特殊符号，长度大于8-20位'));
+							callback(new Error('密码包含大小写字母、数字、特殊符号，长度8-20位'));
 						} else {
 							callback();
 						}
@@ -285,7 +285,7 @@
 					setTimeout(() => {
 						var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
 						if (!reg.test(value)) {
-							callback(new Error('确认密码包含大小写字母、数字、特殊符号，长度大于8-20位'));
+							callback(new Error('确认密码包含大小写字母、数字、特殊符号，长度8-20位'));
 						} else if (this.formAddAcount.password !== this.formAddAcount.confirmPassword) {
 							callback(new Error('确认密码与密码不一致！'));
 						} else {

src/views/residentialhostelMgr/index.vue

@@ -34,24 +34,6 @@
 							<el-table-column type="expand" width="58">
 								<template slot-scope="props">
 									<el-form label-position="left" inline class="demo-table-expand">
-										<!-- <el-form-item label="状态">
-											<span>{{ props.row.status === 1 ? '正常' : '已冻结' }}</span>
-										</el-form-item>
-										<el-form-item label="民宿名称">
-											<span>{{ props.row.hotelName }}</span>
-										</el-form-item>
-										<el-form-item label="联系人(法人)">
-											<span>{{ props.row.corpnName }}</span>
-										</el-form-item>
-										<el-form-item label="联系电话">
-											<span>{{ props.row.corpnPhone }}</span>
-										</el-form-item>
-										<el-form-item label="所属乡镇">
-											<span>{{ props.row.hotelTownshipName }}</span>
-										</el-form-item>
-										<el-form-item label="民宿账号">
-											<span>{{ props.row.adminName }}</span>
-										</el-form-item> -->
 										<el-form-item label="银行卡号">
 											<span>{{ props.row.bankCard }}</span>
 										</el-form-item>
@@ -1290,7 +1272,7 @@
 			 * 修改民宿
 			 */
 			modify_house_dialog_handler() {
-				console.log(this.formModifyHostel);
+				// console.log(this.formModifyHostel);
 				// 调用修改接口
 				this.$refs["modifyHostelForm"].validate(validate => {
 					if (validate) {
@@ -1305,6 +1287,7 @@
 								// 重新读取，刷新表格显示
 								this.get_table_data('list');
 
+								this.clear_modify_data()
 								this.dialogModifyHostelFormVisible = false;
 								this.$message.success(res.message);
 							} else {
@@ -1320,6 +1303,24 @@
 					}
 				})
 			},
+			clear_modify_data() {
+				this.formModifyHostel = {
+					// options: [],
+					id: '',
+					hotelTownship: '',
+					hotelTownshipName: '',
+					hotelName: '',
+					corpnName: '',
+					corpnPhone: '',
+					adminName: '',
+					bankCard: '',
+					cardName: '',
+					bankName: '',
+					fileUrl: '', // 图片上传列表
+					url: '', // 上传的图片列表
+					// level: this.$store.state.user.level
+				}
+			},
 			/**
 			 * 重置密码
 			 */
@@ -1452,6 +1453,8 @@
 				getTowns().then((res) => {
 					if (res.code === 200) {
 						this.formInline.options = []
+						this.formAddHostel.options = []
+						this.formModifyHostel.options = []
 						for (var i = 0; i < res.data.length; i++) {
 							let town = {
 								id: res.data[i].id,

src/views/stdbookMgr/index.vue

@@ -44,21 +44,6 @@
 							<el-table-column type="expand" width="50">
 								<template slot-scope="props">
 									<el-form label-position="left" inline class="demo-table-expand">
-										<!-- <el-form-item label="所属乡镇">
-											<span>{{ props.row.hotelHposition }}</span>
-										</el-form-item>
-										<el-form-item label="民宿名称">
-											<span>{{ props.row.hotelName }}</span>
-										</el-form-item>
-										<el-form-item label="订单号">
-											<span>{{ props.row.orderNum }}</span>
-										</el-form-item>
-										<el-form-item label="订单金额（元）">
-											<span>{{ props.row.houseTotalPrice }}</span>
-										</el-form-item>
-										<el-form-item label="退房时间">
-											<span>{{ props.row.checkOutTime }}</span>
-										</el-form-item> -->
 										<el-form-item label="民宿联系人">
 											<span>{{ props.row.hotelPerson }}</span>
 										</el-form-item>
@@ -78,7 +63,7 @@
 											<span>{{ props.row.hotelHpositionWens }}</span>
 										</el-form-item>
 										<el-form-item label="接单设置">
-											<span>{{ props.row.hotelIsCanorder }}</span>
+											<span>{{ props.row.hotelIsCanorder == 1 ? '自动接单' : '手动接单' }}</span>
 										</el-form-item>
 										<el-form-item label="酒店状态(1 营业 2.休息)">
 											<span>{{ props.row.hotelStatus }}</span>
@@ -103,7 +88,7 @@
 							</el-table-column>
 							<el-table-column label="所属乡镇" align="center" width="180">
 								<template slot-scope="scope">
-									<span>{{ scope.row.hotelHposition }}</span>
+									<span>{{ scope.row.hotelTownshipName }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="民宿名称" align="center">