退款完成

src/components/balance/Balance.vue

@@ -21,14 +21,17 @@
 		<hr style="background-color: #CCCCCC;height: 1px;border: 0;">
 		<el-row>
 			<el-col :span="24" class="third-row">
-				<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-					highlight-current-row>
+				<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
 					<el-table-column align="center" label="学号" width="260">
 						<template slot-scope="scope">{{ scope.row.stu_number }}</template>
 					</el-table-column>
 					<el-table-column prop="user_name" label="姓名" align="center" width="400"></el-table-column>
-					<el-table-column prop="balance" label="余额（元）" align="right" width="180" :formatter="formatBalance"
-						show-overflow-tooltip></el-table-column>
+					<el-table-column prop="balance" label="余额（元）" align="right" width="180" :formatter="formatBalance" show-overflow-tooltip></el-table-column>
+					<el-table-column label="操作" align="center" v-if="userLevel == 1">
+						<el-button type="text" slot-scope="scope" @click="handleTkDialog(scope.$index, scope.row)"  v-if="scope.row.balance > 0.01">
+							<span style="color: #ffffff; display: inline-block; background-color:#ff0000; padding: 5px 8px; border-radius: 5px; margin-top: -10px;">退款</span>
+						</el-button>
+					</el-table-column>
 					<el-table-column label="操作" align="center">
 						<el-button type="text" slot-scope="scope" @click="handleShowDialog(scope.$index, scope.row)">
 							查看记录
@@ -37,9 +40,8 @@
 				</el-table>
 				<div style="margin-top: 20px" class="table-footer">
 					<div class="pages">
-						<el-pagination layout="prev, pager, next" :current-page.sync="currentPage"
-							:hide-on-single-page="true" :page-size="pageRows" :total="rows_total"
-							@current-change="handleCurrentChange"></el-pagination>
+						<el-pagination layout="prev, pager, next" :current-page.sync="currentPage" :hide-on-single-page="true" :page-size="pageRows"
+							:total="rows_total" @current-change="handleCurrentChange"></el-pagination>
 					</div>
 				</div>
 			</el-col>
@@ -47,37 +49,50 @@
 		<el-row>
 			<el-col :span="24" class="forth-row">
 				<!-- 充值记录对话框 -->
-				<el-dialog title="充值记录" :visible.sync="viewdialogFormVisible" :close-on-click-modal="false"
-					:close-on-press-escape="false" width="800px" top="0vh" class="my-dialog">
-					<hr
-						style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
+				<el-dialog title="充值记录" :visible.sync="viewdialogFormVisible" :close-on-click-modal="false" :close-on-press-escape="false" width="800px"
+					top="0vh" class="my-dialog">
+					<hr style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
 					<div class="right-tip">共计：{{ view_total_amount }}元</div>
 					<el-form :inline="true" class="demo-form-inline">
 						<el-form-item label="筛选条件：">
 							<div class="block">
-								<el-date-picker v-model="select_month" value-format="yyyy-MM" type="month"
-									placeholder="选择月" @change="handleChangeMonth">
+								<el-date-picker v-model="select_month" value-format="yyyy-MM" type="month" placeholder="选择月" @change="handleChangeMonth">
 								</el-date-picker>
 							</div>
 						</el-form-item>
 					</el-form>
-					<el-table ref="multipleTable" :data="view_tableData" tooltip-effect="dark" style="width: 100%"
-						highlight-current-row>
+					<el-table ref="multipleTable" :data="view_tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
 						<el-table-column align="center" label="时间">
 							<template slot-scope="scope">{{ scope.row.re_time }}</template>
 						</el-table-column>
-						<el-table-column align="center" prop="account" label="金额" :formatter="formatBalance"
-							show-overflow-tooltip>
+						<el-table-column align="center" prop="account" label="金额" :formatter="formatBalance" show-overflow-tooltip>
 						</el-table-column>
 					</el-table>
 					<div slot="footer" class="dialog-footer">
 						<div class="dialog-pages">
-							<el-pagination layout="prev, pager, next" :current-page.sync="view_currentPage"
-								:hide-on-single-page="true" :page-size="pageRows" :total="view_rows_total"
-								@current-change="handleViewCurrentChange"></el-pagination>
+							<el-pagination layout="prev, pager, next" :current-page.sync="view_currentPage" :hide-on-single-page="true" :page-size="pageRows"
+								:total="view_rows_total" @current-change="handleViewCurrentChange"></el-pagination>
 						</div>
 					</div>
 				</el-dialog>
