阶段性提交

src/api/audited.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取表格分页数据
+export function getTableData() {
+	return request({
+		url: '/workflowqueryApprovedWorkflow.action',
+		method: 'get'
+	})
+}

src/api/myAgent.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取表格分页数据
+export function getTableData() {
+	return request({
+		url: '/workflowqueryWorkflow.action',
+		method: 'get'
+	})
+}

src/router/index.js

@@ -127,14 +127,14 @@ export const constantRoutes = [{
 				title: '账号管理'
 			}
 		}, {
-			path: 'Residentialhostel',
+			path: 'residentialhostel',
 			name: 'Residentialhostel',
 			component: () => import('@/views/residentialhostelMgr/index'),
 			meta: {
 				title: '民宿管理'
 			}
 		}, {
-			path: 'DiscountCoupon',
+			path: 'discountCoupon',
 			name: 'DiscountCoupon',
 			component: () => import('@/views/discountCouponMgr/index'),
 			meta: {

src/views/accountMgr/index.vue

@@ -20,7 +20,7 @@
 							</el-form>
 							<el-button type="primary" class="export" @click="add_account">添加账号</el-button>
 						</div>
-						<el-table :data="tableData" height="510" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+						<el-table :data="tableData" height="558" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style">
 							<el-table-column label="序号" align="center" width="100">
 								<template slot-scope="scope">

src/views/audited/index.vue

@@ -8,21 +8,130 @@
 							<div class="title">流程管理/已审核</div>
 						</div>
 					</div>
-					<div class="cell-body" style="height: 670px;">
-						
+					<div class="cell-body">
+						<el-table ref="multipleTable" :data="tableData" height="620" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+							:header-cell-style="header_cell_style">
+							<el-table-column fixed="left" type="index" label="序号" align="center" width="80">
+							</el-table-column>
+							<el-table-column fixed="left" label="状态" align="center" width="100">
+								<template slot-scope="scope">
+									<!-- <span v-if="scope.row.status == 1" style="color: #666;">正在审批</span>
+									<span v-else-if="scope.row.status == 2" style="color: #56AA2E;">审批通过</span>
+									<span v-else-if="scope.row.status == 3" style="color: #F9273F;">拒绝</span> -->
+									<span v-if="scope.$index == 0" style="color: #F9273F;">驳回</span>
+									<span v-else-if="scope.$index == 1" style="color: #56AA2E;">已审核</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="发起人" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.createName }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="评价内容" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.remark }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批时间" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowDate }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批人" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowName }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批备注" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowRemark }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column fixed="right" label="操作" width="120">
+								<template slot-scope="scope">
+									<el-button @click="handleClickZhuban(scope.$index, scope.row)" type="text" size="small">详情</el-button>
+								</template>
+							</el-table-column>
+						</el-table>
+						<div class="pagination-table">
+							<el-pagination @current-change="currentPageChange" :current-page.sync="pagination.currentPage" :page-size="pagination.pageSize"
+								layout="prev, pager, next, jumper" :total="pagination.total">
+							</el-pagination>
+						</div>
 					</div>
 				</div>
 			</el-col>
 		</el-row>
