fix

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

@@ -0,0 +1,240 @@
+<template>
+	<div class="hui-flex">
+		<div class="hui-flex-box">
+			<div class="hui-detail">
+				<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-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>
+					<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>
+					<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>
+				</div>
+				<div class="hui-detail-title">图片</div>
+				<div class="hui-detail-content hui-detail-image">
+					<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'
+	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: []
+			}
+		},
+		created() {
+			if (this.detailId) this.init();
+		},
+		methods: {
+			init() {
+				getOrderDetailById(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
+		},
+	}
+</script>
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,104 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="form" label-position="top" :model="form">
+				<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-date-picker v-model="form.date" type="datetime" placeholder="预约时间" format="yyyy-MM-dd HH:mm">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="提醒内容" class="hui-textarea">
+					<el-input type="textarea" v-model="form.content" placeholder="请输入提醒内容" resize="none">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="提醒人员" class="hui-textarea">
+					<cc ref="cc" type="insert" :ccList="ccList" label="提醒人员"></cc>
+				</el-form-item>
+				<el-form-item label="上传图片" class="hui-textarea">
+					<upload ref="upload" :list="responsibility" type="insert"></upload>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit" :loading="loading">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		insertReminder,
+		updateReminder,
+		getReminderListByQuery
+	} from '@/httpApi/operation'
+	import upload from '@/components/common/upload'
+	import cc from '@/components/common/cc'
+	export default {
+		props: ['isUpdate', 'detailId', 'type'],
+		data() {
+			return {
+				form: {
+					name: '',
+					date: '',
+					content: ''
+				},
+				responsibility: [],
+				ccList: [],
+				loading: false
+			}
+		},
+		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['type'] = this.type;
+			} else {
+				getReminderListByQuery({
+					id: this.detailId
+				}).then(res => {
+					if (res.state) {
+						this.form = res.data[0];
+						if (this.form.attachment) this.responsibility = JSON.parse(this.form.attachment);
+					}
+				})
+			}
+		},
+		methods: {
+			submit(e) {
+				this.loading = true;
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						let postData = JSON.parse(JSON.stringify(this.form));
+						if (this.$refs.upload) postData['attachment'] = JSON.stringify(this.$refs.upload.fileList);
+						if (this.$refs.cc.list) postData['userList'] = JSON.stringify(this.$refs.cc.list);
+						if (this.isUpdate) {
+							updateReminder(postData).then(this.successFunc);
+						} else {
+							insertReminder(postData).then(this.successFunc);
+						}
+					} else {
+						this.loading = false;
+						return false;
+					}
+				});
+			},
+			successFunc(res) {
+				this.loading = false;
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		},
+		components: {
+			upload,
+			cc
+		},
+	}
+</script>
+
+<style lang="scss"></style>

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

@@ -207,4 +207,48 @@ export function getWeekDetailById(id) {
 		url: `/api/weekly/type/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 获取提醒列表
+ * 
+ */
+export function getReminderListByQuery(data) {
+	return request({
+		url: `/api/reminder/${data.currPage}/${data.pageSize}`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 新增提醒
+ * 
+ */
+export function insertReminder(data) {
+	return request({
+		url: `/api/reminder`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 更新提醒
+ * 
+ */
+export function updateReminder(data) {
+	return request({
+		url: `/api/reminder`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 删除提醒
+ * 
+ * 
+ */
+export function deleteReminderById(id) {
+	return request({
+		url: `/api/reminder/${id}`,
+		method: 'delete'
+	})
 }

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

@@ -61,5 +61,19 @@ const operation = [{
 	meta: {
 		title: '个人日志'
 	}
+}, {
+	path: 'operation/remind/remind',
+	component: () => import('@/views/work/operation/remind/remind'),
+	name: '常规提醒',
+	meta: {
+		title: '常规提醒'
+	}
+}, {
+	path: 'operation/remind/remote',
+	component: () => import('@/views/work/operation/remind/remote'),
+	name: '远程提醒',
+	meta: {
+		title: '远程提醒'
+	}
 }]
 export default operation;

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

@@ -0,0 +1,164 @@
+<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"></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: 1
+			}
+		},
+		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/remote.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="remind">
+		远程提醒
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>