+				<!-- 退费对话框 -->
+				<el-dialog title="退费" :visible.sync="tkdialogFormVisible" width="500px" top="0vh" class="my-dialog" :close-on-click-modal="false"
+					@opened="onDialogOpen" :close-on-press-escape="false">
+					<hr style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
+					<el-form :model="tkform" :rules="tkRules" ref="tkform">
+						<el-form-item label="户号：" prop="card_number" :label-width="formLabelWidth" style="margin: 20px 0;">
+							<el-input v-model="tkform.card_number" autocomplete="off" readonly></el-input>
+						</el-form-item>
+						<el-form-item label="退款金额：" prop="amount" :label-width="formLabelWidth" style="margin: 20px 0;">
+							<el-input v-model="tkform.amount" ref="inputRef" autocomplete="off" readonly>
+							</el-input>
+						</el-form-item>
+					</el-form>
+					<div slot="footer" class="dialog-footer">
+						<el-button @click="tkdialogFormVisible = false">取 消</el-button>
+						<el-button type="primary" @click="handleDialogTk('tkform')">确 定</el-button>
+					</div>
+				</el-dialog>
 			</el-col>
 		</el-row>
 	</div>
@@ -91,6 +106,24 @@
 				view_total_amount: 0.0.toFixed(2), // 查看记录对话框中的余额共计
 				searchformUser: '', // 查找的姓名
 				viewdialogFormVisible: false, // 显示隐藏查看记录对话框
+				tkdialogFormVisible: false, // 显示退款对话框
+				tkRules: {
+					amount: [{
+							required: true,
+							message: '请输入退款金额',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^(?!0\.00)(?!0?\.0?0$)([1-9][\d]{0,2}(,[\d]{3})*|0)(\.[\d]{1,2})?$/,
+							message: '请输入正确金额',
+							trigger: 'blur'
+						}
+					]
+				},
+				tkform: { // 退款对话框数据绑定
+					card_number: '',
+					amount: 0.0.toFixed(2)
+				},
 				select_month: '', // 选择的月份
 				formLabelWidth: '120px',
 				// 余额列表
@@ -101,12 +134,13 @@
 				view_tableData: [], // 查看记录列表
 				view_rows_total: 0, // 查看记录列表总记录数
 				view_currentPage: 1, // 查看记录当前页
-
 				pageRows: 8, // 每页记录数
