fix

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

@@ -33,7 +33,12 @@
 		</div>
 		<div class="filter-box" v-if="type === 'agent'">
 			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="agent.name" placeholder="请输入客户名称"></el-input>
+				<el-input prefix-icon="el-icon-search" v-model="agent.name" placeholder="请输入经纪人名称"></el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'organization'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="organization.name" placeholder="请输入公司名称"></el-input>
 			</div>
 		</div>
 		<div class="filter-box" v-if="type === 'contract'">
@@ -52,14 +57,14 @@
 		<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 class="filter-item">
-				<el-select v-model="order.status" placeholder="请选择工单状态">
-					<el-option label="待提交" :value="null"></el-option>
-					<el-option label="待处理" :value="1"></el-option>
-					<el-option label="处理中" :value="2"></el-option>
-					<el-option label="已处理" :value="3"></el-option>
-				</el-select>
+			</div>
+			<div class="filter-item">
+				<el-select v-model="order.status" placeholder="请选择工单状态">
+					<el-option label="待提交" :value="null"></el-option>
+					<el-option label="待处理" :value="1"></el-option>
+					<el-option label="处理中" :value="2"></el-option>
+					<el-option label="已处理" :value="3"></el-option>
+				</el-select>
 			</div>
 		</div>
 		<div class="filter-box" v-if="type === 'billContract'">
@@ -107,6 +112,10 @@
 					name: ''
 				},
 				agentData: {},
+				organization: {
+					name: ''
+				},
+				organizationData: {},
 				contract: {
 					code: '',
 					startDate: '',
@@ -114,8 +123,8 @@
 				},
 				contractData: {},
 				order: {
-					name: '',
-					status:''
+					name: '',
+					status: ''
 				},
 				orderData: {},
 				billContract: {

virgo.wzfrontend/console/src/components/work/bim/operationModel.vue

@@ -499,14 +499,30 @@
 							html: `	<div class="tips-4">${bimData.roomList[i].name}<i class="iconfont huifont-sanjiaojiantou-xia"></i></div>`,
 							id: 'room' + bimData.roomList[i].roomId
 						}, data => {
+							this.showDrap('organizationDetail');
+						})
+					}
+					if (bimData.roomList[i].floorName) {
+						this.bimViewer.addDrawable({
+							position: bimData.roomList[i].position,
+							offsetX: -30,
+							offsetY: 5,
+							html: `	<div class="floor-name">${bimData.roomList[i].floorName}</div>`,
+							id: 'floor' + bimData.roomList[i].roomId
+						}, data => {
+							let floor = data.id.split('floor');
+							let item = bimData.roomList.find(node => node.roomId == floor[floor.length - 1]);
+							if (item.floorName === '卫生间' || item.floorName === '公共区域' || item.floorName ===
+								'楼梯间' || item.floorName === '电梯间' || item.floorName === '设备间') return;
 							this.showDrap('roomDetail');
 						})
 					}
 				}
 			},
 			clearFloor() { //清除房间
-				let ids = bimData.roomList.filter(node => node.name).map(node => 'room' + node.roomId);
-				this.bimViewer.clearDrawable(ids);
+				let ids = bimData.roomList.filter(node => node.name).map(node => node.roomId);
+				let arr = ids.map(id => 'room' + id).concat(ids.map(id => 'floor' + id));
+				this.bimViewer.clearDrawable(arr);
 			},
 			setMonitor() { //设置摄像头
 				for (var i = 0; i < bimData.monitorList.length; i++) {
@@ -702,22 +718,6 @@
 						height: bimData.roomList[i].height,
 						roomColor: this.returnRGBA(bimData.roomList[i].color)
 					})
-					if (bimData.roomList[i].floorName) {
-						this.bimViewer.addDrawable({
-							position: bimData.roomList[i].position,
-							offsetX: -30,
-							offsetY: 5,
-							html: `	<div class="floor-name">${bimData.roomList[i].floorName}</div>`,
-							id: 'floor' + bimData.roomList[i].roomId
-						}, data => {
-							let floor = data.id.split('floor');
-							let item = bimData.roomList.find(node => node.roomId == floor[floor.length - 1]);
-							console.log(item);
-							if (item.floorName === '卫生间' || item.floorName === '公共区域' || item.floorName ===
-								'楼梯间' || item.floorName === '电梯间' || item.floorName === '设备间') return;
-							this.showDrap('roomDetail');
-						})
-					}
 				}
 			}
 		}

virgo.wzfrontend/console/src/components/work/business/organization/customData.vue

