优化

src/components/balance/Balance.vue

@@ -72,7 +72,7 @@
 					</el-table>
 					<div slot="footer" class="dialog-footer">
 						<div class="dialog-pages">
-							<el-pagination layout="prev, pager, next" :current-page.sync="currentPage"
+							<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>
@@ -117,6 +117,9 @@
 			this.get_amount_list(params)
 		},
 		methods: {
+			/**
+			 * 格式化金额，保留两位小数
+			 */
 			formatBalance: (row, column, cellValue, index) => {
 				// row: 行数据
 				// column: 列属性
@@ -147,7 +150,7 @@
 			 */
 			get_amount_list(params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterMoney.action', {
 						params: params
@@ -230,9 +233,12 @@
 				// console.log(index, row)
 				// 获取当月
 				this.select_month = this.getNowFormatDate();
-				this.stu_number = row.stu_number
+				this.stu_number = row.stu_number;
 				// 显示查看充值记录对话框
-				this.viewdialogFormVisible = true
+				this.viewdialogFormVisible = true;
+				
+				this.view_tableData = [];
+				this.view_rows_total = 0;
 				// 组合参数
 				let params = {
 					stu_number: this.stu_number,
@@ -242,10 +248,10 @@
 				}
 
 				// 获取查看记录列表
-				this.get_view_list(params)
+				this.get_view_list(params);
 
 				// 充值记录总计
-				this.get_view_total_amount()
+				this.get_view_total_amount();
 			},
 			/**
 			 * 充值记录总计
@@ -280,12 +286,12 @@
 			 */
 			handleChangeMonth() {
 				// console.log(this.select_month);
-				this.currentPage = 1
+				this.view_currentPage = 1
 				// 组合参数
 				let params = {
 					stu_number: this.stu_number,
 					time: this.select_month,
-					page: this.currentPage,
+					page: this.view_currentPage,
 					rows: this.pageRows
 				}
 
@@ -300,14 +306,12 @@
 			 */
 			get_view_list(params) {
 				var _this = this
-				_this.view_tableData = []
-				// _this.view_rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterfindRecharge.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.view_tableData = res.data.rows

src/components/congzhijilu/congzhijilu.css

@@ -341,6 +341,6 @@
 }
 
 .seal-result-fail {
-	border-color: rgba(180, 0, 0, 0.5);
-	color: rgba(180, 0, 0, 0.5);
+	border-color: rgba(222, 0, 0, 0.5);
+	color: rgba(222, 0, 0, 0.5);
 }

src/components/congzhijilu/congzhijilu.vue

@@ -205,17 +205,18 @@
 						// console.log(res.data);
 						if (res.data.code == 200) {
 							// _this.$message.success('数据加载成功！');
-							_this.showOrderStatus.userName = userName;
-							_this.showOrderStatus.balance = res.data.balance.toFixed(2);
-							_this.showOrderStatus.orderState = res.data.message;
-							if (_this.showOrderStatus.orderState.indexOf('已支付') != -1) {
-								_this.showOrderStatus.result = 0
-							} else{
-								_this.showOrderStatus.result = 1
-							}
+							_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.showOrderStatus.userName = userName;
+						_this.showOrderStatus.balance = res.data.balance.toFixed(2);
+						_this.showOrderStatus.orderState = res.data.message;
 					})
 					.catch(err => {
 						// console.log(err);
@@ -283,7 +284,7 @@
 			 */
 			get_amount_list(params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterqueryRe.action', {
 						params: params

src/components/dev_mgr/DevMgr.vue

@@ -319,7 +319,7 @@
 			 */
 			updateTable(url, params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get(url, {
 						params: params

src/components/yongshuifenxi/yongshuifenxi.vue

@@ -397,11 +397,9 @@
 			 * @param {Object} e
 			 */
 			show_detail() {
-				var _this = this
-
-				_this.detail_tableData = []
-
-				this.detail_dialogFormVisible = true
+				// this.detail_tableData = [];
+				this.detail_dialogFormVisible = true;
+				
 				let params = {
 					page: this.control_table.detail_current_page,
 					rows: this.control_table.detail_page_rows
@@ -415,6 +413,8 @@
 				if (this.detail_userName != '' && typeof(this.detail_userName) != 'undefined') {
 					params.username = this.detail_userName
 				}
+				
+				var _this = this;
 				// 显示详细列表
 				this.$axios.get('/shuidian/HotWaters/waterdetailWater.action', {
 						params: params

src/components/yongshuiyichang/yongshuiyichang.vue

@@ -213,7 +213,7 @@
 			 */
 			get_use_water_exception_list(params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterqueryErrorWater.action', {
 						params: params

src/components/zhifuyichang/zhifuyichang.vue

@@ -59,7 +59,7 @@
 		data() {
 			return {
 				drom_value: 0, // 项目编码
-				drom: '', // 项目
+				drom: '水费', // 项目
 				// 项目下拉列表
 				drom_options: { // 下拉列表的数据绑定
 					builds: [{
@@ -111,6 +111,7 @@
 					page: this.currentPage,
 					rows: this.pageRows
 				}
+				
 				if (this.drom == '水费') {
 					// 水费支付异常列表
 					this.get_water_exception_list(params)
@@ -126,7 +127,7 @@
 			 */
 			handleShowDialog(index, row) {
 				// this.detail_dialogFormVisible = true
-				console.log(index, row)
+				// console.log(index, row)
 				var _this = this
 				this.$confirm('是否现在处理？', '提示', {
 						confirmButtonText: '确定处理',
@@ -186,7 +187,7 @@
 			 */
 			get_water_exception_list(params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterfindErrorPayByNo.action', {
 						params: params
@@ -211,7 +212,7 @@
 			 */
 			get_electric_exception_list(params) {
 				var _this = this
-				_this.tableData = []
+				// _this.tableData = []
 				// _this.rows_total = 0
 				this.$axios.get('/shuidian/HotWaters/waterfindErrorElcPayByNo.action', {
 						params: params