fix

virgo.wzfrontend/console/src/components/document/editor.vue

@@ -5,7 +5,7 @@
 		</div>
 		<div class="hui-dialog-submit">
 			<el-button size="medium" @click="$emit('close')">取 消</el-button>
-			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
+			<el-button size="medium" type="primary" @click="submit" v-if="type != 'look'">保 存</el-button>
 		</div>
 		<el-dialog :close-on-click-modal="false" title="选择日期" :visible.sync="timeDialog" :append-to-body="true"
 			width="500px">
@@ -82,7 +82,7 @@
 	} from 'vuex';
 	// import verifyQr from '@/components/verifyQr';
 	export default {
-		props: ['documentId', 'templateId'],
+		props: ['documentId', 'templateId', 'type'],
 		data() {
 			return {
 				html: '', //html
@@ -208,12 +208,17 @@
 						$(elem).text(this.contextData[id] || '')
 						break;
 					case 'sign':
-						elem.innerHTML =
-							'<button class="sureAutograph el-button el-button--default el-button--medium">确认签名</button>';
+						if (this.type !== 'look') {
+							elem.innerHTML =
+								'<button class="sureAutograph el-button el-button--default el-button--medium">确认签名</button>';
+						}
+
 						break;
 					case 'seal':
 						if (elem.innerHTML) return;
-						elem.innerHTML = '<span class="sureSeal"">申请盖章</span>';
+						if (this.type !== 'look') {
+							elem.innerHTML = '<span class="sureSeal"">申请盖章</span>';
+						}
 						break;
 					default:
 						break;

virgo.wzfrontend/console/src/components/work/order/edit.vue

@@ -167,6 +167,7 @@
 			merchant() {
 				getOrganizationList({
 					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id,
 					status: 1
 				}).then(res => {
 					if (res.state) {
@@ -178,7 +179,8 @@
 				getCustomerListByPage({
 					currPage: 1,
 					pageSize: 100,
-					organizationId: this.$store.getters.organization.id,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id,
 					status: 2
 				}).then(res => {
 					if (res.state) {
@@ -206,7 +208,7 @@
 					}
 				});
 			},
-			successFunc(res) {
+			successFunc(res) {
 				this.loading = false;
 				if (res.state) {
 					this.$message.success('操作成功');

virgo.wzfrontend/console/src/components/work/organization/seal/request.vue

@@ -8,14 +8,14 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="requestUserName" label="姓名"></el-table-column>
-				<el-table-column label="适用类型" width="80">
+				<el-table-column label="使用类型">
 					<template slot-scope="scope">
 						<span>
 							<span v-if="scope.row.documentId">文档</span>
 						</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="申请状态" width="80">
+				<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 == 0">待审核</div>
@@ -23,9 +23,13 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="150">
+				<el-table-column label="操作">
 					<template slot-scope="scope">
 						<div class="hui-table-operation">
+							<span v-if="scope.row.documentId" class="table-operation"
+								@click="showDocument(scope.row.documentId)">
+								查看文档
+							</span>
 							<span class="table-operation" @click="pass(scope.row)" v-if="scope.row.status == 0">
 								通过
 							</span>
@@ -42,6 +46,11 @@
 				@current-change="currentChange">
 			</el-pagination>
 		</div>
+		<el-dialog :close-on-click-modal="false" title="查看文档" :visible.sync="documentShow" class="document-dialog"
+			width="80%" :append-to-body="true">
+			<editor :documentId="documentId" v-if="documentShow" @close="documentShow = false" type="look">
+			</editor>
+		</el-dialog>
 	</div>
 </template>
 
@@ -50,6 +59,7 @@
 		getSealRequestListByQuery,
 		requestUseSeal
 	} from '@/httpApi/organization'
+	import editor from '@/components/document/editor'
 	export default {
 		props: ['detailId'],
 		data() {
@@ -58,11 +68,16 @@
 				currPage: 1,
 				pageSize: 10,
 				totalCount: 0,
+				documentShow: false,
+				documentId: ''
 			}
 		},
 		created() {
 			this.init();
 		},
+		components: {
+			editor
+		},
 		methods: {
 			init() {
 				let postData = {
@@ -81,11 +96,13 @@
 				this.currPage = currPage;
 				this.init();
 			},
+			showDocument(id) {
+				this.documentId = id;
+				this.documentShow = true;
+			},
 			pass(item) {
 				this.$confirm('确定通过该印章申请?', () => {
-					console.log('-----=======');
 					this.$loading.open();
-					console.log('-------');
 					requestUseSeal(item.id, {
 						documentId: item.documentId,
 						requestId: item.id,

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

@@ -103,7 +103,7 @@ export function updateUserDetails(data) {
  * @param null 
  * 
  */
-export function refresh(organizationId) {
+export function refresh() {
 	return request({
 		url: `/manager/userContext/refresh`,
 		method: 'get',

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

@@ -36,7 +36,8 @@
 		login,
 		getImgCode,
 		sendPhoneCode,
-		getUserInfo
+		getUserInfo,
+		selectOrangaized
 	} from '@/httpApi/loginRegister';
 	import {
 		getProjectListByIdentity
@@ -153,12 +154,28 @@
 						getUserInfo().then(res => {
 							if (res.state) {
 								let user = res.data;
-								this.$store.dispatch('app/changeOrganization', user.organization);
-								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.initProjectData(user.projectId);
+								if (user.projectId === -1) {
+									let organziation = user.organizationList.find(node => node
+										.contactTel == user.phone);
+									selectOrangaized(organziation)
+									this.$store.dispatch('app/changeOrganization', organziation);
+									this.$store.dispatch('app/changeUser', user);
+									this.$store.dispatch('projectBase/changeProject', {});
+									this.$store.dispatch('app/changeIdentity', {
+										id: 6,
+										name: '所有者',
+										remark: '所有者'
+									});
+									localStorage.setItem('projectId', 0);
+									return this.successLogin('/work/space/project');
+								} else {
+									this.$store.dispatch('app/changeOrganization', user.organization);
+									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.initProjectData(user.projectId);
+								}
 							} else {
 								this.loginLoading = false;
 							}

virgo.wzfrontend/console/src/views/work/staging/projects.vue

@@ -0,0 +1,342 @@
+<template>
+	<div class="work-project-index">
+		<div class="work-project-box">
+			<div class="work-project-left">
+				<div class="work-project-house box-background">
+					<div class="title">
+						<span class="label">房源管理</span>
+					</div>
+					<div class="box-list">
+						<div class="box-node box-line">
+							<div class="name">总面积(㎡)</div>
+							<div class="number alibaba">120</div>
+						</div>
+						<div class="box-node box-line">
+							<div class="name">已租面积(㎡)</div>
+							<div class="number alibaba">100</div>
+						</div>
+						<div class="box-node">
+							<div class="name">剩余面积(㎡)</div>
+							<div class="number alibaba">20</div>
+						</div>
+						<div class="box-node box-line">
+							<div class="name">总房源(个)</div>
+							<div class="number alibaba">28</div>
+						</div>
+						<div class="box-node box-line">
+							<div class="name">已租房源(个)</div>
+							<div class="number alibaba">26</div>
+						</div>
+						<div class="box-node">
+							<div class="name">剩余房源(个)</div>
+							<div class="number alibaba">2</div>
+						</div>
+					</div>
+				</div>
+				<div class="work-project-bill box-background">
+					<div class="title">
+						<span class="label">费用管理</span>
+						<div class="title-option">
+							<div v-for="(item,index) in billList"
+								:class="nowBillId === item.id ?'option-item active':'option-item'"
+								@click="nowBillId = item.id">
+								{{item.name}}
+							</div>
+						</div>
+					</div>
+					<div class="work-order-detail">
+						<div class="detail-item">
+							<span class="label">房租费用</span>
+							<span class="detail-icon"></span>
+							<div class="detail-test">
+								<div class="test-item">
+									<div class="name">应收(万)</div>
+									<div class="number alibaba">120</div>
+								</div>
+								<div class="test-item line">
+									<div class="name">已收(万)</div>
+									<div class="number alibaba">110</div>
+								</div>
+								<div class="test-item">
+									<div class="name">逾期(万)</div>
+									<div class="number alibaba">10</div>
+								</div>
+							</div>
+						</div>
+						<div class="detail-item">
+							<span class="label">物业费用</span>
+							<span class="detail-icon"></span>
+							<div class="detail-test">
+								<div class="test-item">
+									<div class="name">应收(万)</div>
+									<div class="number alibaba">12</div>
+								</div>
+								<div class="test-item line">
+									<div class="name">已收(万)</div>
+									<div class="number alibaba">11</div>
+								</div>
+								<div class="test-item">
+									<div class="name">逾期(万)</div>
+									<div class="number alibaba">1</div>
+								</div>
+							</div>
+						</div>
+						<div class="detail-item">
+							<span class="label">水电费用</span>
+							<span class="detail-icon"></span>
+							<div class="detail-test">
+								<div class="test-item">
+									<div class="name">应收(万)</div>
+									<div class="number alibaba">1.2</div>
+								</div>
+								<div class="test-item line">
+									<div class="name">已收(万)</div>
+									<div class="number alibaba">1.1</div>
+								</div>
+								<div class="test-item">
+									<div class="name">逾期(万)</div>
+									<div class="number alibaba">0.1</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="work-project-client box-background">
+					<div class="title">
+						<span class="label">客户管理</span>
+						<div class="more">查看更多>></div>
+					</div>
+				</div>
+			</div>
+			<div class="work-project-center"></div>
+			<div class="work-project-right"></div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				billList: [{
+					id: 1,
+					name: '当月'
+				}, {
+					id: 2,
+					name: '当年'
+				}, {
+					id: 3,
+					name: '累计'
+				}],
+				nowBillId: 1
+			}
+		},
+		created() {},
+		methods: {},
+	}
+</script>
+
+<style lang="scss">
+	.work-project-index {
+		width: 100%;
+		height: 100%;
+		overflow: auto;
+		background: $--background;
+
+		.title {
+			display: flex;
+			align-items: center;
+			position: relative;
+			background: linear-gradient(315deg, rgba(167, 208, 255, 0), rgba(110, 163, 255, 0.2));
+			margin: 15px;
+			line-height: 30px;
+			padding-left: 10px;
+			border-left: 1px solid rgba(110, 163, 255, 0.3);
+
+			&:before {
+				content: '';
+				left: -1px;
+				bottom: 10px;
+				position: absolute;
+				height: 20px;
+				width: 2px;
+				background: #4777e3;
+
+			}
+
+			.label {
+				flex: 1;
+				width: 0;
+				overflow: hidden;
+				font-weight: 500;
+			}
+
+			.title-option {
+				display: flex;
+				align-items: center;
+				background: rgba(26, 38, 60, 0.8);
+				height: 20px;
+				border-radius: 2px;
+			}
+
+			.option-item {
+				width: 60px;
+				height: 20px;
+				color: #818CA2;
+				font-size: 12px;
+				text-align: center;
+				line-height: 20px;
+				border-radius: 2px;
+				cursor: pointer;
+			}
+
+			.option-item.active,
+			.option-item:hover {
+				background: #6c7589;
+				color: #D2E4FF;
+			}
+
+			.more {
+				color: $--color-primary;
+				font-size: 12px;
+			}
+		}
+
+		.box-list {
+			display: flex;
+			flex-wrap: wrap;
+
+			.box-node {
+				text-align: center;
+				margin-bottom: 10px;
+				padding: 2px 0;
+				position: relative;
+
+				.name {
+					font-size: 12px;
+					margin-bottom: 2px;
+				}
+
+				.number {
+					font-size: 18px;
+				}
+
+				&.box-line::before {
+					content: '';
+					position: absolute;
+					height: 20px;
+					width: 1px;
+					background: rgba(123, 149, 198, 0.36);
+					top: 16px;
+					right: 0;
+				}
+			}
+		}
+
+		.work-order-detail {
+			padding: 0 15px;
+
+			.detail-item {
+				margin-bottom: 12px;
+			}
+
+			.detail-item,
+			.detail-test {
+				display: flex;
+				align-items: center;
+			}
+
+			.detail-icon {
+				width: 15px;
+				height: 20px;
+				background: url(../../../assets/image/safe/title-icon.png) no-repeat;
+				background-size: contain;
+				margin-left: 30px;
+			}
+
+			.label {
+				font-weight: 600;
+				width: 56px;
+				font-size: 13px;
+				margin-left: 12px;
+			}
+
+			.detail-test,
+			.test-item {
+				flex: 1;
+				width: 0;
+				overflow: hidden;
+			}
+
+			.test-item {
+				text-align: center;
+				padding: 2px 0;
+				position: relative;
+			}
+
+			.name {
+				font-size: 12px;
+				margin-bottom: 2px;
+				line-height: 18px;
+			}
+
+			.number {
+				font-size: 18px;
+			}
+
+			.detail-list {
+				padding: 20px 0 14px 0;
+			}
+
+			.line::before,
+			.line::after {
+				content: '';
+				width: 1px;
+				height: 20px;
+				background: rgba(123, 149, 198, 0.36);
+				position: absolute;
+				top: 16px;
+			}
+
+			.line::before {
+				left: 0;
+			}
+
+			.line::after {
+				right: 0;
+			}
+		}
+
+		.work-project-box {
+			width: 100%;
+			height: 100%;
+			display: flex;
+		}
+
+		.work-project-left {
+			width: 450px;
+			display: flex;
+			flex-direction: column;
+			box-sizing: border-box;
+		}
+
+		.work-project-house {
+			margin-bottom: 15px;
+
+			.box-node {
+				width: 33.333333%;
+			}
+		}
+
+
+		.work-project-bill {
+			margin-bottom: 10px;
+		}
+
+		.work-project-client {
+			flex: 1;
+			height: 0;
+		}
+
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/projectList/projectList.vue

@@ -3,16 +3,12 @@
 		<view class="common-list">
 			<view class="common-item" v-for="(item,index) in list" :key="item.id" @click="select(item)">
 				<view class="title">{{item.name}}</view>
-				<view class="date">{{item.createDate}}</view>
+				<view class="date">{{item.organizationName || '-'}}</view>
 				<view class="space">{{JSON.parse(item.address).join('-')}}</view>
 				<view class="state">
-					<view class="create">
-						<uni-icons class="inherit-icons" type="staff-filled" color="#08979c" size="18"></uni-icons>
-						<text class="name hui-ellipsis">{{item.organizationName || '-'}}</text>
-					</view>
+					<view></view>
 					<view class="tag">
-						<view class="status-tag primary" v-for="(node,index) in item.projectListIdentity"
-							:key="item.id">
+						<view class="status-tag primary" v-for="(node,index) in item.projectListIdentity" :key="node.id">
 							{{node.name}}
 						</view>
 					</view>
@@ -28,7 +24,8 @@
 <script>
 	import {
 		getProjectList,
-		selectProject
+		selectProject,
+		refresh
 	} from '@/request/api/project'
 	import {
 		selectOrangaized,
@@ -49,11 +46,20 @@
 		},
 		methods: {
 			init() {
-				getProjectList().then(res => {
+				uni.showLoading();
+				refresh().then(res => {
 					if (res.code == 200) {
-						this.list = res.data;
+						getProjectList().then(res => {
+							uni.hideLoading();
+							if (res.code == 200) {
+								this.list = res.data;
+							}
+						})
+					} else {
+						uni.hideLoading();
 					}
 				})
+
 			},
 			select(item) {
 				uni.showActionSheet({
@@ -99,5 +105,13 @@
 <style lang="scss">
 	.project-select {
 		padding: 30rpx 0;
+
+		.tag {
+			display: flex;
+
+			.status-tag {
+				margin-left: 5px;
+			}
+		}
 	}
 </style>

virgo.wzfrontend/yui_wx/request/api/project.js

@@ -31,4 +31,15 @@ export function selectProject(projectId) {
 		url: `/manager/userContext/project/${projectId}`,
 		method: 'put',
 	})
+}
+/* 
+ * 刷新上下文
+ * @param null 
+ * 
+ */
+export function refresh() {
+	return request({
+		url: `/manager/userContext/refresh`,
+		method: 'get',
+	})
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-upload": "/uni_modules/uv-upload/components/uv-upload/uv-upload"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/projectList/projectList.wxss

@@ -1 +1 @@
-.project-select{padding:30rpx 0}
+.project-select{padding:30rpx 0}.project-select .tag{display:flex}.project-select .tag .status-tag{margin-left:5px}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/Winglau14-lotusCalendar/Winglau14-lotusCalendar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/navbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/projectList/projectList.wxss

@@ -9,4 +9,10 @@
 .project-select {
   padding: 30rpx 0;
 }
+.project-select .tag {
+  display: flex;
+}
+.project-select .tag .status-tag {
+  margin-left: 5px;
+}
 

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,20 +9,28 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.5.3",
+  "libVersion": "",
   "appid": "wx3c006d364161d240",
   "projectname": "yui_wx",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-upload/components/uv-upload/uv-upload.json

@@ -1,8 +1,8 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
     "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon",
     "uv-preview-video": "/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video"
-  },
-  "component": true
+  }
 }