@@ -0,0 +1,143 @@
+<template>
+	<div class="custom-data">
+		<table border="1" cellspacing="0" cellpadding="0">
+			<tr class="th-title">
+				<th style="width: 300px;">事件日期</th>
+				<th>事件内容</th>
+			</tr>
+			<tr v-for="(item,index) in listData" :key="index">
+				<td>
+					<el-date-picker v-model="item.keyName" value-format="yyyy-MM-dd" type="date"
+						placeholder="请选择日期">
+					</el-date-picker>
+				</td>
+				<td>
+					<div class="td-input">
+						<el-input v-model="item.value"></el-input>
+						<div class="td-icon" @click="deleteRow(index)">
+							<i class="iconfont huifont-guanbi"></i>
+						</div>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<div class="insert-icon color-primary" @click="insertRow()">
+						<i class="iconfont huifont-xinzeng"></i>
+						新增
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+		},
+		data() {
+			return {
+				listData: []
+			}
+		},
+		created() {
+			this.listData = this.list;
+		},
+		methods: {
+			insertRow() {
+				this.listData.push({
+					keyName: '',
+					value: ''
+				});
+			},
+			deleteRow(index) {
+				this.$confirm('确定要删除该项数据?', () => {
+					this.listData.splice(index, 1);
+				});
+			}
+		},
+		watch: {
+			list() {
+				this.listData = this.list;
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.custom-data {
+		table {
+			width: 100%;
+			border: 1px solid $--color-border;
+			border-collapse: collapse;
+			table-layout: fixed;
+		}
+
+		table th {
+			padding: 5px 0;
+			border: 1px solid $--color-border;
+			font-weight: 500;
+		}
+
+
+		table td {
+			border: 1px solid $--color-border;
+			padding: 6px 20px;
+		}
+
+		.insert-icon {
+			text-align: center;
+			cursor: pointer;
+			border-radius: 2px;
+			border: 1px dashed $--color-border;
+			line-height: 26px;
+			font-size: 13px;
+
+			.huifont-xinzeng {
+				font-size: 13px;
+			}
+		}
+
+		.td-input {
+			display: flex;
+			align-items: center;
+
+			.el-input {
+				flex: 1;
+				width: 0;
+				overflow: hidden;
+			}
+
+			.td-icon {
+				width: 20px;
+				height: 20px;
+				background: #171F2D;
+				border-radius: 10px;
+				border: 1px solid #8596B0;
+				opacity: 0.6;
+				text-align: center;
+				line-height: 16px;
+				margin-left: 12px;
+				color: #8596B0;
+				cursor: pointer;
+			}
+
+			.td-icon:hover {
+				color: $--color-red;
+				border-color: $--color-red;
+			}
+
+			.iconfont {
+				font-size: 10px;
+				margin-left: 1px;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/console/src/components/work/business/organization/detail.vue

@@ -25,14 +25,52 @@
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">注册资本</div>
 				<div class="hui-detail-value">{{detail.registeredCapital}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业地址</div>
+				<div class="hui-detail-value">{{detail.address}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">经营范围</div>
+				<div class="hui-detail-value">{{detail.businessScope}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业规模</div>
+				<div class="hui-detail-value">{{detail.corporateScale}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业理念</div>
+				<div class="hui-detail-value">{{detail.corporatePhilosophy}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">企业文化</div>
+				<div class="hui-detail-value">{{detail.corporateCulture}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">联系方式</div>
+				<div class="hui-detail-value">{{detail.contactInformation}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">传真</div>
+				<div class="hui-detail-value">{{detail.fax}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">电子邮箱</div>
+				<div class="hui-detail-value">{{detail.email}}</div>
 			</div>
 		</div>
 		<div v-if="detail.data && detail.data != '[]'">
-			<div class="hui-detail-title">自定义信息</div>
+			<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)">
-					<div class="hui-detail-label">{{item.keyName}}</div>
-					<div class="hui-detail-value">{{item.value}}</div>
+				<div v-for="(item,index) in JSON.parse(detail.data)">
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">事件日期</div>
+						<div class="hui-detail-value">{{item.keyName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">事件内容</div>
+						<div class="hui-detail-value">{{item.value}}</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -56,6 +94,14 @@
 					registeredCapital: '',
 					industryType: '',
 					data: '',
+					address: '',
+					businessScope: '',
+					corporateScale: '',
+					corporatePhilosophy: '',
+					corporateCulture: '',
+					contactInformation: '',
+					fax: '',
+					email: ''
 				}
 			}
 		},

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

@@ -1,111 +1,145 @@
-<template>
-	<div class="hui-flex hui-dialog">
-		<div class="hui-flex-box hui-dialog-content">
-			<el-form ref="organizationForm" label-position="top" :model="organizationForm">
-				<el-form-item label="企业名称" prop="name" :rules="[{required: true, message: '请输入企业名称'}]">
-					<el-input type="text" v-model="organizationForm.name" placeholder="请输入企业名称"></el-input>
-				</el-form-item>
-				<el-form-item label="企业类型" prop="industryType" :rules="[{required: true, message: '请选择企业类型'}]">
-					<el-select v-model="organizationForm.industryType" placeholder="请选择企业类型">
-						<el-option :label="item.name" :value="String(item.id)"
-							v-for="(item,index) in $field.field.industryType" :key="item.id">
-						</el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="企业法人" prop="legalPerson" :rules="[{required: true, message: '请输入企业法人'}]">
-					<el-input type="text" v-model="organizationForm.legalPerson" placeholder="请输入企业法人"></el-input>
-				</el-form-item>
-				<el-form-item label="成立时间" prop="establishDate" :rules="[{required: true, message: '请选择成立时间'}]">
-					<el-date-picker v-model="organizationForm.establishDate" value-format="yyyy-MM-dd" type="date"
-						placeholder="请选择启用日期">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="营业期限" prop="businessTerm" :rules="[{required: true, message: '请输入营业期限'}]">
-					<el-input type="text" v-model="organizationForm.businessTerm" placeholder="请输入营业期限"></el-input>
-				</el-form-item>
-				<el-form-item label="注册资本" prop="registeredCapital" :rules="[{required: true, message: '请输入注册资本'}]">
-					<el-input type="text" v-model="organizationForm.registeredCapital" placeholder="请输入注册资本"></el-input>
-				</el-form-item>
-				<el-form-item label="自定义信息" class="hui-textarea">
-					<custom-data ref="customData" :list="customList"></custom-data>
-				</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 {
-		insertOrganization,
-		updateOrganization,
-		getOrganizationDetailById
-	} from '@/httpApi/business'
-	import customData from '@/components/common/customData'
-	export default {
-		props: ['isUpdate', 'detailId'],
-		data() {
-			return {
-				organizationForm: {
-					name: '',
-					legalPerson: '',
-					establishDate: '',
-					businessTerm: '',
-					organizationId: '',
-					registeredCapital: '',
-					industryType: '',
-					data: '',
-				},
-				customList: [],
-				loading: false
-			}
-		},
-		created() {
-			if (this.isUpdate) {
-				getOrganizationDetailById(this.detailId).then(res => {
-					if (res.state) {
-						this.organizationForm = res.data;
-						if (this.organizationForm.data) this.customList = JSON.parse(this.organizationForm.data);
-					}
-				})
-			} else {
-				this.organizationForm['organizationId'] = this.$store.getters.organization.id;
-				this.organizationForm['projectId'] = this.$store.getters.project.id;
-			}
-		},
-		methods: {
-			submit() {
-				this.loading = true;
-				this.$refs.organizationForm.validate((valid) => {
-					if (valid) {
-						let postData = JSON.parse(JSON.stringify(this.organizationForm));
-						postData['data'] = JSON.stringify(this.$refs.customData.listData);
-						if (this.isUpdate) {
-							updateOrganization(postData).then(this.successFunc);
-						} else {
-							insertOrganization(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: {
-			customData
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="organizationForm" label-position="top" :model="organizationForm">
+				<el-form-item label="企业名称" prop="name" :rules="[{required: true, message: '请输入企业名称'}]">
+					<el-input type="text" v-model="organizationForm.name" placeholder="请输入企业名称"></el-input>
+				</el-form-item>
+				<el-form-item label="企业类型" prop="industryType" :rules="[{required: true, message: '请选择企业类型'}]">
+					<el-select v-model="organizationForm.industryType" placeholder="请选择企业类型">
+						<el-option :label="item.name" :value="String(item.id)"
+							v-for="(item,index) in $field.field.industryType" :key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="企业法人" prop="legalPerson" :rules="[{required: true, message: '请输入企业法人'}]">
+					<el-input type="text" v-model="organizationForm.legalPerson" placeholder="请输入企业法人"></el-input>
+				</el-form-item>
+				<el-form-item label="成立时间" prop="establishDate" :rules="[{required: true, message: '请选择成立时间'}]">
+					<el-date-picker v-model="organizationForm.establishDate" value-format="yyyy-MM-dd" type="date"
+						placeholder="请选择启用日期">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="营业期限" prop="businessTerm" :rules="[{required: true, message: '请输入营业期限'}]">
+					<el-input type="text" v-model="organizationForm.businessTerm" placeholder="请输入营业期限"></el-input>
+				</el-form-item>
+				<el-form-item label="注册资本">
+					<el-input type="text" v-model="organizationForm.registeredCapital" placeholder="请输入注册资本"></el-input>
+				</el-form-item>
+				<el-form-item label="企业地址">
+					<el-input type="text" v-model="organizationForm.address" placeholder="请输入企业地址"></el-input>
+				</el-form-item>
+				<el-form-item label="经营范围">
+					<el-input type="text" v-model="organizationForm.businessScope" placeholder="请输入经营范围"></el-input>
+				</el-form-item>
+				<el-form-item label="企业规模">
+					<el-input type="text" v-model="organizationForm.corporateScale" placeholder="请输入企业规模"></el-input>
+				</el-form-item>
+				<el-form-item label="企业理念">
+					<el-input type="text" v-model="organizationForm.corporatePhilosophy" placeholder="请输入企业理念">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="企业文化">
+					<el-input type="text" v-model="organizationForm.corporateCulture" placeholder="请输入企业文化"></el-input>
+				</el-form-item>
+				<el-form-item label="联系方式">
+					<el-input type="text" v-model="organizationForm.contactInformation" placeholder="请输入联系方式">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="传真">
+					<el-input type="text" v-model="organizationForm.fax" placeholder="请输入传真"></el-input>
+				</el-form-item>
+				<el-form-item label="电子邮箱">
+					<el-input type="text" v-model="organizationForm.email" placeholder="请输入电子邮箱"></el-input>
+				</el-form-item>
+				<el-form-item label="历史背景" class="hui-textarea">
+					<custom-data ref="customData" :list="customList"></custom-data>
+				</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 {
+		insertOrganization,
+		updateOrganization,
+		getOrganizationDetailById
+	} from '@/httpApi/business'
+	import customData from './customData'
+	export default {
+		props: ['isUpdate', 'detailId'],
+		data() {
+			return {
+				organizationForm: {
+					name: '',
+					legalPerson: '',
+					establishDate: '',
+					businessTerm: '',
+					organizationId: '',
+					registeredCapital: '',
+					industryType: '',
+					data: '',
+					address: '',
+					businessScope: '',
+					corporateScale: '',
+					corporatePhilosophy: '',
+					corporateCulture: '',
+					contactInformation: '',
+					fax: '',
+					email: ''
+				},
+				customList: [],
+				loading: false
+			}
+		},
+		created() {
+			if (this.isUpdate) {
+				getOrganizationDetailById(this.detailId).then(res => {
+					if (res.state) {
+						this.organizationForm = res.data;
+						if (this.organizationForm.data) this.customList = JSON.parse(this.organizationForm.data);
+					}
+				})
+			} else {
+				this.organizationForm['organizationId'] = this.$store.getters.organization.id;
+				this.organizationForm['projectId'] = this.$store.getters.project.id;
+			}
+		},
+		methods: {
+			submit() {
+				this.loading = true;
+				this.$refs.organizationForm.validate((valid) => {
+					if (valid) {
+						let postData = JSON.parse(JSON.stringify(this.organizationForm));
+						postData['data'] = JSON.stringify(this.$refs.customData.listData);
+						if (this.isUpdate) {
+							updateOrganization(postData).then(this.successFunc);
+						} else {
+							insertOrganization(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: {
+			customData
+		},
+	}
+</script>
+
 <style lang="scss"></style>

virgo.wzfrontend/console/src/components/work/property/propertyGoDown.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="hui-flex-box hui-flex hui-table">
 		<div class="hui-content-insert">
-			<el-button type="primary" size="medium" @click="insertDepartment({})">新建库房</el-button>
+			<el-button v-permission="'/work/property/godown/add'" type="primary" size="medium" @click="insertDepartment({})">新建库房</el-button>
 		</div>
 		<div class="hui-flex-box">
 			<el-table :data="treeData" border height="100%">
@@ -10,10 +10,10 @@
 				<el-table-column label="操作" width="240">
 					<template slot-scope="scope">
 						<div class="hui-table-operation">
-							<span class="table-operation" v-if="!scope.row.isp" @click="updateDepartment(scope.row)">
+							<span class="table-operation" v-permission="'/work/property/godown/update'" v-if="!scope.row.isp" @click="updateDepartment(scope.row)">
 								编辑
 							</span>
-							<span class="table-operation" v-if="!scope.row.isp" @click="deleteDepartment(scope.row)">
+							<span class="table-operation" v-permission="'/work/property/godown/delete'" v-if="!scope.row.isp" @click="deleteDepartment(scope.row)">
 								删除
 							</span>
 						</div>
@@ -51,7 +51,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init() {
+				if (!this.auth('/work/property/godown/list')) return;
 				getGoDownList({
 					organizationId: this.$store.getters.organization.id,
 					projectId: this.$store.getters.project.id

virgo.wzfrontend/console/src/components/work/property/propertySet.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="hui-flex-box hui-flex hui-table">
 		<div class="hui-content-insert">
-			<el-button type="primary" size="medium" @click="insertDepartment({})">新建资产</el-button>
+			<el-button v-permission="'/work/property/set/add'" type="primary" size="medium" @click="insertDepartment({})">新建资产</el-button>
 		</div>
 		<div class="hui-flex-box">
 			<el-table :data="treeData" row-key="id" border height="100%">
@@ -9,17 +9,17 @@
 				<el-table-column label="操作" width="240">
 					<template slot-scope="scope">
 						<div class="hui-table-operation">
-							<span class="table-operation" @click="insertDepartment(scope.row)">
+							<span class="table-operation" v-permission="'/work/property/set/add'" @click="insertDepartment(scope.row)">
 								添加子资产
 							</span>
-							<span class="table-operation" v-if="scope.row.children.length === 0"
+							<span class="table-operation" v-permission="'/work/property/set/model'" v-if="scope.row.children.length === 0"
 								@click="model(scope.row)">
 								3D模型
 							</span>
-							<span class="table-operation" v-if="!scope.row.isp" @click="updateDepartment(scope.row)">
+							<span class="table-operation" v-permission="'/work/property/set/update'" v-if="!scope.row.isp" @click="updateDepartment(scope.row)">
 								编辑
 							</span>
-							<span class="table-operation" v-if="!scope.row.isp" @click="deleteDepartment(scope.row)">
+							<span class="table-operation" v-permission="'/work/property/set/delete'" v-if="!scope.row.isp" @click="deleteDepartment(scope.row)">
 								删除
 							</span>
 						</div>
@@ -66,7 +66,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init() {
+				if (!this.auth('/work/property/set/list')) return;
 				getDevicePartList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
 					if (res.state) {
 						if (res.data.length === 0) {

virgo.wzfrontend/console/src/components/work/space/project/detail.vue

@@ -5,10 +5,22 @@
 			<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">
+				<div class="hui-detail-label">类型</div>
+				<div class="hui-detail-value">{{$field.findTypeName('projectType',detail.type)}}</div>
 			</div>
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">项目类型</div>
-				<div class="hui-detail-value">{{$field.findTypeName('projectType',detail.type)}}</div>
+				<div class="hui-detail-value">{{$field.findTypeName('projectTypes',detail.projectType)}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">竣工时间</div>
+				<div class="hui-detail-value">{{detail.completionTime}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">建筑面积</div>
+				<div class="hui-detail-value">{{detail.buildingArea}}</div>
 			</div>
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">项目区域</div>
@@ -16,10 +28,10 @@
 			</div>
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">具体地点</div>
-				<div class="hui-detail-value">{{detail.specific}}</div>
+				<div class="hui-detail-value">{{detail.specificLocation}}</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.comment}}</div>
 			</div>
 		</div>

virgo.wzfrontend/console/src/components/work/space/project/edit.vue

@@ -1,184 +1,192 @@
-<template>
-	<div class="hui-flex hui-dialog">
-		<div class="hui-flex-box hui-dialog-content">
-			<el-form ref="projectForm" label-position="top" :model="projectForm">
-				<el-form-item label="项目名称" prop="name" :rules="[{required: true, message: '请输入项目名称'}]">
-					<el-input type="text" v-model="projectForm.name" placeholder="请输入项目名称"></el-input>
-				</el-form-item>
-				<el-form-item label="项目类型" prop="type" :rules="[{required: true, message: '请选择项目类型'}]">
-					<el-select v-model="projectForm.type" placeholder="请选择项目类型">
-						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.projectType"
-							:key="item.id">
-						</el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="项目区域" prop="address" :rules="[{required: true, message: '请选择项目区域'}]">
-					<city ref="city" v-model="projectForm.address"></city>
-				</el-form-item>
-				<el-form-item label="具体地点">
-					<el-input type="text" v-model="specific" placeholder="请输入具体地点">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="配套设施" prop="type">
-					<el-select v-model="supportingFacilities" placeholder="请选择配套设施" multiple collapse-tags>
-						<el-option :label="item.name" :value="item.id"
-							v-for="(item,index) in $field.field.supportingFacilities" :key="item.id">
-						</el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="项目描述" class="hui-textarea">
-					<el-input type="textarea" v-model="projectForm.comment" placeholder="请输入项目描述" resize="none">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="地图位置" class="hui-textarea">
-					<select-location ref="map" v-if="showMap" type="insert" :coordinates="projectForm.coordinates">
-					</select-location>
-				</el-form-item>
-				<el-form-item label="项目配图" class="hui-textarea">
-					<upload ref="upload" :list="responsibility" type="insert"></upload>
-				</el-form-item>
-				<el-form-item label="项目标签" class="hui-textarea">
-					<tag ref="tag" type="insert" :tagType="1"
-						:tagActive="projectForm.tagIds ? projectForm.tagIds.split(',') : []">
-					</tag>
-				</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 {
-		insertProject,
-		getProjectDetailById,
-		updateProject
-	} from '@/httpApi/space'
-	import upload from '@/components/common/upload'
-	import city from '@/components/common/city'
-	import tag from '@/components/common/tag'
-	import selectLocation from '@/components/work/common/selectLocation'
-	export default {
-		props: ['isUpdate', 'detailId'],
-		data() {
-			return {
-				projectForm: {
-					name: '', //项目名称
-					address: [],
-					comment: '',
-					data: '',
-					organizationId: '',
-					picture: '',
-					tagIds: '',
-					type: 1,
-					coordinates: '',
-					supportingFacilities: ''
-				},
-				specific: '',
-				responsibility: [],
-				showMap: false,
-				supportingFacilities: [],
-				isCache: true,
-				loading: false
-			}
-		},
-		created() {
-			if (this.isUpdate) {
-				this.isCache = false;
-				getProjectDetailById(this.detailId).then(res => {
-					if (res.state) {
-						this.projectForm = res.data;
-						this.showMap = true;
-						this.projectForm.address = JSON.parse(this.projectForm.address);
-						if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
-						if (this.projectForm.supportingFacilities) this.supportingFacilities = this.projectForm
-							.supportingFacilities.split(',').map(node => Number(node));
-						if (this.projectForm.data) {
-							let data = JSON.parse(this.projectForm.data);
-							this.specific = data.specific;
-						}
-					}
-				})
-			} else {
-				if (this.$store.getters.projectData && JSON.stringify(this.$store.getters.projectData) != '{}') {
-					if (this.$store.getters.projectData.organizationId != this.$store.getters.organization.id) {
-						return this.$store.dispatch('projectBase/changeProjectData', {});
-					}
-					// this.initForm(this.$store.getters.projectData);
-				}
-				this.projectForm['organizationId'] = this.$store.getters.organization.id;
-				this.showMap = true;
-			}
-		},
-		beforeDestroy() {
-			// this.cacheData();
-		},
-		methods: {
-			initForm(data) {
-				this.projectForm = data;
-				this.projectForm.address = JSON.parse(this.projectForm.address);
-				if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
-				if (this.projectForm.supportingFacilities) this.supportingFacilities = this.projectForm
-					.supportingFacilities.split(',').map(node => Number(node));
-				if (this.projectForm.data) {
-					let data = JSON.parse(this.projectForm.data);
-					this.specific = data.specific;
-				}
-			},
-			cacheData() {
-				if (!this.isCache) return;
-				this.$store.dispatch('projectBase/changeProjectData', this.setData());
-			},
-			setData() {
-				let postData = JSON.parse(JSON.stringify(this.projectForm));
-				postData.data = JSON.stringify({
-					specific: this.specific
-				});
-				postData['picture'] = JSON.stringify(this.$refs.upload.fileList);
-				postData['address'] = JSON.stringify(this.projectForm.address);
-				postData['tagIds'] = this.$refs.tag.tagIds();
-				postData['coordinates'] = this.$refs.map.address;
-				postData['supportingFacilities'] = this.supportingFacilities.join(',');
-				postData['addressCode'] = this.$refs.city.addressCode();
-				return postData;
-			},
-			submit() {
-				this.loading = true;
-				this.$refs.projectForm.validate((valid) => {
-					if (valid) {
-						let postData = this.setData();
-						if (this.isUpdate) {
-							updateProject(postData).then(this.successFunc);
-						} else {
-							insertProject(postData).then(this.successFunc);
-						}
-					} else {
-						this.loading = false;
-						return false;
-					}
-				});
-			},
-			successFunc(res) {
-				this.loading = false;
-				if (res.state) {
-					this.$store.dispatch('projectBase/changeProjectData', {});
-					this.isCache = false;
-					this.$message.success('操作成功');
-					this.$emit('callback', 'init');
-				}
-
-			}
-		},
-		components: {
-			city,
-			upload,
-			tag,
-			selectLocation
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="projectForm" label-position="top" :model="projectForm">
+				<el-form-item label="项目名称" prop="name" :rules="[{required: true, message: '请输入项目名称'}]">
+					<el-input type="text" v-model="projectForm.name" placeholder="请输入项目名称"></el-input>
+				</el-form-item>
+				<el-form-item label="类型" prop="type" :rules="[{required: true, message: '请选择类型'}]">
+					<el-select v-model="projectForm.type" placeholder="请选择类型">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.projectType"
+							:key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="项目类型" prop="type" :rules="[{required: true, message: '请选择项目类型'}]">
+					<el-select v-model="projectForm.projectType" placeholder="请选择项目类型">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.projectTypes"
+							:key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="建筑面积">
+					<el-input type="text" v-model="projectForm.buildingArea" placeholder="请输入建筑面积">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="竣工时间">
+					<el-date-picker v-model="projectForm.completionTime" type="date" placeholder="竣工时间"
+						value-format="yyyy-MM-dd">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="项目区域" prop="address" :rules="[{required: true, message: '请选择项目区域'}]">
+					<city ref="city" v-model="projectForm.address"></city>
+				</el-form-item>
+				<el-form-item label="具体地点">
+					<el-input type="text" v-model="projectForm.specificLocation" placeholder="请输入具体地点">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="配套设施" prop="type">
+					<el-select v-model="supportingFacilities" placeholder="请选择配套设施" multiple collapse-tags>
+						<el-option :label="item.name" :value="item.id"
+							v-for="(item,index) in $field.field.supportingFacilities" :key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="项目介绍" class="hui-textarea">
+					<el-input type="textarea" v-model="projectForm.comment" placeholder="请输入项目介绍" resize="none">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="地图位置" class="hui-textarea">
+					<select-location ref="map" v-if="showMap" type="insert" :coordinates="projectForm.coordinates">
+					</select-location>
+				</el-form-item>
+				<el-form-item label="项目配图" class="hui-textarea">
+					<upload ref="upload" :list="responsibility" type="insert"></upload>
+				</el-form-item>
+				<el-form-item label="项目标签" class="hui-textarea">
+					<tag ref="tag" type="insert" :tagType="1"
+						:tagActive="projectForm.tagIds ? projectForm.tagIds.split(',') : []">
+					</tag>
+				</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 {
+		insertProject,
+		getProjectDetailById,
+		updateProject
+	} from '@/httpApi/space'
+	import upload from '@/components/common/upload'
+	import city from '@/components/common/city'
+	import tag from '@/components/common/tag'
+	import selectLocation from '@/components/work/common/selectLocation'
+	export default {
+		props: ['isUpdate', 'detailId'],
+		data() {
+			return {
+				projectForm: {
+					name: '', //项目名称
+					address: [],
+					comment: '',
+					data: '',
+					organizationId: '',
+					picture: '',
+					tagIds: '',
+					type: 1,
+					projectType: 1,
+					coordinates: '',
+					supportingFacilities: '',
+					specificLocation: '',
+					completionTime: '',
+					buildingArea: ''
+				},
+				responsibility: [],
+				showMap: false,
+				supportingFacilities: [],
+				isCache: true,
+				loading: false
+			}
+		},
+		created() {
+			if (this.isUpdate) {
+				this.isCache = false;
+				getProjectDetailById(this.detailId).then(res => {
+					if (res.state) {
+						this.projectForm = res.data;
+						this.showMap = true;
+						this.projectForm.address = JSON.parse(this.projectForm.address);
+						if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
+						if (this.projectForm.supportingFacilities) this.supportingFacilities = this.projectForm
+							.supportingFacilities.split(',').map(node => Number(node));
+					}
+				})
+			} else {
+				if (this.$store.getters.projectData && JSON.stringify(this.$store.getters.projectData) != '{}') {
+					if (this.$store.getters.projectData.organizationId != this.$store.getters.organization.id) {
+						return this.$store.dispatch('projectBase/changeProjectData', {});
+					}
+					// this.initForm(this.$store.getters.projectData);
+				}
+				this.projectForm['organizationId'] = this.$store.getters.organization.id;
+				this.showMap = true;
+			}
+		},
+		beforeDestroy() {
+			// this.cacheData();
+		},
+		methods: {
+			initForm(data) {
+				this.projectForm = data;
+				this.projectForm.address = JSON.parse(this.projectForm.address);
+				if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
+				if (this.projectForm.supportingFacilities) this.supportingFacilities = this.projectForm
+					.supportingFacilities.split(',').map(node => Number(node));
+			},
+			cacheData() {
+				if (!this.isCache) return;
+				this.$store.dispatch('projectBase/changeProjectData', this.setData());
+			},
+			setData() {
+				let postData = JSON.parse(JSON.stringify(this.projectForm));
+				postData['picture'] = JSON.stringify(this.$refs.upload.fileList);
+				postData['address'] = JSON.stringify(this.projectForm.address);
+				postData['tagIds'] = this.$refs.tag.tagIds();
+				postData['coordinates'] = this.$refs.map.address;
+				postData['supportingFacilities'] = this.supportingFacilities.join(',');
+				postData['addressCode'] = this.$refs.city.addressCode();
+				return postData;
+			},
+			submit() {
+				this.loading = true;
+				this.$refs.projectForm.validate((valid) => {
+					if (valid) {
+						let postData = this.setData();
+						if (this.isUpdate) {
+							updateProject(postData).then(this.successFunc);
+						} else {
+							insertProject(postData).then(this.successFunc);
+						}
+					} else {
+						this.loading = false;
+						return false;
+					}
+				});
+			},
+			successFunc(res) {
+				this.loading = false;
+				if (res.state) {
+					this.$store.dispatch('projectBase/changeProjectData', {});
+					this.isCache = false;
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+
+			}
+		},
+		components: {
+			city,
+			upload,
+			tag,
+			selectLocation
+		},
+	}
+</script>
+
 <style lang="scss"></style>

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

@@ -5,6 +5,19 @@ const projectType = [{
 	id: 2,
 	name: '知识产权'
 }];
+const projectTypes = [{
+	id: 1,
+	name: '科技园区'
+}, {
+	id: 2,
+	name: '医院'
+}, {
+	id: 3,
+	name: '商超'
+}, {
+	id: 4,
+	name: '酒店'
+}];
 
 const houseType = [{
 	id: 1,
@@ -288,6 +301,7 @@ const findItem = (type, id) => {
 export default {
 	field: {
 		projectType,
+		projectTypes,
 		houseType,
 		payWay,
 		customerType,

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

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import {
 	auth
 } from '@/uitls/auth'
+Vue.prototype.auth = auth;
 // 注册一个全局自定义指令 `v-permission`
 Vue.directive('permission', {
 	// 当绑定元素挂载到 DOM 上时
@@ -10,6 +11,6 @@ Vue.directive('permission', {
 		const permissionValue = binding.value;
 		// 检查用户权限
 		if (auth(permissionValue)) return;
-		el.style.display = 'none';
+		el.parentNode.removeChild(el);
 	}
 });

virgo.wzfrontend/console/src/views/work/crm/organization.vue

@@ -4,6 +4,7 @@
 			<div class="hui-title-item active">企业管理</div>
 		</div>
 		<div class="hui-flex-box hui-flex hui-table">
+			<list-filter type="organization" @filter="filterInit"></list-filter>
 			<div class="hui-content-insert">
 				<el-button type="primary" size="medium" @click="insertProject">新增企业</el-button>
 			</div>
@@ -78,6 +79,7 @@
 
 	import edit from '@/components/work/business/organization/edit'
 	import detail from '@/components/work/business/organization/detail'
+	import listFilter from '@/components/common/listFilter'
 	export default {
 		data() {
 			return {
@@ -88,7 +90,8 @@
 				visible: false,
 				detailId: '',
 				isUpdate: false,
-				drawer: false
+				drawer: false,
+				filterOption: {}
 			}
 		},
 		created() {
@@ -96,18 +99,25 @@
 		},
 		methods: {
 			init() {
-				getOrganizationListByPage({
+				let postData = {
 					currPage: this.currPage,
 					pageSize: this.pageSize,
 					organizationId: this.$store.getters.organization.id,
 					projectId: this.$store.getters.project.id
-				}).then(res => {
+				}
+				postData = Object.assign(postData, this.filterOption);
+				getOrganizationListByPage(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();
+			},
 			currentChange(currPage) {
 				this.currPage = currPage;
 				this.init();
@@ -223,7 +233,8 @@
 		},
 		components: {
 			edit,
-			detail
+			detail,
+			listFilter
 		},
 	}
 </script>

virgo.wzfrontend/console/src/views/work/operation/week/part.vue

@@ -2,7 +2,7 @@
 	<div class="hui-flex hui-content">
 		<div class="hui-flex">
 			<div class="hui-content-title">
-				<div class="hui-title-item active">公司周报</div>
+				<div class="hui-title-item active">部门周报</div>
 			</div>
 			<div class="hui-flex-box hui-flex hui-table">
 				<div class="hui-flex-box">

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

@@ -2,7 +2,7 @@
 	<div class="hui-flex hui-content">
 		<div class="hui-flex">
 			<div class="hui-content-title">
-				<div class="hui-title-item active">公司周报</div>
+				<div class="hui-title-item active">工作周报</div>
 			</div>
 			<div class="hui-flex-box hui-flex hui-table">
 				<div class="hui-flex-box">

virgo.wzfrontend/console/src/views/work/property/change.vue

@@ -37,7 +37,7 @@
 					</div>
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
-							<el-button type="primary" size="medium" @click="insert">新增变更</el-button>
+							<el-button type="primary" v-permission="'/work/property/change/add'" size="medium" @click="insert">新增变更</el-button>
 						</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">
@@ -79,14 +79,14 @@
 								<el-table-column label="操作" width="150">
 									<template slot-scope="scope">
 										<div class="hui-table-operation">
-											<span class="table-operation" @click="lookFlow(scope.row)">
+											<span class="table-operation" v-permission="'/work/property/change/detail'" @click="lookFlow(scope.row)">
 												详情
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/change/update'" v-if="!scope.row.projectFlowId"
 												@click="updateFlow(scope.row)">
 												编辑
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/change/delete'" v-if="!scope.row.projectFlowId"
 												@click="deleteFlow(scope.row)">
 												删除
 											</span>
@@ -154,7 +154,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init() {
+				if (!this.auth('/work/property/change/list')) return;
 				let filterOption = {
 					projectId: this.$store.getters.project.id,
 					flowType: this.flowType

virgo.wzfrontend/console/src/views/work/property/depreciation.vue

@@ -37,7 +37,7 @@
 					</div>
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
-							<el-button type="primary" size="medium" @click="insert">新增折旧</el-button>
+							<el-button type="primary" v-permission="'/work/property/depreciation/add'" size="medium" @click="insert">新增折旧</el-button>
 						</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">
@@ -78,14 +78,14 @@
 								<el-table-column label="操作" width="150">
 									<template slot-scope="scope">
 										<div class="hui-table-operation">
-											<span class="table-operation" @click="lookFlow(scope.row)">
+											<span class="table-operation" v-permission="'/work/property/depreciation/detail'" @click="lookFlow(scope.row)">
 												详情
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/depreciation/update'" v-if="!scope.row.projectFlowId"
 												@click="updateFlow(scope.row)">
 												编辑
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/depreciation/delete'" v-if="!scope.row.projectFlowId"
 												@click="deleteFlow(scope.row)">
 												删除
 											</span>
@@ -153,7 +153,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init() {
+				if (!this.auth('/work/property/depreciation/list')) return;
 				let filterOption = {
 					projectId: this.$store.getters.project.id,
 					flowType: this.flowType

virgo.wzfrontend/console/src/views/work/property/inventory.vue

@@ -37,7 +37,7 @@
 					</div>
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
-							<el-button type="primary" size="medium" @click="insert">新增盘点</el-button>
+							<el-button v-permission="'/work/property/inventory/detail'" type="primary" size="medium" @click="insert">新增盘点</el-button>
 						</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">
@@ -78,14 +78,14 @@
 								<el-table-column label="操作" width="150">
 									<template slot-scope="scope">
 										<div class="hui-table-operation">
-											<span class="table-operation" @click="lookFlow(scope.row)">
+											<span class="table-operation" v-permission="'/work/property/inventory/detail'" @click="lookFlow(scope.row)">
 												详情
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/inventory/detail'" v-if="!scope.row.projectFlowId"
 												@click="updateFlow(scope.row)">
 												编辑
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/inventory/detail'" v-if="!scope.row.projectFlowId"
 												@click="deleteFlow(scope.row)">
 												删除
 											</span>
@@ -153,7 +153,8 @@
 			this.init();
 		},
 		methods: {
-			init() {
+			init() {
+				if (!this.auth('/work/property/inventory/list')) return;
 				let filterOption = {
 					projectId: this.$store.getters.project.id,
 					flowType: this.flowType

virgo.wzfrontend/console/src/views/work/property/register.vue

@@ -37,7 +37,10 @@
 					</div>
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
-							<el-button v-permission="'/work/property/register/add'" type="primary" size="medium" @click="insert">新增登记</el-button>
+							<el-button v-permission="'/work/property/register/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%">
@@ -79,14 +82,14 @@
 								<el-table-column label="操作" width="150">
 									<template slot-scope="scope">
 										<div class="hui-table-operation">
-											<span class="table-operation" @click="lookFlow(scope.row)">
+											<span class="table-operation" v-permission="'/work/property/register/detail'" @click="lookFlow(scope.row)">
 												详情
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/register/update'" v-if="!scope.row.projectFlowId"
 												@click="updateFlow(scope.row)">
 												编辑
 											</span>
-											<span class="table-operation" v-if="!scope.row.projectFlowId"
+											<span class="table-operation" v-permission="'/work/property/register/delete'" v-if="!scope.row.projectFlowId"
 												@click="deleteFlow(scope.row)">
 												删除
 											</span>
@@ -155,6 +158,7 @@
 		},
 		methods: {
 			init() {
+				if (!this.auth('/work/property/register/list')) return;
 				let filterOption = {
 					projectId: this.$store.getters.project.id,
 					flowType: this.flowType

virgo.wzfrontend/console/src/views/work/space/housing.vue

@@ -137,8 +137,8 @@
 					}
 				})
 			},
-			treeclick(id) {
-				this.projectItemTargetId = id;
+			treeclick(data) {
+				this.projectItemTargetId = data.id;
 				this.currPage = 1;
 				this.init();
 			},

virgo.wzfrontend/console/src/views/work/space/project.vue

@@ -15,12 +15,19 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="项目名称" prop="name"></el-table-column>
-					<el-table-column label="项目类型" prop="name">
+					<el-table-column label="项目类型">
 						<template slot-scope="scope">
-							<span>{{$field.findTypeName('projectType',scope.row.type)}}</span>
+							<span>{{$field.findTypeName('projectTypes',scope.row.projectType)}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="项目介绍" prop="comment"></el-table-column>
+					<el-table-column label="竣工时间" prop="completionTime"></el-table-column>
+					<el-table-column label="建筑面积" prop="buildingArea"></el-table-column>
+					<el-table-column label="运营商">
+						<template slot-scope="scope">
+							<span>{{$store.getters.organization.name}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="项目描述" prop="comment"></el-table-column>
 					<el-table-column label="操作" width="150">
 						<template slot-scope="scope">
 							<div class="hui-table-operation">