fix

virgo.wzfrontend/console/src/components/website/reservation.vue

@@ -8,7 +8,7 @@
 				<el-form-item label="联系方式" prop="phone" :rules="[{required: true, message: '请选择联系方式'}]">
 					<el-input type="text" v-model="form.phone" placeholder="请输入联系方式" disabled></el-input>
 				</el-form-item>
-				<el-form-item label="预约时间" prop="date" :rules="[{required: true, message: '请选择预约时间'}]">
+				<el-form-item label="预约时间" prop="date" :rules="dateRules">
 					<el-date-picker v-model="form.date" type="datetime" placeholder="预约时间" format="yyyy-MM-dd HH:mm">
 					</el-date-picker>
 				</el-form-item>
@@ -25,19 +25,36 @@
 	import {
 		insertReservation
 	} from '@/httpApi/space'
+	import {
+		insertReminder
+	} from '@/httpApi/operation'
 	export default {
-		props: ['houseId', 'projectId', 'chargePersonId'],
+		props: ['house'],
 		data() {
 			return {
 				form: {
 					name: '',
 					phone: '',
 					date: ''
-				}
+				},
+				dateRules: [{
+					required: true,
+					message: '请选择预约时间'
+				}, {
+					validator: (rule, value, callback) => {
+						//获取下一分钟的时间
+						const nextMinute = this.$dayjs().add(5, 'minute');
+						if (new Date(value).getTime() <= new Date(nextMinute).getTime()) {
+							callback(new Error("预约时间应至少设置当前时间的5分钟之后"));
+						} else {
+							callback();
+						}
+					}
+				}]
 			}
 		},
 		created() {
-			this.form['date'] = this.$dayjs().format('YYYY-MM-DD HH:mm');
+			this.form['date'] = this.$dayjs().add(10, 'minute').format('YYYY-MM-DD HH:mm');
 			this.form['name'] = this.$store.getters.user.userName;
 			this.form['phone'] = this.$store.getters.user.phone;
 		},
