diff --git a/.gitignore b/.gitignore
index 08f7977..564dbb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /unpackage/dist/dev/app-plus/manifest.json
 /unpackage/dist/dev/app-plus/uni-app-view.umd.js
 /node_modules
+/unpackage
diff --git a/components/departSelect/departSelect.vue b/components/departSelect/departSelect.vue
new file mode 100644
index 0000000..6a1cda2
--- /dev/null
+++ b/components/departSelect/departSelect.vue
@@ -0,0 +1,119 @@
+<template>
+	<view>
+		<view v-if="customReturnValue === 'orgCode'">
+			<uni-data-picker :openSearch="true" placeholder="请选择单位" popup-title="请选择单位" :localdata="dataList"
+				@nodeclick="onNodeClick" @popupclosed="onPopupClosed" v-model="ID"
+				:map="{ text: 'title', value: 'orgCode' }"></uni-data-picker>
+		</view>
+		<view v-else>
+			<uni-data-picker :openSearch="true" placeholder="请选择单位" popup-title="请选择单位" :localdata="dataList"
+				@nodeclick="onNodeClick" @popupclosed="onPopupClosed" v-model="ID"
+				:map="{ text: 'title', value: 'id' }"></uni-data-picker>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		queryDepByCode,
+		queryZbDepByLdhth
+	} from '@/api/depart.js'
+	import {
+		useStore
+	} from '@/store';
+
+	const store = useStore()
+
+	const props = defineProps([{
+			value: {
+				type: String,
+				default: ''
+			},
+
+			customReturnValue: {
+				require: true,
+				type: String,
+				default: 'orgCode'
+			}
+		}]),
+		
+		watch(value,(newValue,oldValue)=>{
+		  console.log("新值是"+newValue, "旧址是"+oldValue);
+		  	this.ID = val;
+		}),
+		watch(value,(newValue,oldValue)=>{
+		  console.log("新值是"+newValue, "旧址是"+oldValue);
+		  	this.ID = val;
+		}),
+		
+		 
+		data() {
+			return {
+				reset: true,
+				url: {
+					list: '/sys/sysDepart/queryTreeList'
+				},
+				pageNo: 1,
+				pageSize: 3000,
+
+				params: {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+				},
+				dataList: [],
+				ID: '',
+				bmText: '',
+				tempID: '',
+				field: ''
+			};
+		},
+		onReady() {
+			this.getData();
+		},
+		mounted() {
+			this.getData();
+		},
+		methods: {
+			onNodeClick(e) {
+				console.log(JSON.stringify(e));
+				console.log(e.orgCode, e.title, e.id, this.customReturnValue);
+				this.$nextTick(() => {
+					if (this.customReturnValue == 'orgCode') {
+						this.tempID = e.orgCode;
+					}
+					if (this.customReturnValue == 'id') {
+						this.tempID = e.id;
+					}
+
+					this.bmText = e.title;
+				})
+			},
+			onPopupClosed() {
+				this.$nextTick(() => {
+					this.ID = this.tempID;
+					console.log(this.ID, this.bmText);
+					this.$emit('input', this.ID);
+					this.$emit('change', this.ID, this.bmText);
+				});
+			},
+			onchange(e) {
+				this.$nextTick(() => {
+					this.ID = this.tempID;
+					console.log(this.ID, this.bmText);
+					this.$emit('input', this.ID);
+					this.$emit('change', this.ID, e.detail.value);
+				})
+			},
+			getData() {
+				// console.log(111)
+				let that = this;
+				queryDepByCode(store.userinfo.workNo).then((res) => { //获取工作单位
+					console.log(res)
+					depart.value = res.departName
+					orgCode.value = res.orgCode
+				})
+			}
+		}
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/pages/meeting/detail.vue b/pages/meeting/detail.vue
new file mode 100644
index 0000000..761132e
--- /dev/null
+++ b/pages/meeting/detail.vue
@@ -0,0 +1,212 @@
+<template>
+	<view :class="['content',{'gray':store.isgray==1}]">
+		<view class="list_box">
+			<view class="list">
+				<view class="title f-row aic jcb">
+					<view class="">
+						年度部门讨论会议
+					</view>
+					<text>1分钟前</text>
+				</view>
+				<view class="info">
+					<view class="f-row aic jcb">
+						<view class="">
+							会议状态：
+						</view>
+						<text>待开始/已开始/已结束</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							发起人：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议日期：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议地点：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议内容：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="">
+						<view class="">
+							参与人员：
+						</view>
+						<view class="person f-row aic">
+							<view class="item f-col aic" v-for="item,i in 7" :key="i">
+								<image src="" mode=""></image>
+								<view class="name">
+									周如意
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn f-row aic jcb">
+			<view class="refuse">
+				拒绝
+			</view>
+			<view class="agree" @click="openpop">
+				同意
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue';
+	import {
+		huiyiDetailApi
+	} from '@/api/api.js';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		useStore
+	} from '@/store'
+	const store = useStore()
+	onLoad(() => {
+		huiyiDetail()
+	})
+	const huiyiDetail = () => {
+		huiyiDetailApi({
+			mainid:1
+		}).then((res) => {
+			if (res.success) {
+	
+			}
+		}).catch((err) => {
+			console.log(err);
+		})
+	}
+	
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding-bottom: 120rpx;
+	}
+	.btn {
+		position: fixed;
+		bottom: 0;
+		width: 690rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		padding: 0 30rpx;
+		border-top: 1px solid  #EFEFEF;
+	
+		view {
+	
+			width: 330rpx;
+			height: 88rpx;
+			font-size: 28rpx;
+			border-radius: 16rpx;
+			text-align: center;
+			line-height: 88rpx;
+		}
+	
+		.refuse {
+			box-sizing: border-box;
+			background: #FFFFFF;
+			border: 2rpx solid #01508B;
+			color: #01508B;
+		}
+	
+		.agree {
+			background: #01508B;
+			color: #FFFFFF;
+		}
+	}
+	.list_box {
+
+		.list {
+			padding: 30rpx;
+			margin-bottom: 30rpx;
+
+			.title {
+				border-bottom: 1px solid #efefef;
+				padding-bottom: 24rpx;
+				margin-bottom: 8rpx;
+
+				view {
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				text {
+					font-size: 28rpx;
+					color: #999999;
+				}
+			}
+
+			.info {
+				font-size: 28rpx;
+				color: #666666;
+
+				view {
+					padding-top: 16rpx;
+					
+					font-size: 28rpx;
+					color: #666666;
+				}
+				text{
+					font-size: 28rpx;
+					color: #333333;
+				}
+				.person{
+					flex-wrap: wrap;
+					.item{
+					width: 16.66%;
+						
+					}
+					image{
+						width: 78rpx;
+						height: 78rpx;
+						border-radius: 38rpx;
+						background-color: #01508B;
+					}
+				}
+			}
+
+			.btn {
+				margin-top: 30rpx;
+
+				view {
+					width: 300rpx;
+					height: 64rpx;
+					border-radius: 8rpx;
+					font-size: 28rpx;
+					text-align: center;
+					line-height: 64rpx;
+				}
+
+				.entrust {
+					background: #FFFFFF;
+					border: 2rpx solid #01508B;
+					box-sizing: border-box;
+					color: #01508B;
+				}
+
+				.handle {
+					background: #01508B;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/meeting/index.vue b/pages/meeting/index.vue
new file mode 100644
index 0000000..3689a61
--- /dev/null
+++ b/pages/meeting/index.vue
@@ -0,0 +1,247 @@
+<template>
+	<view :class="{'gray':store.isgray==1}">
+		<customNav>
+			<view class="nav_box f-row aic jcb">
+				<view class="back f-row aic" @click="back">
+					<uni-icons type="left" size="20" color="#fff"></uni-icons>
+				</view>
+				<view class="search f-row aic">
+					<input type="text" v-model="searchKey" @confirm="search" @blur="showicon=true&&!searchKey"
+						@focus="showicon=false" />
+					<view class="f-row aic" v-if="showicon">
+						<image src="../../static/search.png" mode=""></image>
+						<text>搜索</text>
+					</view>
+				</view>
+			</view>
+		</customNav>
+		<view class="list_box">
+			<view class="list" v-for="item,i in 3" :key="i" @click="jump(`/pages/meeting/detail?id=1`)">
+				<view class="title f-row aic jcb">
+					<view class="">
+						年度部门讨论会议
+					</view>
+					<text>1分钟前</text>
+				</view>
+				<view class="info">
+					<view class="f-row aic jcb">
+						<view class="">
+							发起人：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议日期：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议地点：
+						</view>
+						<text>周如意</text>
+					</view>
+					<view class="f-row aic jcb">
+						<view class="">
+							会议内容：
+						</view>
+						<text>周如意</text>
+					</view>
+				</view>
+				<!-- <view class="btn f-row aic jcb">
+					<view class="entrust">
+						拒绝
+					</view>
+					<view class="handle">
+						同意
+					</view>
+				</view> -->
+				<view class="handled f-row">
+					<view class="refused">
+						已拒绝
+					</view>
+					<!-- <view class="agreed">
+						已同意
+					</view> -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue';
+	import {
+		useStore
+	} from '@/store'
+	const store = useStore()
+	import {
+		huiyilistApi
+	} from '@/api/api.js';
+	import customNav from '../../bpm/customNav.vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		beforeJump
+	} from '@/utils/index.js';
+	const showicon = ref(true)
+	const searchKey = ref('')
+	onLoad(() => {
+		// huiyilist()
+	})
+	const huiyilist = () => {
+		huiyilistApi().then((res) => {
+			if (res.success) {
+
+			}
+		}).catch((err) => {
+			console.log(err);
+		})
+	}
+	const jump = (url) => {
+		beforeJump(url, () => {
+			uni.navigateTo({
+				url
+			})
+		})
+	}
+	const back = () => {
+		uni.navigateBack()
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav_box {
+		position: absolute;
+		bottom: 14rpx;
+		width: 100%;
+		left: 0;
+	}
+
+	.back {
+		padding: 0 30rpx;
+	}
+
+	.search {
+		position: relative;
+		padding-right: 30rpx;
+		flex: 1;
+
+		view {
+			position: absolute;
+			left: 28rpx;
+			top: 50%;
+			transform: translateY(-50%);
+
+			font-size: 28rpx;
+			color: #999999;
+
+		}
+
+		input {
+			flex: 1;
+			height: 72rpx;
+			background: #F8F8F8;
+			border-radius: 44rpx;
+			padding: 0 28rpx;
+		}
+
+		image {
+			width: 34rpx;
+			height: 34rpx;
+			margin-right: 16rpx;
+		}
+	}
+
+	.list_box {
+		padding: 14rpx 30rpx 0 30rpx;
+		margin-top: 24rpx;
+
+		.list {
+			background: #FFFFFF;
+			box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
+			border-radius: 16rpx;
+			padding: 30rpx;
+			margin-bottom: 30rpx;
+
+			.title {
+				border-bottom: 1px solid #efefef;
+				padding-bottom: 24rpx;
+				margin-bottom: 8rpx;
+
+				view {
+					font-size: 28rpx;
+					color: #333333;
+				}
+
+				text {
+					font-size: 28rpx;
+					color: #999999;
+				}
+			}
+
+			.info {
+				font-size: 28rpx;
+				color: #666666;
+
+				view {
+					padding-top: 16rpx;
+				}
+			}
+
+			.btn {
+				margin-top: 30rpx;
+
+				view {
+					width: 300rpx;
+					height: 64rpx;
+					border-radius: 8rpx;
+					font-size: 28rpx;
+					text-align: center;
+					line-height: 64rpx;
+				}
+
+				.entrust {
+					background: #FFFFFF;
+					border: 2rpx solid #01508B;
+					box-sizing: border-box;
+					color: #01508B;
+				}
+
+				.handle {
+					background: #01508B;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+
+	.refused {
+
+		color: #333333;
+	}
+
+	.agreed {
+
+		color: #01508B;
+	}
+
+	.handled {
+		justify-content: flex-end;
+		margin-top: 30rpx;
+
+		view {
+			width: 150rpx;
+			height: 64rpx;
+			background: #EFEFEF;
+			border-radius: 8rpx;
+			text-align: center;
+			line-height: 64rpx;
+			font-size: 28rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tab/index.vue b/pages/tab/index.vue
index 068ee11..a6fdff6 100644
--- a/pages/tab/index.vue
+++ b/pages/tab/index.vue
@@ -37,7 +37,7 @@
 			<view class="onduty">
 				<view class="title f-row aic jcb">
 					值班信息
-					<view class="more" @click="jump(`/pages/zhiban/index`)">
+					<view class="more" @click="jump(`/pages/views/zhongheguanli/zhiban/index`)">
 						查看更多
 						<image src="../../static/index/back.png" mode=""></image>
 					</view>