fix

virgo.wzfrontend/console/src/axios/index.js

@@ -13,6 +13,9 @@ const service = axios.create({
 /* 消息提示 */
 const tip = (msg, type) => {
 	let types = type || 'warning';
+	if (msg == 'RET_INVALID_PASSWORD') {
+		msg = '账号验证码有误'
+	}
 	Message({
 		message: msg,
 		type: types,

virgo.wzfrontend/console/src/components/common/listFilter.vue

@@ -49,6 +49,11 @@
 				</el-date-picker>
 			</div>
 		</div>
+		<div class="filter-box" v-if="type === 'order'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="order.name" placeholder="请输入房间号"></el-input>
+			</div>
+		</div>
 		<div class="filter-btn">
 			<el-button type="primary" size="medium" @click="submit">查询</el-button>
 			<el-button size="medium" @click="resetForm">重置</el-button>
@@ -82,6 +87,10 @@
 					endDate: ''
 				},
 				contractData: {},
+				order: {
+					name: '',
+				},
+				orderData: {},
 			}
 		},
 		created() {

virgo.wzfrontend/console/src/components/work/organization/user/edit.vue

@@ -58,6 +58,8 @@
 						validator: (rule, value, callback) => {
 							if (!/^1[123456789]\d{9}$/.test(value)) {
 								callback(new Error("请输入正确的手机号"));
+							} else if (value == '18888888888') {
+								callback(new Error("不能添加该号码"));
 							} else {
 								testPhone(value).then(data => {
 									this.show = !data.data;
@@ -73,6 +75,9 @@
 				alertShow: false
 			}
 		},
+		created() {
+			console.log(this.$store.getters.user);
+		},
 		methods: {
 			submit() {
 				this.$nextTick(() => {
@@ -86,7 +91,9 @@
 												.id,
 											projectId: this.$store.getters.project.id,
 											userId: res.data.id,
-											identityId: 3
+											identityId: this.$store.getters.organization
+												.contactTel == this.$store.getters.user
+												.phone ? 6 : 3
 										}).then(res => {
 											if (res.state) {
 												this.$emit('callback', 'init');

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

@@ -1,5 +1,15 @@
 import request from '@/axios'
-
+/* 
+ * 获取组织详情
+ * 
+ * 
+ */
+export function getOrganizationDetailById(id) {
+	return request({
+		url: `/manager/base/organization/${id}`,
+		method: 'get'
+	})
+}
 /* 
  * 更新组织信息
  * 

virgo.wzfrontend/console/src/layout/components/breadCrumb.vue

@@ -6,6 +6,7 @@
 				<span class="tips" v-if="index !== levelList.length - 1">/</span>
 			</div>
 		</div>
+		<div>当前组织：{{$store.getters.organization.name}}</div>
 	</div>
 </template>
 
@@ -63,6 +64,9 @@
 
 <style lang="scss">
 	.bread-crumb {
+		display: flex;
+		justify-content: space-between;
+
 		.crumb-box {
 			position: relative;
 			padding-top: 1px;

virgo.wzfrontend/console/src/layout/components/selectProject.vue

@@ -0,0 +1,204 @@
+<template>
+	<div class="hui-flex hui-dialog select-project-index">
+		<div class="hui-flex-box hui-dialog-content">
+			<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="projectName"></el-table-column>
+				<el-table-column label="所属企业" prop="organizationName"></el-table-column>
+				<el-table-column label="项目身份">
+					<template slot-scope="scope">
+						<div class="hui-table-tag" style="display: flex;align-items: center;">
+							<div class="hui-tag hui-tag-success" v-if="scope.row.identityId === 1">客户</div>
+							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 2">中介</div>
+							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 3">
+								组织成员
+							</div>
+							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 4">
+								关联公司
+							</div>
+							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 5">
+								经纪公司
+							</div>
+							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 6">
+								所有者
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="100">
+					<template slot-scope="scope">
+						<div class="hui-table-operation">
+							<span class="table-operation" v-if="$store.getters.project.id != scope.row.projectId"
+								@click="changeProject(scope.row)">
+								切换项目
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<template slot="empty">
+					<empty description="暂无数据"></empty>
+				</template>
+			</el-table>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		selectProject,
+		getOrganizedProjectList,
+		selectOrangaized
+	} from '@/httpApi/loginRegister'
+	import {
+		bindProjectDetail,
+		getOrganizationDetailById
+	} from '@/httpApi/organization'
+	import {
+		getProjectDetailById,
+		getProjectListByPage
+	} from '@/httpApi/space'
+	import {
+		setComment
+	} from '@/uitls/auth';
+	export default {
+		data() {
+			return {
+				tableData: []
+			}
+		},
+		created() {
+			let user = this.$store.getters.user;
+			if (user.userId === 1) {
+				getProjectListByPage({
+					currPage: 1,
+					pageSize: 100
+				}).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList.map(node => {
+							return {
+								projectId: node.id,
+								projectName: node.name,
+								organizationId: node.organizationId,
+								organizationName: user.organizationList.find(item => item.id === node
+									.organizationId).name,
+								identityId: 6
+							}
+						})
+					}
+				})
+			} else {
+				this.init();
+			}
+		},
+		methods: {
+			init() {
+				bindProjectDetail({
+					userId: this.$store.getters.user.userId
+				}).then(res => {
+					if (res.state) {
+						let clientData = res.data;
+						bindProjectDetail({
+							bindOrganizationId: this.$store.getters.organization.id
+						}).then(res => {
+							if (res.state) {
+								let organizationData = res.data;
+								if (this.$store.getters.user.phone == this.$store.getters.organization
+									.contactTel) {
+									getOrganizedProjectList(this.$store.getters.organization.id).then(
+										res => {
+											if (res.state) {
+												let data = res.data || [];
+												let obj = data.map(node => {
+													return {
+														projectId: node.id,
+														projectName: node.name,
+														organizationId: node.organizationId,
+														organizationName: this.$store.getters
+															.organization.name,
+														identityId: 6
+													}
+												})
+												this.tableData = clientData.concat(organizationData,
+													obj).sort((a, b) => a.projectId - b.projectId);
+											}
+										});
+								} else {
+									this.tableData = clientData.concat(organizationData).sort((a, b) => a
+										.projectId - b.projectId);
+								}
+							}
+						})
+					}
+				})
+			},
+			changeProject(item) {
+				if (item.identityId == 6 || item.identityId == 3) {
+					getOrganizationDetailById(item.organizationId).then(res => {
+						if (res.state) {
+							this.$store.dispatch('app/changeOrganization', res.data);
+							selectOrangaized(res.data)
+						}
+					})
+				}
+				getProjectDetailById(item.projectId).then(res => {
+					if (res.state) {
+						let data = res.data;
+						selectProject(data.id).then(res => {
+							if (res.state) {
+								let user = res.data;
+								this.$store.dispatch('app/changeiIdentityId', item.identityId);
+								this.$store.dispatch('projectBase/changeProject', data);
+								localStorage.setItem('projectId', data.id);
+								this.$store.dispatch('app/changeUser', user);
+								this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user
+									.resource) : []);
+								setComment(user.menu ? user.menu : JSON.stringify([]));
+								this.$emit('callback');
+								this.$router.push({
+									path: '/',
+									replace: true
+								})
+								this.$message.success('切换成功');
+							} else {
+								this.$message.error('切换失败');
+							}
+						});
+					}
+				})
+			},
+			submit() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.select-project-index {
+		.select-project-item {
+			flex: 1;
+			height: 0;
+			display: flex;
+			flex-direction: column;
+
+			.select-project-title {
+				padding: 10px 15px;
+				position: relative;
+
+				&::before {
+					content: '';
+					width: 4px;
+					height: 18px;
+					left: 4px;
+					top: 11px;
+					background: $--color-primary;
+					position: absolute;
+				}
+			}
+		}
+	}
+</style>

virgo.wzfrontend/console/src/layout/components/topNav.vue

@@ -10,18 +10,10 @@
 				<i class="iconfont huifont-shouye"></i><span>首页</span>
 			</div>
 			<div class="work-layout-line"></div>
-			<el-dropdown trigger="click" @visible-change="projectVisible" @command="projectCommand"
-				v-if="projects.name">
-				<div class="work-layout-project">
-					<span>{{projects.name}}</span>
-					<i :class="'iconfont huifont-xiala-top'+ (projectDropdown ? ' dropdown-icon' : '')"></i>
-				</div>
-				<el-dropdown-menu class="project-dropdown" slot="dropdown">
-					<el-dropdown-item :command="item.id" v-for="(item,index) in projectList" :key="item.id">
-						{{item.name}}
-					</el-dropdown-item>
-				</el-dropdown-menu>
-			</el-dropdown>
+			<div class="work-layout-project" @click="visible = true">
+				<span>{{projects.name}}</span>
+				<i class="iconfont huifont-xiala-top"></i>
+			</div>
 		</div>
 		<div class="work-layout-right">
 			<el-dropdown @visible-change="value => userDropdown = value" @command="userCommand">
@@ -42,22 +34,18 @@
 			:append-to-body="true">
 			<user-detail v-if="drawer"></user-detail>
 		</el-drawer>
-		<el-dialog title="切换项目" :visible.sync="visible" width="900px" :append-to-body="true">
-			
+		<el-dialog title="切换项目" :visible.sync="visible" width="900px" :append-to-body="true">
+			<select-project @callback="callback" v-if="visible"></select-project>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
 	import userDetail from './userDetail'
+	import selectProject from './selectProject'
 	import {
-		removeToken,
-		setComment
+		removeToken
 	} from '@/uitls/auth';
-	import {
-		selectProject,
-		getOrganizedProjectList
-	} from '@/httpApi/loginRegister'
 	import {
 		mapGetters
 	} from 'vuex';
@@ -68,15 +56,12 @@
 				projects: {},
 				users: {},
 				userDropdown: false,
-				projectDropdown: false,
-				projectList: [],
 				drawer: false,
 				visible: false
 			}
 		},
 		created() {
 			this.init();
-			this.initProject();
 		},
 		methods: {
 			init() {
@@ -91,47 +76,8 @@
 					this.$message.success('退出成功');
 				});
 			},
-			initProject() {
-				getOrganizedProjectList(this.$store.getters.organization.id).then(res => {
-					if (res.state) {
-						this.projectList = res.data || [];
-						if (this.projects.id) return;
-						if (this.projectList.length === 1) this.changeProject(this.projectList[0]);
-					}
-				})
-			},
-			projectVisible(value) {
-				if (value) this.initProject();
-				this.projectDropdown = value;
-			},
-			projectCommand(command) {
-				let data = this.projectList.filter(node => node.id === command)[0];
-				this.changeProject(data);
-			},
-			changeProject(data) {
-				if (!data) return;
-				data.projectItemList = data.projectItemList || [];
-				data.projectItemList.sort((a, b) => {
-					return a.id - b.id;
-				});
-				selectProject(data.id).then(res => {
-					if (res.state) {
-						let user = res.data;
-						this.$store.dispatch('projectBase/changeProject', data);
-						localStorage.setItem('projectId', data.id);
-						this.$store.dispatch('app/changeUser', user);
-						this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user.resource) : []);
-						setComment(user.menu ? user.menu : JSON.stringify([]));
-						this.init();
-						this.$router.push({
-							path: '/',
-							replace: true
-						})
-						this.$message.success('切换成功');
-					} else {
-						this.$message.error('切换失败');
-					}
-				});
+			callback() {
+				this.visible = false;
 			},
 			userCommand(command) {
 				switch (command) {
@@ -147,7 +93,8 @@
 			}
 		},
 		components: {
-			userDetail
+			userDetail,
+			selectProject
 		},
 		watch: {
 			user() {
@@ -155,7 +102,6 @@
 			},
 			project() {
 				this.init();
-				this.initProject('reload');
 			}
 		},
 		computed: {

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

@@ -0,0 +1,23 @@
+const order = [{
+	path: 'order/service',
+	component: () => import('@/views/work/order/service'),
+	name: '维修工单',
+	meta: {
+		title: '维修工单'
+	}
+}, {
+	path: 'order/clear',
+	component: () => import('@/views/work/order/clear'),
+	name: '保洁工单',
+	meta: {
+		title: '保洁工单'
+	}
+}, {
+	path: 'order/operation',
+	component: () => import('@/views/work/order/operation'),
+	name: '运营工单',
+	meta: {
+		title: '运营工单'
+	}
+}]
+export default order;

virgo.wzfrontend/console/src/store/getters.js

@@ -6,5 +6,6 @@ const getters = {
 	project: state => state.projectBase.project || {}, //项目
 	config: state => state.app.config, //url配置信息
 	document: state => state.app.document, //模板context渲染
+	identityId: state => state.app.identityId, //身份
 }
 export default getters

virgo.wzfrontend/console/src/store/modules/app.js

@@ -8,7 +8,8 @@ const state = {
 	organization: {},
 	menuData: [],
 	config: {},
-	document: {}
+	document: {},
+	identityId: 0
 }
 
 const mutations = {
@@ -29,6 +30,9 @@ const mutations = {
 	},
 	CHANGE_DOCUMENT: (state, document) => {
 		state.document = document;
+	},
+	CHANGE_IDENTITYID: (state, identityId) => {
+		state.identityId = identityId;
 	}
 }
 
@@ -62,6 +66,11 @@ const actions = {
 		commit
 	}, document) {
 		commit('CHANGE_DOCUMENT', document);
+	},
+	changeiIdentityId({
+		commit
+	}, identityId) {
+		commit('CHANGE_IDENTITYID', identityId);
 	}
 }
 

virgo.wzfrontend/console/src/views/login/index.vue

@@ -41,6 +41,12 @@
 		getImgCode,
 		sendPhoneCode
 	} from '@/httpApi/loginRegister';
+	import {
+		bindProjectDetail
+	} from '@/httpApi/organization'
+	import {
+		getProjectDetailById
+	} from '@/httpApi/space'
 	import {
 		setToken,
 		setComment
@@ -149,23 +155,78 @@
 						setToken(res.data.token);
 						getUserInfo().then(res => {
 							if (res.state) {
-								let organized = this.testOrganized(res.data);
-								if (!organized) return this.loginLoading = false;
+								let user = res.data;
+								let organized = this.testOrganized(user);
 								this.selectOrganized(organized);
 								this.$store.dispatch('app/changeOrganization', organized);
-								//vuex仓库存储user基本信息
-								let user = res.data;
-								getOrganizedProjectList(organized.id).then(res => {
+								this.$store.dispatch('app/changeUser', user);
+								if (user.projectId === -1) {
+									this.getUserProjectList();
+								} else {
+									this.selectProject({
+										projectId: user.projectId,
+										identityId: 6
+									})
+								}
+							} else {
+								this.loginLoading = false;
+							}
+						})
+					} else {
+						this.loginLoading = false;
+					}
+				})
+			},
+			testOrganized(data) {
+				let organized = !data.organization ? data.organizationList[0] : data.organization;
+				return organized;
+			},
+			getUserProjectList() {
+				bindProjectDetail({
+					userId: this.$store.getters.user.userId
+				}).then(res => {
+					if (res.state) {
+						let clientData = res.data;
+						bindProjectDetail({
+							bindOrganizationId: this.$store.getters.organization.id
+						}).then(res => {
+							if (res.state) {
+								let organizationData = res.data;
+								getOrganizedProjectList(this.$store.getters.organization.id).then(res => {
 									if (res.state) {
-										if (!res.data || res.data.length == 0) {
+										let data = res.data || [];
+										let obj = []
+										if (this.$store.getters.user.phone == this.$store.getters
+											.organization.contactTel) {
+											obj = data.map(node => {
+												return {
+													projectId: node.id,
+													projectName: node.name,
+													organizationId: node.organizationId,
+													organizationName: this.$store.getters
+														.user.organizationList.find(item =>
+															item.id === node.organizationId
+														).name,
+													identityId: 6
+												}
+											})
+										}
+										let projectList = clientData.concat(organizationData, obj)
+											.sort((a, b) => a.projectId - b.projectId);
+										if (projectList.length === 0) {
+											this.loginLoading = false;
+											this.$store.dispatch('app/changeMenuData', []);
+											setComment(JSON.stringify([]));
 											this.$store.dispatch('projectBase/changeProject', {});
-											this.$store.dispatch('app/changeUser', user);
 											localStorage.setItem('projectId', 0);
+											this.$store.dispatch('app/changeiIdentityId', 6);
+											this.$message.success('登录成功');
 											return this.$router.push('/space/project');
+										} else {
+											this.selectProject(projectList[0])
 										}
-										let project = user.projectId === -1 ? res.data[0] : res
-											.data.filter(node => node.id == user.projectId)[0];
-										this.selectProject(project)
+									} else {
+										this.loginLoading = false;
 									}
 								});
 							} else {
@@ -177,38 +238,31 @@
 					}
 				})
 			},
-			testOrganized(data) {
-				if (data.operateOrganizationList == 0) {
-					this.$message.warning('您暂未有组织，请联系组织管理员添加');
-					return false;
-				}
-				let organized = !data.organization ? data.organizationList[0] : data.organization;
-				if (organized.status === 0) {
-					this.$message.warning('您所属的组织信息暂未审核通过');
-					return false;
-				}
-				return organized;
-			},
-			selectProject(data) {
-				data.projectItemList = data.projectItemList || [];
-				data.projectItemList.sort((a, b) => {
-					return a.id - b.id;
-				});
-				this.project = data;
-				this.$store.dispatch('projectBase/changeProject', data);
-				localStorage.setItem('projectId', data.id);
-				selectProject(data.id).then(res => {
-					this.loginLoading = false;
+			selectProject(item) {
+				getProjectDetailById(item.projectId).then(res => {
 					if (res.state) {
-						let user = res.data;
-						if (!user.operateUserInfo) user['operateUserInfo'] = {};
-						this.$store.dispatch('app/changeUser', user);
-						this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user.resource) : []);
-						setComment(user.menu ? user.menu : JSON.stringify([]));
-						this.$router.push('/');
-						this.$message.success('登录成功');
+						let data = res.data;
+						selectProject(data.id).then(res => {
+							if (res.state) {
+								let user = res.data;
+								this.$store.dispatch('app/changeiIdentityId', item.identityId);
+								this.$store.dispatch('projectBase/changeProject', data);
+								localStorage.setItem('projectId', data.id);
+								this.$store.dispatch('app/changeUser', user);
+								this.$store.dispatch('app/changeMenuData', user.resource ? JSON.parse(user
+									.resource) : []);
+								setComment(user.menu ? user.menu : JSON.stringify([]));
+								this.loginLoading = false;
+								this.$router.push('/');
+								this.$message.success('登录成功');
+							} else {
+								this.loginLoading = false;
+							}
+						});
+					} else {
+						this.loginLoading = false;
 					}
-				});
+				})
 			},
 			selectOrganized(data) {
 				selectOrangaized(data)

virgo.wzfrontend/console/src/views/system/log.vue

@@ -40,6 +40,13 @@
 					<div class="log-item">3、新增公司合同、个人合同的功能。</div>
 				</div>
 			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-13" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、完成对系统身份的梳理，包括1.客户、2.中介、3.组织成员、4.关联公司、5.组织所有者。</div>
+					<div class="log-item">2、新增项目组织按身份切换。</div>
+					<div class="log-item">3、新增工单管理页面。</div>
+				</div>
+			</el-timeline-item>
 		</el-timeline>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/order/clear.vue

@@ -0,0 +1,145 @@
+<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">
+				<list-filter type="order" @filter="filterInit"></list-filter>
+				<div class="hui-content-insert">
+					<el-button 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="code"></el-table-column>
+						<el-table-column label="租客" prop="name">
+							<template slot-scope="scope">
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+							</template>
+						</el-table-column>
+						<el-table-column label="房号" prop="projectItemTargetRoomIds">
+							<template slot-scope="scope">
+								<div class="hui-ellipsis">
+									<span v-for="(item,index) in scope.row.roomMap">
+										{{item}}、
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="开始日" prop="startDate"></el-table-column>
+						<el-table-column label="结束日" prop="endDate"></el-table-column>
+						<el-table-column label="运营跟进人" prop="operatorName"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation" @click="detailItem(scope.row)">
+										详情
+									</span>
+									<span class="table-operation" @click="updateItem(scope.row)">
+										编辑
+									</span>
+									<span class="table-operation" @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>
+	</div>
+</template>
+
+<script>
+	import edit from '@/components/work/contract/list/edit'
+	import detail from '@/components/work/contract/list/detail'
+	import listFilter from '@/components/common/listFilter'
+
+	import {
+		getContractListByPage,
+		deleteContractById
+	} from '@/httpApi/contract'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				detailId: '',
+				filterOption: {}
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let postData = {
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id
+				}
+				postData = Object.assign(postData, this.filterOption);
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			insert() {
+				this.$message.warning('功能开发中')
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			detailItem(item) {
+				this.detailId = item.id;
+			},
+			updateItem(item) {
+				this.detailId = item.id;
+			},
+			deleteItem(item) {
+				this.$confirm('确定要删除该合同文件?', () => {
+					deleteContractById(item.id).then(res => {
+						if (res.state) {
+							this.$message({
+								type: 'success',
+								message: '操作成功'
+							})
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.type = 'list';
+			}
+		},
+		components: {
+			edit,
+			detail,
+			listFilter
+		},
+	}
+</script>
+
+<style>
+</style>

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

@@ -0,0 +1,145 @@
+<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">
+				<list-filter type="order" @filter="filterInit"></list-filter>
+				<div class="hui-content-insert">
+					<el-button 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="code"></el-table-column>
+						<el-table-column label="租客" prop="name">
+							<template slot-scope="scope">
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+							</template>
+						</el-table-column>
+						<el-table-column label="房号" prop="projectItemTargetRoomIds">
+							<template slot-scope="scope">
+								<div class="hui-ellipsis">
+									<span v-for="(item,index) in scope.row.roomMap">
+										{{item}}、
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="开始日" prop="startDate"></el-table-column>
+						<el-table-column label="结束日" prop="endDate"></el-table-column>
+						<el-table-column label="运营跟进人" prop="operatorName"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation" @click="detailItem(scope.row)">
+										详情
+									</span>
+									<span class="table-operation" @click="updateItem(scope.row)">
+										编辑
+									</span>
+									<span class="table-operation" @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>
+	</div>
+</template>
+
+<script>
+	import edit from '@/components/work/contract/list/edit'
+	import detail from '@/components/work/contract/list/detail'
+	import listFilter from '@/components/common/listFilter'
+
+	import {
+		getContractListByPage,
+		deleteContractById
+	} from '@/httpApi/contract'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				detailId: '',
+				filterOption: {}
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let postData = {
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id
+				}
+				postData = Object.assign(postData, this.filterOption);
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			insert() {
+				this.$message.warning('功能开发中')
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			detailItem(item) {
+				this.detailId = item.id;
+			},
+			updateItem(item) {
+				this.detailId = item.id;
+			},
+			deleteItem(item) {
+				this.$confirm('确定要删除该合同文件?', () => {
+					deleteContractById(item.id).then(res => {
+						if (res.state) {
+							this.$message({
+								type: 'success',
+								message: '操作成功'
+							})
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.type = 'list';
+			}
+		},
+		components: {
+			edit,
+			detail,
+			listFilter
+		},
+	}
+</script>
+
+<style>
+</style>

virgo.wzfrontend/console/src/views/work/order/service.vue

@@ -0,0 +1,145 @@
+<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">
+				<list-filter type="order" @filter="filterInit"></list-filter>
+				<div class="hui-content-insert">
+					<el-button 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="code"></el-table-column>
+						<el-table-column label="租客" prop="name">
+							<template slot-scope="scope">
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+							</template>
+						</el-table-column>
+						<el-table-column label="房号" prop="projectItemTargetRoomIds">
+							<template slot-scope="scope">
+								<div class="hui-ellipsis">
+									<span v-for="(item,index) in scope.row.roomMap">
+										{{item}}、
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="开始日" prop="startDate"></el-table-column>
+						<el-table-column label="结束日" prop="endDate"></el-table-column>
+						<el-table-column label="运营跟进人" prop="operatorName"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation" @click="detailItem(scope.row)">
+										详情
+									</span>
+									<span class="table-operation" @click="updateItem(scope.row)">
+										编辑
+									</span>
+									<span class="table-operation" @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>
+	</div>
+</template>
+
+<script>
+	import edit from '@/components/work/contract/list/edit'
+	import detail from '@/components/work/contract/list/detail'
+	import listFilter from '@/components/common/listFilter'
+
+	import {
+		getContractListByPage,
+		deleteContractById
+	} from '@/httpApi/contract'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				detailId: '',
+				filterOption: {}
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let postData = {
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id
+				}
+				postData = Object.assign(postData, this.filterOption);
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			insert() {
+				this.$message.warning('功能开发中')
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			detailItem(item) {
+				this.detailId = item.id;
+			},
+			updateItem(item) {
+				this.detailId = item.id;
+			},
+			deleteItem(item) {
+				this.$confirm('确定要删除该合同文件?', () => {
+					deleteContractById(item.id).then(res => {
+						if (res.state) {
+							this.$message({
+								type: 'success',
+								message: '操作成功'
+							})
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.type = 'list';
+			}
+		},
+		components: {
+			edit,
+			detail,
+			listFilter
+		},
+	}
+</script>
+
+<style>
+</style>