@@ -47,12 +64,22 @@
 					if (valid) {
 						insertReservation({
 							userId: this.$store.getters.user.userId,
-							projectItemTargetRoomId: this.houseId,
+							projectItemTargetRoomId: this.house.id,
 							date: this.$dayjs(this.form.date).format('YYYY-MM-DD HH:mm'),
-							projectId: this.projectId,
-							chargePersonId: this.chargePersonId
+							projectId: this.house.projectId,
+							chargePersonId: this.house.chargePersonId
 						}).then(res => {
 							if (res.state) {
+								insertReminder({
+									name: '看房提醒',
+									date: this.form.date,
+									content: `${this.$store.getters.user.name}预约${this.$dayjs(this.form.date).format('YYYY-MM-DD HH:mm')}看房`,
+									type: 3,
+									creator: this.house.chargePersonId,
+									projectId: this.projectId,
+									attachment: JSON.stringify([]),
+									userList: JSON.stringify([])
+								})
 								this.$message.success('预约成功');
 								this.$emit('callback');
 							}

virgo.wzfrontend/console/src/components/work/operation/remind/detail.vue

@@ -5,54 +5,20 @@
 				<div class="hui-detail-title">基础信息</div>
 				<div class="hui-detail-content">
 					<div class="hui-detail-item">
-						<div class="hui-detail-label">工单日期</div>
-						<div class="hui-detail-value">{{detail.date}}</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">工单名称</div>
+						<div class="hui-detail-label">提醒名称</div>
 						<div class="hui-detail-value">{{detail.name}}</div>
 					</div>
-					<div class="hui-detail-item hui-detail-item-top">
-						<div class="hui-detail-label">楼宇房号</div>
-						<div class="hui-detail-value">
-							<div class="hui-ellipsis" v-for="(item,index) in detail.roomMap" :key="index">
-								{{item}}
-							</div>
-						</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">关联租客</div>
-						<div class="hui-detail-value">
-							{{detail.tenantType === 1 ? detail.merchantName: detail.clientName}}
-						</div>
-					</div>
 					<div class="hui-detail-item">
-						<div class="hui-detail-label">跟进人</div>
-						<div class="hui-detail-value">{{detail.followUpPersonName}}</div>
+						<div class="hui-detail-label">提醒类型</div>
+						<div class="hui-detail-value">{{$field.findTypeName('remindType',detail.type)}}</div>
 					</div>
 					<div class="hui-detail-item">
-						<div class="hui-detail-label">联系方式</div>
-						<div class="hui-detail-value">{{detail.followUpPersonPhone}}</div>
-					</div>
-					<div class="hui-detail-item" v-if="detail.type != 3">
-						<div class="hui-detail-label">服务方式</div>
-						<div class="hui-detail-value" v-if="detail.type === 1">
-							{{$field.findTypeName('serviceWorkWay',detail.workWay)}}
-						</div>
-						<div class="hui-detail-value" v-if="detail.type === 2">
-							{{$field.findTypeName('clearWorkWay',detail.workWay)}}
-						</div>
-						<div class="hui-detail-value" v-if="detail.type === 4">
-							{{$field.findTypeName('patrolWorkWay',detail.workWay)}}
-						</div>
+						<div class="hui-detail-label">提醒时间</div>
+						<div class="hui-detail-value">{{$dayjs(detail.date).format('YYYY-MM-DD HH:mm:ss')}}</div>
 					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">关联租客</div>
-						<div class="hui-detail-value">{{detail.merchantName || detail.clientName}}</div>
-					</div>
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">摘要</div>
-						<div class="hui-detail-value">{{detail.compendious}}</div>
+					<div class="hui-detail-item hui-detail-item-top">
+						<div class="hui-detail-label">提醒内容</div>
+						<div class="hui-detail-value">{{detail.content}}</div>
 					</div>
 				</div>
 				<div class="hui-detail-title">图片</div>
@@ -60,63 +26,21 @@
 					<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
 					</upload>
 				</div>
-				<div v-if="detail.data && detail.data != '[]'">
-					<div class="hui-detail-title">自定义信息</div>
-					<div class="hui-detail-content">
-						<div class="hui-detail-item" v-for="(item,index) in JSON.parse(detail.data)" :key="index">
-							<div class="hui-detail-label">{{item.keyName}}</div>
-							<div class="hui-detail-value">{{item.value}}</div>
-						</div>
-					</div>
-				</div>
-				<div class="hui-detail-title" v-if="detail.workOrderProcessList.length > 0">工单过程</div>
-				<process :process="detail.workOrderProcessList" v-if="detail.workOrderProcessList.length > 0">
-				</process>
 			</div>
 		</div>
-		<div class="hui-drawer-submit" v-if="actionButton.length > 0">
-			<el-button size="medium" type="primary" v-for="(item,index) in actionButton" :key="index"
-				@click="actionClick(item.type)">
-				{{item.name}}
-			</el-button>
-		</div>
-		<el-dialog :close-on-click-modal="false" :title="type == 1 ? '选择指派人员':'处理工单'" :visible.sync="visible"
-			width="880px" :append-to-body="true">
-			<select-user @callback="callBack" v-if="visible && type == 1" :maxLen="1"></select-user>
-			<action @callback="callBack" v-if="visible && type == 2" :operationId="operation.id"></action>
-		</el-dialog>
 	</div>
 </template>
 
 <script>
 	import {
-		getOrderDetailById,
-		updateOrder,
-		insertOrderProcess
-	} from '@/httpApi/order'
+		getReminderDetailById
+	} from '@/httpApi/operation'
 	import upload from '@/components/common/upload'
-	import selectUser from '@/components/common/selectUser'
-	import process from '@/components/work/order/process'
-	import action from '@/components/work/order/action'
 	export default {
 		props: ['detailId'],
 		data() {
 			return {
-				detail: {
-					name: '',
-					projectItemTargetRoomIds: '',
-					tenantType: 1,
-					merchantId: '',
-					clientId: '',
-					followUpPerson: '',
-					followUpPersonPhone: '',
-					workWay: '',
-					workOrderProcessList: []
-				},
-				visible: false,
-				type: 1,
-				operation: {},
-				actionButton: []
+				detail: {}
 			}
 		},
 		created() {
@@ -124,114 +48,15 @@
 		},
 		methods: {
 			init() {
-				getOrderDetailById(this.detailId).then(res => {
+				getReminderDetailById(this.detailId).then(res => {
 					if (res.state) {
 						this.detail = res.data;
-						this.role();
-					}
-				})
-			},
-			role() {
-				let user = this.$store.getters.user,
-					button = [];
-				if (this.detail.userId === user.userId) { //创建者
-					if (!this.detail.status) button.push({
-						type: 1,
-						name: '提交工单'
-					})
-				}
-				let data = this.detail.workOrderProcessList.filter(node => !node.status);
-				if (data.length > 0) { //未处理工单过程
-					this.operation = data[0];
-					//处理工单人员
-					if (this.operation.operatorId === user.userId) button.push({
-						type: 2,
-						name: '处理工单'
-					})
-				}
-				if (this.detail.followUpPerson === user.userId) { //跟进人
-					if (this.detail.status === 1) button.push({
-						type: 3,
-						name: '开始工单'
-					})
-					if (this.detail.status === 2) button.push({
-						type: 4,
-						name: '指派人员'
-					})
-					if (data.length === 0 && this.detail.status === 2) button.push({
-						type: 5,
-						name: '完成工单'
-					})
-				}
-				this.actionButton = button;
-			},
-			actionClick(type) {
-				switch (type) {
-					case 1:
-						this.submitOrder('是否提交工单，提交后将不能再修改?', 1);
-						break;
-					case 2:
-						this.operationClick(2)
-						break;
-					case 3:
-						this.submitOrder('是否开始工单?', 2);
-						break;
-					case 4:
-						this.operationClick(1)
-						break;
-					case 5:
-						this.submitOrder('是否完成工单?', 3);
-						break;
-					default:
-						break;
-				}
-			},
-			submitOrder(msg, status) {
-				this.$confirm(msg, () => {
-					this.update(status);
-				});
-			},
-			update(status) {
-				updateOrder({
-					id: this.detail.id,
-					status: status
-				}).then(res => {
-					if (res.state) {
-						this.init();
-						this.$message.success('操作成功');
-						this.$emit('callback', 'init')
-					}
-				})
-			},
-			callBack(data) {
-				if (!data) return this.visible = false;
-				if (data == 'init') {
-					this.init();
-					return this.visible = false;
-				}
-				insertOrderProcess({
-					operatorId: data[0].id,
-					workOrderId: this.detailId,
-					status: 0,
-					attachment: '[]'
-				}).then(res => {
-					if (res.state) {
-						this.init();
-						this.visible = false;
-						this.$message.success('操作成功');
 					}
 				})
-			},
-			operationClick(type) {
-				this.type = type;
-				this.visible = true;
 			}
 		},
 		components: {
-			upload,
-			selectUser,
-			process,
-			action
+			upload
 		},
 	}
 </script>

virgo.wzfrontend/console/src/components/work/operation/remind/edit.vue

@@ -5,7 +5,7 @@
 				<el-form-item label="提醒名称" prop="name" :rules="[{required: true, message: '请输入提醒名称'}]">
 					<el-input type="text" v-model="form.name" placeholder="请输入提醒名称"></el-input>
 				</el-form-item>
-				<el-form-item label="提醒时间" prop="date" :rules="[{required: true, message: '请选择提醒时间'}]">
+				<el-form-item label="提醒时间" prop="date" :rules="dateRules">
 					<el-date-picker v-model="form.date" type="datetime" placeholder="预约时间" format="yyyy-MM-dd HH:mm">
 					</el-date-picker>
 				</el-form-item>
@@ -32,7 +32,7 @@
 	import {
 		insertReminder,
 		updateReminder,
-		getReminderListByQuery
+		getReminderDetailById
 	} from '@/httpApi/operation'
 	import upload from '@/components/common/upload'
 	import cc from '@/components/common/cc'
@@ -47,21 +47,34 @@
 				},
 				responsibility: [],
 				ccList: [],
-				loading: false
+				loading: false,
+				dateRules: [{
+					required: true,
+					message: '请选择提醒时间'
+				}, {
+					validator: (rule, value, callback) => {
+						//获取下一分钟的时间
+						const nextMinute = this.$dayjs().add(5, 'minute');
+						if (new Date(value).getTime() <= new Date(nextMinute).getTime()) {
+							callback(new Error("提醒时间应至少设置当前时间的5分钟之后"));
+						} else {
+							callback();
+						}
+					}
+				}]
 			}
 		},
 		created() {
 			if (!this.isUpdate) {
 				this.form['organizationId'] = this.$store.getters.organization.id;
 				this.form['projectId'] = this.$store.getters.project.id;
-				this.form['userId'] = this.$store.getters.user.userId;
+				this.form['creator'] = this.$store.getters.user.userId;
+				//1-重要提醒 2.会议提醒 3.看房提醒
 				this.form['type'] = this.type;
 			} else {
-				getReminderListByQuery({
-					id: this.detailId
-				}).then(res => {
+				getReminderDetailById(this.detailId).then(res => {
 					if (res.state) {
-						this.form = res.data[0];
+						this.form = res.data;
 						if (this.form.attachment) this.responsibility = JSON.parse(this.form.attachment);
 					}
 				})

virgo.wzfrontend/console/src/config/field.js

@@ -315,6 +315,20 @@ const contractType = [{
 	name: '设备租赁'
 }];
 
+const remindType = [{
+	id: 1,
+	name: '重要提醒'
+}, {
+	id: 2,
+	name: '会议提醒'
+}, {
+	id: 3,
+	name: '收费提醒'
+}, {
+	id: 4,
+	name: '看房提醒'
+}];
+
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
 		id: 0,
@@ -349,7 +363,8 @@ export default {
 		supportingFacilities,
 		modelType,
 		sealType,
-		contractType
+		contractType,
+		remindType
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;

virgo.wzfrontend/console/src/httpApi/operation.js

@@ -230,13 +230,24 @@ export function insertReminder(data) {
 		data: data
 	})
 }
+/* 
+ * 获取提醒详情
+ * 
+ * 
+ */
+export function getReminderDetailById(id) {
+	return request({
+		url: `/api/reminder/${id}`,
+		method: 'get'
+	})
+}
 /* 
  * 更新提醒
  * 
  */
 export function updateReminder(data) {
 	return request({
-		url: `/api/reminder`,
+		url: `/api/reminder/update`,
 		method: 'put',
 		data: data
 	})
@@ -248,7 +259,7 @@ export function updateReminder(data) {
  */
 export function deleteReminderById(id) {
 	return request({
-		url: `/api/reminder/${id}`,
+		url: `/api/reminder/delete/${id}`,
 		method: 'delete'
 	})
 }

virgo.wzfrontend/console/src/router/modules/operation.js

@@ -19,6 +19,13 @@ const operation = [{
 	meta: {
 		title: '会议设置'
 	}
+}, {
+	path: 'operation/meeting/remind',
+	component: () => import('@/views/work/operation/meeting/remind'),
+	name: '会议提醒',
+	meta: {
+		title: '会议提醒'
+	}
 }, {
 	path: 'operation/week/organization',
 	component: () => import('@/views/work/operation/week/organization'),

virgo.wzfrontend/console/src/uitls/chat.js

@@ -64,7 +64,6 @@ const $chat = {
 		});
 	},
 	connect() {
-		console.log(localStorage.getItem('chatToken'));
 		if (!localStorage.getItem('chatToken')) {
 			logins()
 		} else {
@@ -123,6 +122,7 @@ const $chat = {
 			//监听会话列表更新
 			YeIMUniSDK.getInstance().addEventListener(YeIMUniSDKDefines.EVENT.CONVERSATION_LIST_CHANGED, (
 				list) => {
+				console.log(list);
 				store.dispatch('app/changeChatList', list);
 			});
 		})

virgo.wzfrontend/console/src/views/website/homeDetail.vue

@@ -109,8 +109,7 @@
 		<house-foot></house-foot>
 		<el-dialog :close-on-click-modal="false" title="预约看房" :visible.sync="visible" width="900px"
 			:append-to-body="true">
-			<reservation v-if="visible" @callback="visible = false" :houseId="detail.id" :projectId="detail.projectId"
-				:chargePersonId="detail.chargePersonId">
+			<reservation v-if="visible" @callback="visible = false" :house="detail">
 			</reservation>
 		</el-dialog>
 		<el-dialog title="预览" :visible.sync="fileVisible" width="900px" :append-to-body="true">

virgo.wzfrontend/console/src/views/work/operation/meeting/remind.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">会议提醒</div>
+			</div>
+			<div class="hui-flex-box hui-flex hui-table">
+				<div class="hui-content-insert">
+					<el-button v-permission="'/work/order/clear/add'" type="primary" size="medium"
+						@click="insert">新增提醒</el-button>
+				</div>
+				<div class="hui-flex-box">
+					<el-table :data="tableData" row-key="id" border height="100%">
+						<el-table-column label="序号" width="50">
+							<template slot-scope="scope">
+								<div style="text-align: center;">{{scope.$index + 1}}</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="提醒名称" prop="name"></el-table-column>
+						<el-table-column label="提醒内容" prop="content"></el-table-column>
+						<el-table-column label="提醒时间" prop="date">
+							<template slot-scope="scope">
+								<span>{{$dayjs(scope.row.date).format('YYYY-MM-DD HH:mm:ss')}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="状态">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提醒</div>
+									<div class="hui-tag" v-else-if="scope.row.status === 1">待处理</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 2">处理中</div>
+									<div class="hui-tag hui-tag-success" v-else>已处理</div>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation" v-permission="'/work/order/clear/detail'"
+										@click="detailItem(scope.row)">
+										详情
+									</span>
+									<span class="table-operation" v-permission="'/work/order/clear/update'"
+										v-if="!scope.row.status" @click="updateItem(scope.row)">
+										编辑
+									</span>
+									<span class="table-operation" v-permission="'/work/order/clear/delete'"
+										v-if="!scope.row.status" @click="deleteItem(scope.row)">
+										删除
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<template slot="empty">
+							<empty description="暂无数据"></empty>
+						</template>
+					</el-table>
+				</div>
+				<div class="hui-content-pagination">
+					<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+						@current-change="currentChange">
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+		<el-dialog :close-on-click-modal="false" :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px"
+			:append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
+		</el-dialog>
+		<el-drawer title="提醒详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import edit from '@/components/work/operation/remind/edit'
+	import detail from '@/components/work/operation/remind/detail'
+
+	import {
+		getReminderListByQuery,
+		deleteReminderById
+	} from '@/httpApi/operation'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				detailId: '',
+				filterOption: {},
+				isUpdate: false,
+				visible: false,
+				drawer: false,
+				type: 2
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				if (!this.auth('/work/order/clear/list')) return;
+				let postData = {
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					projectId: this.$store.getters.project.id,
+					type: this.type
+				}
+				postData = Object.assign(postData, this.filterOption);
+				getReminderListByQuery(postData).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			insert() {
+				this.detailId = '';
+				this.isUpdate = false;
+				this.visible = true;
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			detailItem(item) {
+				this.detailId = item.id;
+				this.drawer = true;
+			},
+			updateItem(item) {
+				this.detailId = item.id;
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			deleteItem(item) {
+				this.$confirm('确定要删除该提醒?', () => {
+					deleteReminderById(item.id).then(res => {
+						if (res.state) {
+							this.$message({
+								type: 'success',
+								message: '操作成功'
+							})
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit,
+			detail
+		},
+	}
+</script>
+
+<style>
+</style>

virgo.wzfrontend/console/src/views/work/operation/remind/remind.vue

@@ -18,11 +18,15 @@
 						</el-table-column>
 						<el-table-column label="提醒名称" prop="name"></el-table-column>
 						<el-table-column label="提醒内容" prop="content"></el-table-column>
-						<el-table-column label="提醒时间" prop="date"></el-table-column>
+						<el-table-column label="提醒时间" prop="date">
+							<template slot-scope="scope">
+								<span>{{$dayjs(scope.row.date).format('YYYY-MM-DD HH:mm')}}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="状态">
 							<template slot-scope="scope">
 								<div class="hui-table-tag">
-									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提交</div>
+									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提醒</div>
 									<div class="hui-tag" v-else-if="scope.row.status === 1">待处理</div>
 									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 2">处理中</div>
 									<div class="hui-tag hui-tag-success" v-else>已处理</div>