+		<!-- 民宿信息维护 -->
+		<el-dialog title="民宿信息维护" custom-class="acceptance-class" :visible.sync="dialogInfoMinsuVisible" :close-on-click-modal="false"
+			:close-on-press-escape="false" @close="dialogInfoMinsuVisible = false">
+			<div style="height: 570px; padding: 0; margin: 0; overflow:auto;">
+				<h3 style="margin: 20px 0;">民宿图片：</h3>
+				<div class="imgs">
+					<div v-for="(image, index) in complaint.fileInfos" :key="index">
+						<img :src="image.url" v-if="!image.url.endsWith('.mp4')" style="margin: 0 2px; border-radius: 5px;" alt=""
+							@click="handlePictureCardPreview(image.url)" height="80px" width="80px" />
+					</div>
+				</div>
+				<div>
+					<h3 style="padding-top: 20px;">简介：</h3>
+					<p><el-input type="textarea" style="margin-left: 50px; margin-top: -30px; width: calc(100% - 70px);" :rows="6" placeholder="暂无简介信息"
+							v-model="complaint.remark" maxlength="200" show-word-limit>
+						</el-input>
+					</p>
+				</div>
+				<div style="border-top: 1px solid #ccc; display: flex; padding-top: 10px;">
+					<h3>状态：</h3>
+					<h3>状态</h3>
+				</div>
+				<div>
+					<h3 style="padding-top: 0px;">备注：</h3>
+					<p><el-input type="textarea" style="margin-left: 50px; margin-top: -30px; width: calc(100% - 70px);" :rows="6" placeholder="暂无简介信息"
+							v-model="complaint.remark" maxlength="200" show-word-limit>
+						</el-input>
+					</p>
+				</div>
+			</div>
+		</el-dialog>
+		<!-- 查看图片 -->
+		<el-dialog :visible.sync="dialogVisible">
+			<img width="100%" :src="dialogImageUrl" alt="">
+		</el-dialog>
+		<!-- 评价 -->
+		<el-dialog title="评价" custom-class="acceptance-class" :visible.sync="dialogevaluateVisible" :close-on-click-modal="false" :close-on-press-escape="false"
+			@close="dialogevaluateVisible = false">
+			<div style="height: 570px; padding: 0; margin: 0; overflow:auto;">
+				<div>
+					<h3 style="padding-top: 20px;">评价描述：</h3>
+					<p style="margin-left: 80px; margin-top: -35px; width: calc(100% - 80px); height: 100px;">评价描述评价描述评价描述评价描述评价描述</p>
+				</div>
+				<h3 style="margin: 20px 0;">视频/图片：</h3>
+				<div class="imgs">
+					<div v-for="(image, index) in complaint.fileInfos" :key="index">
+						<img :src="image.url" v-if="!image.url.endsWith('.mp4')" style="margin: 0 2px; border-radius: 5px;" alt=""
+							@click="handlePictureCardPreview(image.url)" height="80px" width="80px" />
+					</div>
+				</div>
+				<div style="border-top: 1px solid #ccc; display: flex; padding-top: 10px;">
+					<h3>状态：</h3>
+					<h3>状态</h3>
+				</div>
+				<div>
+					<h3 style="padding-top: 0px;">备注：</h3>
+					<p><el-input type="textarea" style="margin-left: 50px; margin-top: -30px; width: calc(100% - 70px);" :rows="6" placeholder="暂无简介信息"
+							v-model="complaint.remark" maxlength="200" show-word-limit>
+						</el-input>
+					</p>
+				</div>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-	// import {
-	// 	getTableData,
-	// 	getXiang,
-	// 	downloadExcel
-	// } from '@/api/complaintMgr'
+	import {
+		getTableData
+	} from '@/api/audited'
 
 	export default {
 		data() {
@@ -60,7 +169,6 @@
 					keyword: ''
 				},
 				tableData: [],
-				cond_data: {},
 				// 分页参数
 				pagination: {
 					currentPage: 1,
@@ -80,13 +188,9 @@
 					images: [],
 					complaintTime: '2022-01-01 10:00:00'
 				},
-				dialogComplaintVisible: false,
-				dialogVisible: false,
-				dialogRemarksFormVisible: false, // 添加备注
-				formRemarks: {
-					id: '',
-					remark: ''
-				}
+				dialogInfoMinsuVisible: false, // 民宿信息维护
+				dialogevaluateVisible: false, // 评价
+				dialogVisible: false
 			}
 		},
 		created() {
@@ -98,76 +202,41 @@
 				return
 			}
 			// 获取消费记录,表格数据