-				stu_number: '' // 学号
+				stu_number: '', // 学号
+				userLevel: 0
 			}
 		},
 		created() {
+			this.userLevel = sessionStorage.getItem('level');
 			// 获取总金额
 			this.get_total_amount()
 			// 获取余额列表
@@ -117,6 +151,52 @@
 			this.get_amount_list(params)
 		},
 		methods: {
+			// 退款对话框确定按钮事件，操作退款
+			handleDialogTk(param) {
+				// console.log(param);
+				var _this = this;
+				let formData = new FormData();
+				if (_this.tkform.card_number != '' && typeof _this.tkform.card_number != 'undefined') {
+					params.card_number = this.tkform.card_number;
+				}
+				if (_this.tkform.amount != '' && typeof _this.tkform.amount != 'undefined') {
+					params.amount = this.tkform.amount
+				}
+
+				if (_this.tkform.amount < 0.01 || _this.tkform.amount > 1000) {
+					_this.$message.error("退款金额需要在 0.01～1000 之间！");
+					return;
+				}
+
+				this.$axios.post('/jxch-smartmp/HotWaters/waterrefund.action', formData)
+					.then(res => {
+						// console.log(res.data);
+						if (res.data.code == 200) {
+							_this.$message.success(res.data.message);
+						} else {
+							_this.$message.error(res.data.message);
+						}
+					})
+					.catch(err => {
+						// console.log(err);
+						_this.$message.error('【操作退款】请求异常: ' + err);
+					});
+			},
+			// 一弹出对话，让金额输入框获得焦点
+			onDialogOpen() {
+				this.$nextTick(() => {
+					const input = this.$refs.inputRef.$refs.input;
+					input.focus();
+					input.setSelectionRange(input.value.length, input.value.length);
+				});
+			},
+			// 退款对话框显示
+			handleTkDialog(index, row) {
+				// console.log(index, row)
+				this.tkform.card_number = row.card_number;
+				this.tkform.amount = row.balance.toFixed(2);
+				this.tkdialogFormVisible = true;
+			},
 			/**
 			 * 格式化金额，保留两位小数
 			 */
@@ -236,7 +316,7 @@
 				this.stu_number = row.stu_number;
 				// 显示查看充值记录对话框
 				this.viewdialogFormVisible = true;
-				
+
 				this.view_tableData = [];
 				this.view_rows_total = 0;
 				// 组合参数
@@ -350,4 +430,4 @@
 
 <style scoped>
 	@import url("Balance.css");
-</style>
+</style>

src/components/congzhijilu/congzhijilu.vue

@@ -15,7 +15,7 @@
 						</el-date-picker>
 					</el-form-item>
 					<el-form-item label="" class="shuibiaoId">
-						<el-input v-model="searchformUser" clearable placeholder="请输入户号/联系人/手机号"></el-input>
+						<el-input v-model="searchformUser" clearable placeholder="联系人/手机号"></el-input>
 					</el-form-item>
 					<el-form-item label="" class="zhuangtai">
 						<el-select v-model="selectItem.value" clearable placeholder="支付状态" @change="getItem">
@@ -156,8 +156,6 @@
 			}
 		},
 		created() {
-			// 获取总金额
-			// this.get_total_amount()
 			// 获取余额列表
 			let params = {
 				page: this.currentPage,
@@ -251,7 +249,7 @@
 			 * 序号的计算
 			 */
 			indexMethod(index) {
-				return (this.currentPage - 1) * 8 + index + 1;
+				return (this.currentPage - 1) * this.pageRows + index + 1;
 			},
 			/**
 			 * 格式化列数据

src/components/login/Login.vue

@@ -116,12 +116,8 @@
 									// 请求头部携带token
 									_this.$axios.defaults.headers['token'] = res.data.access_token;
 									// console.log(_this.$axios.defaults);
-									if (typeof(res.data.name) == 'undefined') {
-										sessionStorage.setItem('unic', '未设置昵称');
-									} else {
-										sessionStorage.setItem('unic', res.data.name);
-									}
-									_this.$router.replace('/index'); //跳转到首页
+									// waterqueryAdmin
+									_this.getUnic(username);
 								} else {
 									_this.$message({
 										showClose: true,
@@ -136,6 +132,34 @@
 							})
 					}
 				});
+			},
+			getUnic(uname) {
+				var _this = this;
+				let params = {
+					page: 1,
+					rows: 30
+				}
+				_this.$axios.get('/jxch-smartmp/HotWaters/waterqueryAdmin.action', {
+						params: params
+					})
+					.then(res => {
+						// console.log(res.data);
+						var t = true;
+						for (var i = 0; i < res.data.rows.length; i++) {
+							if (uname == res.data.rows[i].number) {
+								sessionStorage.setItem('unic', res.data.rows[i].name);
+								t = false;
+							}
+						}
+						if (t) {
+							sessionStorage.setItem('unic', '未设置昵称');
+						}
+						_this.$router.replace('/index'); //跳转到首页
+					})
+					.catch(err => {
+						// console.log(err);
+						_this.$message.error('捕捉异常：' + err)
+					})
 			}
 		}
 	}

src/components/tuikuan/tuikuan.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-row>
 			<el-col :span="24" class="first-row">
-				<div class="tag">充值记录</div>
+				<div class="tag">退费管理</div>
 			</el-col>
 		</el-row>
 		<el-row>
@@ -15,14 +15,7 @@
 						</el-date-picker>
 					</el-form-item>
 					<el-form-item label="" class="shuibiaoId">
-						<el-input v-model="searchformUser" clearable placeholder="请输入户号/联系人/手机号"></el-input>
-					</el-form-item>
-					<el-form-item label="" class="zhuangtai">
-						<el-select v-model="selectItem.value" clearable placeholder="支付状态" @change="getItem">
-							<el-option v-for="item in options" :key="item.value" :label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
+						<el-input v-model="searchformUser" clearable placeholder="联系人/手机号"></el-input>
 					</el-form-item>
 					<el-form-item>
 						<el-button type="primary" icon="el-icon-search" @click="onSearch">搜索</el-button>
@@ -38,7 +31,6 @@
 				<div class="">
 					<span class="item">总计：<span class="green_txt">{{ amount }}</span>元</span> <span
 						class="item">总交易笔数：<span class="green_txt">{{ total_times }}</span>笔</span> <span
-						class="item">次均额：<span class="green_txt">{{ avg }}</span>元</span>
 				</div>
 			</el-col>
 		</el-row>
@@ -54,29 +46,11 @@
 					</el-table-column>
 					<el-table-column prop="user_name" label="联系人" align="center"></el-table-column>
 					<el-table-column prop="order_num" label="交易流水号" align="center"></el-table-column>
-					<el-table-column prop="balance" label="充值前余额" align="center" :formatter="formatBalance">
+					<el-table-column prop="handler_man" label="操作账号" align="center">
 					</el-table-column>
-					<el-table-column prop="account" label="支付余额（元）" align="center" :formatter="formatBalance"
+					<el-table-column prop="account" label="支付金额（元）" align="center" :formatter="formatBalance"
 						show-overflow-tooltip></el-table-column>
-					<!-- <el-table-column prop="account" label="到账余额（元）" align="center" :formatter="formatBalance"
-						show-overflow-tooltip></el-table-column> -->
-					<el-table-column label="支付状态" align="center">
-						<template slot-scope="scope">
-							<el-tag class="green_font" v-if="scope.row.pay_state == 2" type="text"
-								@click="handleShowDialog(scope.$index, scope.row)">
-								已到账
-							</el-tag>
-							<el-tag class="red_font" v-else-if="scope.row.pay_state == 1" type="text"
-								@click="handleShowDialog(scope.$index, scope.row)">
-								未到账
-							</el-tag>
-							<el-tag class="red_font" v-else="scope.row.pay_state == 0" type="text"
-								@click="handleShowDialog(scope.$index, scope.row)">
-								未支付
-							</el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column prop="re_time" label="支付时间" align="center" width="200px"></el-table-column>
+					<el-table-column prop="time" label="支付时间" align="center" width="200px"></el-table-column>
 				</el-table>
 				<div style="margin-top: 20px" class="table-footer">
 					<div class="pages">
@@ -87,31 +61,6 @@
 				</div>
 			</el-col>
 		</el-row>
-		<el-row>
-			<el-col :span="24" class="forth-row">
-				<!-- 支付状态对话框 -->
-				<el-dialog title="支付状态" :visible.sync="viewdialogFormVisible" :close-on-click-modal="false"
-					:close-on-press-escape="false" width="500px" top="0vh" class="my-dialog">
-					<hr
-						style="width:100%; position:absolute; top:60px; left:0px; background-color:#CCCCCC; height:1px; border:0;">
-					<div class="desc">
-						<span class="lab">联系人：</span>
-						<span class="con">{{ showOrderStatus.userName }}</span>
-					</div>
-					<div class="desc">
-						<span class="lab">支付情况：</span>
-						<span class="con">{{ showOrderStatus.orderState }}</span>
-					</div>
-					<div class="desc">
-						<span class="lab">现账户余额：</span>
-						<span class="con">{{ showOrderStatus.balance }}</span>
-					</div>
-					<span class="seal-result" v-if="showOrderStatus.result == 0">已支付</span>
-					<span class="seal-result seal-result-fail" v-else-if="showOrderStatus.result == 1">未支付</span>
-					<span v-else="showOrderStatus.result == -1"></span>
-				</el-dialog>
-			</el-col>
-		</el-row>
 	</div>
 </template>
 
@@ -121,24 +70,9 @@
 			return {
 				amount: 0.0.toFixed(2),
 				total_times: 0,
-				avg: 0.0.toFixed(2),
 				select_datetime: [],
 				startTime: '',
 				endTime: '',
-				options: [{
-					value: 2,
-					label: '已到账'
-				}, {
-					value: 1,
-					label: '未到账'
-				}, {
-					value: 0,
-					label: '未支付'
-				}],
-				selectItem: {
-					value: '',
-					label: ''
-				},
 				searchformUser: '', // 查找的姓名
 				select_month: '', // 选择的月份
 				// 余额列表
@@ -157,7 +91,7 @@
 		},
 		created() {
 			// 获取总金额
-			// this.get_total_amount()
+			this.get_total_amount()
 			// 获取余额列表
 			let params = {
 				page: this.currentPage,
@@ -168,90 +102,37 @@
 			this.initDate()
 		},
 		methods: {
-			/**
-			 * 订单详情
-			 * @param {Object} index
-			 * @param {Object} row
-			 */
-			handleShowDialog(index, row) {
-				// console.log(index, row)
-				// 显示支付状态对话框
-				this.viewdialogFormVisible = true
-
-				// 获取订单状态
-				this.get_order_state(row.user_name, row.stu_number, row.order_num)
-			},
-			/**
-			 * 获取订单状态
-			 * @param {Object} userName
-			 * @param {Object} orderNo
-			 */
-			get_order_state(userName, stu_number, orderNo) {
-				// 组合参数
+			get_total_amount() {
+				var _this = this;
 				let formData = new FormData();
-				formData.append("orderNo", orderNo);
-				formData.append("stu_number", stu_number);
-
-				this.showOrderStatus = {
-					userName: '',
-					orderState: '',
-					balance: 0,
-					result: -1
+				if (typeof _this.startTime != 'undefined' && _this.startTime != '') {
+					formData.append("begin_time", _this.startTime);
 				}
-
-				var _this = this;
-				this.$axios.post('/jxch-smartmp/HotWaters/wpqueryOrder.action', formData)
+				if (typeof _this.endTime != 'undefined' && _this.endTime != '') {
+					formData.append("end_time", _this.endTime);
+				}
+				if (_this.searchformUser != '' && typeof _this.searchformUser  != 'undefined') {
+					params.user_name = this.searchformUser
+				}
+				this.$axios.post('/jxch-smartmp/HotWaters/waterrefund_total.action', formData)
 					.then(res => {
 						// console.log(res.data);
 						if (res.data.code == 200) {
-							// _this.$message.success('数据加载成功！');
-							_this.showOrderStatus.result = 0
-						} else if (res.data.code == 205) {
-							_this.showOrderStatus.result = 1
-						} else if (res.data.code == 520) {
-							_this.showOrderStatus.result = -1
-						} else {
-							_this.showOrderStatus.result = -1
-							_this.$message.warning('【获取订单状态】暂无数据！');
+							_this.amount = res.data.data;
+						} else{
+							_this.$message.error(res.data.message);
 						}
-						_this.showOrderStatus.userName = userName;
-						_this.showOrderStatus.balance = res.data.balance.toFixed(2);
-						_this.showOrderStatus.orderState = res.data.message;
 					})
 					.catch(err => {
 						// console.log(err);
-						_this.$message.error('【获取订单状态】请求异常: ' + err);
-					})
-			},
-			/**
-			 * 获取参数
-			 * @param {Object} e
-			 */
-			getItem(e) {
-				if (typeof e == 'number' && e == 2) {
-					this.selectItem.value = this.options[0].value
-					this.selectItem.label = this.options[0].label
-				} else if (typeof e == 'number' && e == 1) {
-					this.selectItem.value = this.options[1].value
-					this.selectItem.label = this.options[1].label
-				} else if (typeof e == 'number' && e == 0) {
-					this.selectItem.value = this.options[2].value
-					this.selectItem.label = this.options[2].label
-				} else {
-					this.selectItem = {
-						value: '',
-						label: ''
-					}
-				}
-
-				// console.log(typeof(this.selectItem));
-				// console.log(this.selectItem);
+						_this.$message.error('【获取退款总金额】请求异常: ' + err);
+					});
 			},
 			/**
 			 * 序号的计算
 			 */
 			indexMethod(index) {
-				return (this.currentPage - 1) * 8 + index + 1;
+				return (this.currentPage - 1) * this.pageRows + index + 1;
 			},
 			/**
 			 * 格式化列数据
@@ -263,54 +144,32 @@
 				// index: 行索引，注意：2.3.9版本以后才有。
 				return cellValue.toFixed(2)
 			},
-			formatStatus: (row, column, cellValue, index) => {
-				// row: 行数据
-				// column: 列属性
-				// cellValue: 单元格数据值
-				// index: 行索引，注意：2.3.9版本以后才有。
-				// 0：未支付，1：未到账，2：已到账
-				if (cellValue == 2) {
-					return '已到账'
-				} else if (cellValue == 1) {
-					return '未到账'
-				} else if (cellValue == 0) {
-					return '未支付'
-				} else {
-					return '未知'
-				}
-			},
 			/**
-			 * 充值记录列表
+			 * 退款列表
 			 */
 			get_amount_list(params) {
 				var _this = this
-				// _this.tableData = []
-				// _this.rows_total = 0
-				this.$axios.get('/jxch-smartmp/HotWaters/waterqueryRe.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterrefund_list.action', {
 						params: params
 					})
 					.then(res => {
 						// console.log(res.data);
-						if (typeof(res.data.rows) != 'undefined' && res.data.rows != '' && JSON.stringify(res.data) !=
+						if (typeof res.data.rows != 'undefined' && res.data.rows != '' && JSON.stringify(res.data) !=
 							'{}') {
 							// _this.$message.success('数据加载成功！');
 							_this.tableData = res.data.rows
 							_this.rows_total = res.data.total
-
-							_this.amount = res.data.totalAccount.toFixed(2)
-							_this.total_times = res.data.total
-							_this.avg = res.data.avgAccount.toFixed(2)
 						} else {
-							_this.$message.success('【充值记录列表】暂无数据！');
+							_this.$message.success('【退款列表】暂无数据！');
 						}
 					})
 					.catch(err => {
 						// console.log(err);
-						_this.$message.error('【充值记录列表】请求异常: ' + err);
+						_this.$message.error('【退款列表】请求异常: ' + err);
 					})
 			},
 			/**
-			 * 充值记录列表改变页码
+			 * 退款列表改变页码
 			 * @param {Object} val
 			 */
 			handleCurrentChange(val) {
@@ -320,21 +179,17 @@
 					page: this.currentPage,
 					rows: this.pageRows,
 				}
-				if (this.startTime != '' && typeof(this.startTime) != 'undefined') {
+				if (this.startTime != '' && typeof this.startTime != 'undefined') {
 					params.begin_time = this.startTime
 				}
-				if (this.endTime != '' && typeof(this.endTime) != 'undefined') {
+				if (this.endTime != '' && typeof this.endTime != 'undefined') {
 					params.end_time = this.endTime
 				}
-				if (this.searchformUser != '' && typeof(this.searchformUser) != 'undefined') {
+				if (this.searchformUser != '' && typeof this.searchformUser != 'undefined') {
 					params.user_name = this.searchformUser
 				}
-				if (typeof this.selectItem.value == 'number' && this.selectItem.label != '') {
-					params.value = this.selectItem.value
-					// params.label = this.selectItem.label
-				}
 
-				// 获取充值记录列表
+				// 获取退款列表
 				this.get_amount_list(params)
 			},
 			/**
@@ -409,7 +264,7 @@
 				if (typeof _this.endTime != 'undefined' && _this.endTime != '') {
 					formData.append("end_time", _this.endTime);
 				}
-				this.$axios.post('/jxch-smartmp/HotWaters/waterre_toExcel.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/watertoRefundExcel.action', formData)
 					.then(res => {
 						if (typeof res.data.downurl != 'undefined' && res.data.downurl != '' && JSON
 							.stringify(res.data) != '{}') {
@@ -423,32 +278,6 @@
 						// console.log(err);
 						_this.$message.error('【导出表格】请求异常: ' + err);
 					})
-			},
-			/**
-			 * 获取查看记录列表
-			 */
-			get_view_list(params) {
-				var _this = this
-				_this.view_tableData = []
-				// _this.view_rows_total = 0
-				this.$axios.get('/jxch-smartmp/HotWaters/waterfindRecharge.action', {
-						params: params
-					})
-					.then(res => {
-						// console.log(res.data);
-						if (typeof(res.data.rows) != 'undefined' && res.data.rows != '' && JSON.stringify(res.data) !=
-							'{}') {
-							// _this.$message.success('数据加载成功！');
-							_this.view_tableData = res.data.rows
-							_this.view_rows_total = res.data.total
-						} else {
-							_this.$message.success('【获取查看记录列表】暂无数据！');
-						}
-					})
-					.catch(err => {
-						// console.log(err);
-						_this.$message.error('【获取查看记录列表】请求异常: ' + err);
-					})
 			}
 		}
 	}

src/components/zhuanghaoguanli/zhuanghaoguanli.vue

@@ -23,16 +23,15 @@
 		<hr style="background-color: #CCCCCC;height: 1px;border: 0;">
 		<el-row>
 			<el-col :span="24" class="third-row">
-				<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-					highlight-current-row>
+				<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" highlight-current-row>
 					<el-table-column label="昵称" align="center">
 						<template slot-scope="scope">{{ scope.row.name }}</template>
 					</el-table-column>
 					<el-table-column prop="number" label="账号" align="center"></el-table-column>
 					<el-table-column prop="password" label="密码" show-overflow-tooltip>*********</el-table-column>
 					<el-table-column label="操作" align="center" width="80">
-						<el-button type="text" class="del-btn" slot-scope="scope"
-							v-if="scope.row.number != login_account" @click="handleDelete(scope.$index, scope.row)">删除
+						<el-button type="text" class="del-btn" slot-scope="scope" v-if="scope.row.number != login_account"
+							@click="handleDelete(scope.$index, scope.row)">删除
 						</el-button>
 					</el-table-column>
 					<el-table-column width="130">
@@ -42,8 +41,8 @@
 				</el-table>
 				<div style="margin-top: 20px" class="table-footer">
 					<div class="pages">
-						<el-pagination layout="prev, pager, next" :total="total_rows" :current-page.sync="current_page"
-							:hide-on-single-page="true" :page-size="page_rows" @current-change="handleCurrentChange">
+						<el-pagination layout="prev, pager, next" :total="total_rows" :current-page.sync="current_page" :hide-on-single-page="true"
+							:page-size="page_rows" @current-change="handleCurrentChange">
 						</el-pagination>
 					</div>
 				</div>
@@ -52,10 +51,9 @@
 		<el-row>
 			<el-col :span="24" class="forth-row">
 				<!-- 添加对话框 -->
-				<el-dialog title="添加账号" :visible.sync="adddialogFormVisible" width="500px" top="0vh" class="my-dialog"
-					:close-on-click-modal="false" :close-on-press-escape="false">
-					<hr
-						style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
+				<el-dialog title="添加账号" :visible.sync="adddialogFormVisible" width="500px" top="0vh" class="my-dialog" :close-on-click-modal="false"
+					:close-on-press-escape="false">
+					<hr style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
 					<el-form :model="addform" :rules="addRules" ref="addform">
 						<el-form-item label="昵称：" prop="name" :label-width="formLabelWidth">
 							<el-input v-model="addform.name" autocomplete="off" minlength="5" maxlength="16"></el-input>
@@ -65,13 +63,11 @@
 							</el-input>
 						</el-form-item>
 						<el-form-item label="密码：" prop="password" :label-width="formLabelWidth">
-							<el-input v-model="addform.password" type="password" minlength="5" autocomplete="off"
-								maxlength="16">
+							<el-input v-model="addform.password" type="password" minlength="5" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
 						<el-form-item label="确认密码：" prop="comfirmPass" :label-width="formLabelWidth">
-							<el-input v-model="addform.comfirmPass" type="password" minlength="5" autocomplete="off"
-								maxlength="16">
+							<el-input v-model="addform.comfirmPass" type="password" minlength="5" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
 					</el-form>
@@ -81,10 +77,9 @@
 					</div>
 				</el-dialog>
 				<!-- 编辑对话框 -->
-				<el-dialog title="编辑" :visible.sync="editdialogFormVisible" width="500px" top="0vh" class="my-dialog"
-					:close-on-click-modal="false" :close-on-press-escape="false">
-					<hr
-						style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
+				<el-dialog title="编辑" :visible.sync="editdialogFormVisible" width="500px" top="0vh" class="my-dialog" :close-on-click-modal="false"
+					:close-on-press-escape="false">
+					<hr style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
 					<el-form :model="form" :rules="formRules" ref="form">
 						<el-form-item label="昵称：" prop="name" :label-width="formLabelWidth">
 							<el-input ref="nicheng" v-model="form.name" autocomplete="off" maxlength="16"></el-input>
@@ -93,18 +88,15 @@
 							<el-input ref="zhanghao" v-model="form.number" autocomplete="off" maxlength="16"></el-input>
 						</el-form-item>
 						<el-form-item label="原密码：" prop="oldPassword" :label-width="formLabelWidth">
-							<el-input ref="yuanmima" v-model="form.oldPassword" type="password" autocomplete="off"
-								maxlength="16">
+							<el-input ref="yuanmima" v-model="form.oldPassword" type="password" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
 						<el-form-item label="新密码：" prop="password" :label-width="formLabelWidth">
-							<el-input ref="xinmima" v-model="form.password" autocomplete="off" type="password"
-								maxlength="16">
+							<el-input ref="xinmima" v-model="form.password" autocomplete="off" type="password" maxlength="16">
 							</el-input>
 						</el-form-item>
 						<el-form-item label="确认新密码：" prop="comfirmPass" :label-width="formLabelWidth">
-							<el-input ref="querenmima" v-model="form.comfirmPass" autocomplete="off" type="password"
-								maxlength="16">
+							<el-input ref="querenmima" v-model="form.comfirmPass" autocomplete="off" type="password" maxlength="16">
 							</el-input>
 						</el-form-item>
 					</el-form>
@@ -114,8 +106,8 @@
 					</div>
 				</el-dialog>
 				<!-- 删除对话框 -->
-				<el-dialog :visible.sync="delDialogVisible" width="500px" center top="0vh" class="my-dialog"
-					:close-on-click-modal="false" :close-on-press-escape="false">
+				<el-dialog :visible.sync="delDialogVisible" width="500px" center top="0vh" class="my-dialog" :close-on-click-modal="false"
+					:close-on-press-escape="false">
 					<div class="box-icon"></div>
 					<span class="del-msg">确定删除【{{del_account}}】账号吗？</span>
 					<span slot="footer" class="dialog-footer">
@@ -124,14 +116,12 @@
 					</span>
 				</el-dialog>
 				<!-- 删除账号密码验证对话框 -->
-				<el-dialog title="验证密码" :visible.sync="delDialogEnterPwdVisible" width="500px" top="0vh"
-					class="my-dialog" :close-on-click-modal="false" :close-on-press-escape="false">
-					<hr
-						style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
+				<el-dialog title="验证密码" :visible.sync="delDialogEnterPwdVisible" width="500px" top="0vh" class="my-dialog" :close-on-click-modal="false"
+					:close-on-press-escape="false">
+					<hr style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
 					<el-form :model="delConfirmPwdform" :rules="delConfirmPwdRules" ref="delConfirmPwdform">
 						<el-form-item label="请输入密码：" prop="delPwd" :label-width="formLabelWidth">
-							<el-input ref="delPwd" v-model="delConfirmPwdform.delPwd" type="password" autocomplete="off"
-								maxlength="16">
+							<el-input ref="delPwd" v-model="delConfirmPwdform.delPwd" type="password" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
 					</el-form>
@@ -186,7 +176,7 @@
 							trigger: 'blur'
 						},
 						{
-							pattern:/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
+							pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
 							message: '请输入包含大小写英文字母、数字、特殊符号，8到20位',
 							trigger: 'blur'
 						}
@@ -197,7 +187,7 @@
 							trigger: 'blur'
 						},
 						{
-							pattern:/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
+							pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
 							message: '请输入包含大小写英文字母、数字、特殊符号，8到20位',
 							trigger: 'blur'
 						}
@@ -254,7 +244,7 @@
 							trigger: 'blur'
 						},
 						{
-							pattern:/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
+							pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
 							message: '请输入包含大小写英文字母、数字、特殊符号，8到20位',
 							trigger: 'blur'
 						}
@@ -265,7 +255,7 @@
 							trigger: 'blur'
 						},
 						{
-							pattern:/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
+							pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?])[a-zA-Z\d!@#$%^&*()_+\-=[\]{};':"\\|,.<>\/?]{8,20}$/,
 							message: '请输入包含大小写英文字母、数字、特殊符号，8到20位',
 							trigger: 'blur'
 						}
@@ -598,4 +588,4 @@
 
 <style scoped>
 	@import url("zhuanghaoguanli.css");
-</style>
+</style>

src/main.js

@@ -18,7 +18,6 @@ Axios.defaults.headers['token'] = sessionStorage.getItem('token');
 // Axios.defaults.baseURL='https://jtishfw.ncjti.edu.cn/jxch-smartmp'
 // console.log('环境：' + process.env.NODE_ENV)
 Vue.use(ElementUI);
-
 // Vue.prototype.$qs = Qs;
 // Vue.prototype.$api = Api;
 Vue.prototype.$axios = Axios;