-			this.get_table_data('list')
+			this.get_table_data()
 		},
 		mounted() {
 			document.getElementsByClassName("el-pagination__jump")[0].childNodes[0].nodeValue = "跳至";
 		},
 		methods: {
+			// 浏览图片
 			handlePictureCardPreview(file) {
 				this.dialogImageUrl = file;
 				this.dialogVisible = true;
 			},
-			/**
-			 * 添加备注
-			 */
-			handleRemarks() {
-				console.log(this.formRemarks);
-			},
-			/**
-			 * 受理
-			 * @param {Object} row
-			 */
-			handleClickAcceptance(row) {
-				// console.log(row);
-				this.formRemarks.id = row.id;
-				this.dialogRemarksFormVisible = true;
-			},
-			// 点击查看备注，弹出投诉详情对话框
-			handleClickRemarks(row) {
-				// console.log(row);
-				this.dialogComplaintVisible = true
-
-				getXiang(row).then((res) => {
-					console.log(res.data);
-					if (res.code === 200) {
-						this.complaint = res.data
-					} else {
-						this.complaint = []
-						this.$message.warning('没有符合条件的数据！')
-					}
-				}).catch((err) => {
-					// console.log(err);
-					this.$message.error(err.message)
-				});
-			},
-			// 关闭投诉详情对话框
-			complaint_close() {
-				this.dialogComplaintVisible = false
+			// 民宿信息维护-主办
+			handleClickZhuban(index, row) {
+				// console.log(row, index);
+				if ((index + 1) % 2 == 0)
+					this.dialogInfoMinsuVisible = true;
+				else
+					this.dialogevaluateVisible = true;
 			},
 			/**
 			 * 获取消费记录,表格数据
 			 */
-			get_table_data(param) {
+			get_table_data() {
 				this.loading = true
-				this.get_condtion();
-
-				let data = this.cond_data;
-				if (param == 'search') {
-					data.page = 1
-					this.pagination.currentPage = 1
-				}
 
 				var that = this
 				// console.log(data);
-				getTableData(data).then((res) => {
+				getTableData().then((res) => {
 					// console.log(res.data);
 					if (res.code === 200) {
 						var d = res.data
-						that.pagination.total = d.total
+						// that.pagination.total = d.total
 						that.tableData = []
-						for (var i = 0; i < d.pageList.length; i++) {
-							that.tableData.push(d.pageList[i])
+						for (var i = 0; i < d.length; i++) {
+							that.tableData.push(d[i])
 						}
 					} else {
 						that.tableData = []
@@ -180,29 +249,6 @@
 				that.loading = false;
 			},
 			/**
-			 * 查询条件
-			 */
-			get_condtion() {
-				let data = {
-					page: this.pagination.currentPage,
-					rows: this.pagination.pageSize
-				}
-
-				if (this.formInline.status !== '') {
-					data.status = this.formInline.status
-				}
-
-				if (this.formInline.search_datatime !== '') {
-					data.search_datatime = this.formInline.search_datatime
-				}
-
-				if (this.formInline.keyword !== '') {
-					data.keyword = this.formInline.keyword
-				}
-
-				this.cond_data = data;
-			},
-			/**
 			 * 导出为Excel
 			 */
 			exportExcel() {
@@ -306,38 +352,6 @@
 
 					.cell-body {
 
-						.controls {
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-
-							.demo-form-inline {
-								display: inline-flex;
-								flex-wrap: wrap;
-								align-items: center;
-								justify-content: flex-start;
-
-								.btn-search {
-									background: rgba(9, 101, 98, 1);
-									font-size: 14px;
-									color: #FFFFFF;
-									font-family: Microsoft YaHei-3970(82674968);
-									border-radius: 5px;
-									border: none;
-								}
-							}
-
-							.export {
-								background: rgba(9, 101, 98, 1);
-								font-size: 14px;
-								color: #FFFFFF;
-								font-family: Microsoft YaHei-3970(82674968);
-								border-radius: 5px;
-								margin-bottom: 22px;
-								border: none;
-							}
-						}
-
 						.pagination-table {
 							display: flex;
 							justify-content: flex-end;
@@ -490,12 +504,21 @@
 				}
 			}
 		}
+
+		>>>.el-table__fixed-body-wrapper .el-table__body {
+			padding-bottom: 17px !important; // 滚动条高度
+		}
+
+		>>>.el-table__fixed,
+		>>>.el-table__fixed-right {
+			height: calc(100% - 14px) !important;
+		}
 	}
 </style>
 
 <style>
 	.acceptance-class {
-		height: 650px !important;
+		height: 680px !important;
 	}
 
 	.add-remarks-class {
@@ -514,6 +537,7 @@
 		display: flex;
 		flex-direction: row;
 		margin-left: 20px;
+		height: 230px;
 	}
 
 	.lbl-cls {
@@ -523,4 +547,12 @@
 		padding-right: 10px;
 		color: #bbb;
 	}
+
+	.confirm-btn {
+		border: none !important;
+		background: rgba(9, 101, 98, 1) !important;
+		color: #fff !important;
+		border-radius: 5px !important;
+		margin-left: 28px !important;
+	}
 </style>

src/views/complaintMgr/index.vue

@@ -32,7 +32,7 @@
 							</el-form>
 							<el-button type="primary" icon="el-icon-download" class="export" @click="exportExcel">导出投诉</el-button>
 						</div>
-						<el-table ref="multipleTable" :data="tableData" height="510" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+						<el-table ref="multipleTable" :data="tableData" height="558" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style">
 							<el-table-column fixed="left" label="状态" align="center">
 								<template slot-scope="scope">

src/views/discountCouponMgr/index.vue

@@ -41,7 +41,7 @@
 								<el-button type="primary" class="export" @click="add_discount_coupons">增加</el-button>
 							</div>
 						</div>
-						<el-table ref="multipleTable" :data="tableData" height="562" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+						<el-table ref="multipleTable" :data="tableData" height="558" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style" @selection-change="handleSelectionChange">
 							<el-table-column type="selection" width="50">
 							</el-table-column>
@@ -118,38 +118,50 @@
 		<!-- 代金劵详情 -->
 		<el-dialog title="优惠券详情" custom-class="add-account-class" :visible.sync="dialogVoucherVisible" :close-on-click-modal="true"
 			:close-on-press-escape="true" @close="dialogVoucherVisible = false">
-			<p><label class="lbl-cls">代金券名称:</label>{{ coupon.name }}</p>
-			<p><label class="lbl-cls">减免金额:</label> {{ coupon.deductionPrice }}</p>
-			<p><label class="lbl-cls">发放数量:</label> {{ coupon.grantNumber }}张</p>
-			<p><label class="lbl-cls">每人限领:</label> {{ coupon.limitNumber }}张</p>
-			<p><label class="lbl-cls">发放时间:</label> {{ coupon.grantStartDate }} ～ {{ coupon.grantEndDate}}</p>
-			<div>
-				<h3 style="padding-top: 20px;">限制条件</h3>
-				<p><label class="lbl-cls">使用条件:</label> 订单满{{ coupon.meetPrice }}元可使用</p>
-				<p v-if="coupon.effectiveType == 1"><label class="lbl-cls">有效期:</label> {{ coupon.effectiveStartDate }} ～ {{ coupon.effectiveEndDate}}</p>
-				<p v-else-if="coupon.effectiveType == 2"><label class="lbl-cls">有效期:</label> 领取后{{ coupon.effectiveDay }}天开始，{{ coupon.effectiveLoseDay }}天内有效
-				</p>
-				<p v-if="coupon.hotelIds == -1"><label class="lbl-cls">选用民宿:</label> 全部民宿</p>
-				<p v-else><label class="lbl-cls">选用民宿:</label> {{ coupon.hotelNames }}</p>
+			<div style="height: 500px; padding: 0; margin: 0; overflow:auto;">
+				<p><label class="lbl-cls">代金券名称:</label>{{ coupon.name }}</p>
+				<p><label class="lbl-cls">减免金额:</label> {{ coupon.deductionPrice }}</p>
+				<p><label class="lbl-cls">发放数量:</label> {{ coupon.grantNumber }}张</p>
+				<p><label class="lbl-cls">每人限领:</label> {{ coupon.limitNumber }}张</p>
+				<p><label class="lbl-cls">发放时间:</label> {{ coupon.grantStartDate }} ～ {{ coupon.grantEndDate}}</p>
+				<div>
+					<h3 style="padding-top: 20px;">限制条件</h3>
+					<p><label class="lbl-cls">使用条件:</label> 订单满{{ coupon.meetPrice }}元可使用</p>
+					<p v-if="coupon.effectiveType == 1"><label class="lbl-cls">有效期:</label> {{ coupon.effectiveStartDate }} ～ {{ coupon.effectiveEndDate}}</p>
+					<p v-else-if="coupon.effectiveType == 2"><label class="lbl-cls">有效期:</label> 领取后{{ coupon.effectiveDay }}天开始，{{ coupon.effectiveLoseDay }}天内有效
+					</p>
+					<p v-if="coupon.hotelIds == -1"><label class="lbl-cls">选用民宿:</label> 全部民宿</p>
+					<p v-else><label class="lbl-cls">选用民宿:</label>
+						<el-tag v-for="item in coupon.hotelNames" :key="item" type="" effect="plain" style="margin: 2px 3px;">
+							{{ item }}
+						</el-tag>
+					</p>
+				</div>
 			</div>
 		</el-dialog>
 		<!-- 折扣劵详情 -->
 		<el-dialog title="优惠券详情" custom-class="add-account-class" :visible.sync="dialogCouponVisible" :close-on-click-modal="true" :close-on-press-escape="true"
 			@close="dialogCouponVisible = false">
-			<p><label class="lbl-cls">折扣券名称:</label>{{ coupon.name }}</p>
-			<p><label class="lbl-cls">折扣:</label> {{ coupon.rebatePrice }}折</p>
-			<p><label class="lbl-cls">最大折扣金额:</label> {{ coupon.maxDeduction }}元</p>
-			<p><label class="lbl-cls">发放数量:</label> {{ coupon.grantNumber }}张</p>
-			<p><label class="lbl-cls">每人限领:</label> {{ coupon.limitNumber }}张</p>
-			<p><label class="lbl-cls">发放时间:</label> {{ coupon.grantStartDate }} ～ {{ coupon.grantEndDate}}</p>
-			<div>
-				<h3 style="padding-top: 20px;">限制条件</h3>
-				<p><label class="lbl-cls">使用条件:</label> 订单满{{ coupon.meetPrice }}元可使用</p>
-				<p v-if="coupon.effectiveType == 1"><label class="lbl-cls">有效期:</label> {{ coupon.effectiveStartDate }} ～ {{ coupon.effectiveEndDate}}</p>
-				<p v-else-if="coupon.effectiveType == 2"><label class="lbl-cls">有效期:</label> 领取后{{ coupon.effectiveDay }}天开始，{{ coupon.effectiveLoseDay }}天内有效
-				</p>
-				<p v-if="coupon.hotelIds == -1"><label class="lbl-cls">选用民宿:</label> 全部民宿</p>
-				<p v-else><label class="lbl-cls">选用民宿:</label> {{ coupon.hotelNames }}</p>
+			<div style="height: 500px; padding: 0; margin: 0; overflow:auto;">
+				<p><label class="lbl-cls">折扣券名称:</label>{{ coupon.name }}</p>
+				<p><label class="lbl-cls">折扣:</label> {{ coupon.rebatePrice }}折</p>
+				<p><label class="lbl-cls">最大折扣金额:</label> {{ coupon.maxDeduction }}元</p>
+				<p><label class="lbl-cls">发放数量:</label> {{ coupon.grantNumber }}张</p>
+				<p><label class="lbl-cls">每人限领:</label> {{ coupon.limitNumber }}张</p>
+				<p><label class="lbl-cls">发放时间:</label> {{ coupon.grantStartDate }} ～ {{ coupon.grantEndDate}}</p>
+				<div>
+					<h3 style="padding-top: 20px;">限制条件</h3>
+					<p><label class="lbl-cls">使用条件:</label> 订单满{{ coupon.meetPrice }}元可使用</p>
+					<p v-if="coupon.effectiveType == 1"><label class="lbl-cls">有效期:</label> {{ coupon.effectiveStartDate }} ～ {{ coupon.effectiveEndDate}}</p>
+					<p v-else-if="coupon.effectiveType == 2"><label class="lbl-cls">有效期:</label> 领取后{{ coupon.effectiveDay }}天开始，{{ coupon.effectiveLoseDay }}天内有效
+					</p>
+					<p v-if="coupon.hotelIds == -1"><label class="lbl-cls">选用民宿:</label> 全部民宿</p>
+					<p v-else><label class="lbl-cls">选用民宿:</label>
+						<el-tag v-for="item in coupon.hotelNames" :key="item" type="" effect="plain" style="margin: 2px 3px;">
+							{{ item }}
+						</el-tag>
+					</p>
+				</div>
 			</div>
 		</el-dialog>
 		<!-- 新增优惠券界面 -->
@@ -1370,7 +1382,7 @@
 			 * @param {Object} row
 			 */
 			handleDetailClick(row) {
-				// console.log(row);
+				console.log(row);
 				if (row.type == 1) { // 代金券
 					this.dialogVoucherVisible = true
 
@@ -1388,7 +1400,7 @@
 					this.coupon.effectiveDay = row.effectiveDay
 					this.coupon.effectiveLoseDay = row.effectiveLoseDay
 
-					this.coupon.hotelNames = row.hotelNames
+					this.coupon.hotelNames = row.hotelNames.split(',')
 					this.coupon.hotelIds = row.hotelIds
 				} else { // 折扣券
 					this.dialogCouponVisible = true
@@ -1408,7 +1420,7 @@
 					this.coupon.effectiveDay = row.effectiveDay
 					this.coupon.effectiveLoseDay = row.effectiveLoseDay
 
-					this.coupon.hotelNames = row.hotelNames
+					this.coupon.hotelNames = row.hotelNames.split(',')
 					this.coupon.hotelIds = row.hotelIds
 				}
 			},

src/views/myAgent/index.vue

@@ -8,21 +8,113 @@
 							<div class="title">流程管理/我的代办</div>
 						</div>
 					</div>
-					<div class="cell-body" style="height: 670px;">
-						
+					<div class="cell-body">
+						<el-table ref="multipleTable" :data="tableData" height="620" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+							:header-cell-style="header_cell_style">
+							<el-table-column fixed="left" type="index" label="序号" align="center" width="80">
+							</el-table-column>
+							<el-table-column fixed="left" label="状态" align="center" width="100">
+								<template slot-scope="scope">
+									<!-- <span v-if="scope.row.status == 1" style="color: #666;">正在审批</span>
+									<span v-else-if="scope.row.status == 2" style="color: #56AA2E;">审批通过</span>
+									<span v-else-if="scope.row.status == 3" style="color: #F9273F;">拒绝</span> -->
+									<span v-if="scope.$index == 0" style="color: #666;">正在审批</span>
+									<span v-else-if="scope.$index == 1" style="color: #56AA2E;">审批通过</span>
+									<span v-else-if="scope.$index == 2" style="color: #F9273F;">拒绝</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="发起人" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.createName }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="评价内容" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.remark }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批时间" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowDate }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批人" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowName }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="审批备注" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.workflowRemark }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column fixed="right" label="操作" width="120">
+								<template slot-scope="scope">
+									<el-button @click="handleClickZhuban(scope.$index, scope.row)" type="text" size="small">主办</el-button>
+								</template>
+							</el-table-column>
+						</el-table>
+						<div class="pagination-table">
+							<el-pagination @current-change="currentPageChange" :current-page.sync="pagination.currentPage" :page-size="pagination.pageSize"
+								layout="prev, pager, next, jumper" :total="pagination.total">
+							</el-pagination>
+						</div>
 					</div>
 				</div>
 			</el-col>
 		</el-row>
+		<!-- 民宿信息维护 -->
+		<el-dialog title="民宿信息维护" custom-class="acceptance-class" :visible.sync="dialogInfoMinsuVisible" :close-on-click-modal="false"
+			:close-on-press-escape="false" @close="dialogInfoMinsuVisible = false">
+			<h3 style="margin: 20px 0;">民宿图片：</h3>
+			<div class="imgs">
+				<div v-for="(image, index) in complaint.fileInfos" :key="index">
+					<img :src="image.url" v-if="!image.url.endsWith('.mp4')" style="margin: 0 2px; border-radius: 5px;" alt=""
+						@click="handlePictureCardPreview(image.url)" height="80px" width="80px" />
+				</div>
+			</div>
+			<div>
+				<h3 style="padding-top: 20px;">简介：</h3>
+				<p><el-input type="textarea" style="margin-left: 50px; margin-top: -20px; width: calc(100% - 50px);" :rows="6" placeholder="暂无简介信息"
+						v-model="complaint.remark" maxlength="200" show-word-limit>
+					</el-input>
+				</p>
+				<p style="display: flex; justify-content: flex-end;">
+					<el-button type="warning">驳 回</el-button>
+					<el-button type="primary" class="confirm-btn">通 过</el-button>
+				</p>
+			</div>
+		</el-dialog>
+		<!-- 查看图片 -->
+		<el-dialog :visible.sync="dialogVisible">
+			<img width="100%" :src="dialogImageUrl" alt="">
+		</el-dialog>
+		<!-- 评价 -->
+		<el-dialog title="评价" custom-class="acceptance-class" :visible.sync="dialogevaluateVisible" :close-on-click-modal="false" :close-on-press-escape="false"
+			@close="dialogevaluateVisible = false">
+			<div>
+				<h3 style="padding-top: 20px;">评价描述：</h3>
+				<p style="margin-left: 80px; margin-top: -35px; width: calc(100% - 80px); height: 100px;">评价描述评价描述评价描述评价描述评价描述</p>
+			</div>
+			<h3 style="margin: 20px 0;">视频/图片：</h3>
+			<div class="imgs">
+				<div v-for="(image, index) in complaint.fileInfos" :key="index">
+					<img :src="image.url" v-if="!image.url.endsWith('.mp4')" style="margin: 0 2px; border-radius: 5px;" alt=""
+						@click="handlePictureCardPreview(image.url)" height="80px" width="80px" />
+				</div>
+			</div>
+			<p style="display: flex; justify-content: flex-end;">
+				<el-button type="warning">驳 回</el-button>
+				<el-button type="primary" class="confirm-btn">通 过</el-button>
+			</p>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-	// import {
-	// 	getTableData,
-	// 	getXiang,
-	// 	downloadExcel
-	// } from '@/api/complaintMgr'
+	import {
+		getTableData
+	} from '@/api/myAgent'
 
 	export default {
 		data() {
@@ -60,7 +152,6 @@
 					keyword: ''
 				},
 				tableData: [],
-				cond_data: {},
 				// 分页参数
 				pagination: {
 					currentPage: 1,
@@ -80,13 +171,9 @@
 					images: [],
 					complaintTime: '2022-01-01 10:00:00'
 				},
-				dialogComplaintVisible: false,
-				dialogVisible: false,
-				dialogRemarksFormVisible: false, // 添加备注
-				formRemarks: {
-					id: '',
-					remark: ''
-				}
+				dialogInfoMinsuVisible: false, // 民宿信息维护
+				dialogevaluateVisible: false, // 评价
+				dialogVisible: false
 			}
 		},
 		created() {
@@ -98,76 +185,41 @@
 				return
 			}
 			// 获取消费记录,表格数据
-			this.get_table_data('list')
+			this.get_table_data()
 		},
 		mounted() {
 			document.getElementsByClassName("el-pagination__jump")[0].childNodes[0].nodeValue = "跳至";
 		},
 		methods: {
+			// 浏览图片
 			handlePictureCardPreview(file) {
 				this.dialogImageUrl = file;
 				this.dialogVisible = true;
 			},
-			/**
-			 * 添加备注
-			 */
-			handleRemarks() {
-				console.log(this.formRemarks);
-			},
-			/**
-			 * 受理
-			 * @param {Object} row
-			 */
-			handleClickAcceptance(row) {
-				// console.log(row);
-				this.formRemarks.id = row.id;
-				this.dialogRemarksFormVisible = true;
-			},
-			// 点击查看备注，弹出投诉详情对话框
-			handleClickRemarks(row) {
-				// console.log(row);
-				this.dialogComplaintVisible = true
-
-				getXiang(row).then((res) => {
-					console.log(res.data);
-					if (res.code === 200) {
-						this.complaint = res.data
-					} else {
-						this.complaint = []
-						this.$message.warning('没有符合条件的数据！')
-					}
-				}).catch((err) => {
-					// console.log(err);
-					this.$message.error(err.message)
-				});
-			},
-			// 关闭投诉详情对话框
-			complaint_close() {
-				this.dialogComplaintVisible = false
+			// 民宿信息维护-主办
+			handleClickZhuban(index, row) {
+				// console.log(row, index);
+				if ((index + 1) % 2 == 0)
+					this.dialogInfoMinsuVisible = true;
+				else
+					this.dialogevaluateVisible = true;
 			},
 			/**
 			 * 获取消费记录,表格数据
 			 */
-			get_table_data(param) {
+			get_table_data() {
 				this.loading = true
-				this.get_condtion();
-
-				let data = this.cond_data;
-				if (param == 'search') {
-					data.page = 1
-					this.pagination.currentPage = 1
-				}
 
 				var that = this
 				// console.log(data);
-				getTableData(data).then((res) => {
+				getTableData().then((res) => {
 					// console.log(res.data);
 					if (res.code === 200) {
 						var d = res.data
-						that.pagination.total = d.total
+						// that.pagination.total = d.total
 						that.tableData = []
-						for (var i = 0; i < d.pageList.length; i++) {
-							that.tableData.push(d.pageList[i])
+						for (var i = 0; i < d.length; i++) {
+							that.tableData.push(d[i])
 						}
 					} else {
 						that.tableData = []
@@ -180,29 +232,6 @@
 				that.loading = false;
 			},
 			/**
-			 * 查询条件
-			 */
-			get_condtion() {
-				let data = {
-					page: this.pagination.currentPage,
-					rows: this.pagination.pageSize
-				}
-
-				if (this.formInline.status !== '') {
-					data.status = this.formInline.status
-				}
-
-				if (this.formInline.search_datatime !== '') {
-					data.search_datatime = this.formInline.search_datatime
-				}
-
-				if (this.formInline.keyword !== '') {
-					data.keyword = this.formInline.keyword
-				}
-
-				this.cond_data = data;
-			},
-			/**
 			 * 导出为Excel
 			 */
 			exportExcel() {
@@ -306,38 +335,6 @@
 
 					.cell-body {
 
-						.controls {
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-
-							.demo-form-inline {
-								display: inline-flex;
-								flex-wrap: wrap;
-								align-items: center;
-								justify-content: flex-start;
-
-								.btn-search {
-									background: rgba(9, 101, 98, 1);
-									font-size: 14px;
-									color: #FFFFFF;
-									font-family: Microsoft YaHei-3970(82674968);
-									border-radius: 5px;
-									border: none;
-								}
-							}
-
-							.export {
-								background: rgba(9, 101, 98, 1);
-								font-size: 14px;
-								color: #FFFFFF;
-								font-family: Microsoft YaHei-3970(82674968);
-								border-radius: 5px;
-								margin-bottom: 22px;
-								border: none;
-							}
-						}
-
 						.pagination-table {
 							display: flex;
 							justify-content: flex-end;
@@ -490,12 +487,21 @@
 				}
 			}
 		}
+
+		>>>.el-table__fixed-body-wrapper .el-table__body {
+			padding-bottom: 17px !important; // 滚动条高度
+		}
+
+		>>>.el-table__fixed,
+		>>>.el-table__fixed-right {
+			height: calc(100% - 14px) !important;
+		}
 	}
 </style>
 
 <style>
 	.acceptance-class {
-		height: 650px !important;
+		height: 680px !important;
 	}
 
 	.add-remarks-class {
@@ -514,6 +520,7 @@
 		display: flex;
 		flex-direction: row;
 		margin-left: 20px;
+		height: 230px;
 	}
 
 	.lbl-cls {
@@ -523,4 +530,12 @@
 		padding-right: 10px;
 		color: #bbb;
 	}
+
+	.confirm-btn {
+		border: none !important;
+		background: rgba(9, 101, 98, 1) !important;
+		color: #fff !important;
+		border-radius: 5px !important;
+		margin-left: 28px !important;
+	}
 </style>

src/views/residentialhostelMgr/index.vue

@@ -29,7 +29,7 @@
 								<el-button type="primary" class="export" @click="hostelConfiguration">民宿配置</el-button>
 							</div>
 						</div>
-						<el-table :data="tableData" height="510" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+						<el-table :data="tableData" height="558" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style">
 							<el-table-column type="expand" width="58">
 								<template slot-scope="props">

src/views/stdbookMgr/index.vue

@@ -39,7 +39,7 @@
 							</el-form>
 							<el-button type="primary" icon="el-icon-download" class="export" @click="exportExcel">导出订单</el-button>
 						</div>
-						<el-table :data="tableData" height="510" style="width: 100%" :cell-style="cell_style" v-loading="loading"
+						<el-table :data="tableData" height="558" style="width: 100%" :cell-style="cell_style" v-loading="loading"
 							:header-cell-style="header_cell_style">
 							<el-table-column type="expand" width="50">
 								<template slot-scope="props">