1

a/code.vue

@@ -12,13 +12,13 @@
 		<view class="ytbox" >
 			<view class="code_box">
 				<!-- 预约成功 -->
-				<view class="cdet" v-if="datainfo.visitType==3">
+				<!-- <view class="cdet" v-if="datainfo.visitType==3">
 					<view class="ctit">通行路线</view>
 					<view class="adrtip">
 						您好，请您于【<text>园区大门</text>】扫脸进入，通过【<text>1号 楼</text>
 						】的【<text>2号电梯</text>】直达【<text>5F</text>】
 					</view>
-				</view>
+				</view> -->
 				<!-- 预约失败 -->
 				<view class="cdet">
 					<view class="ctit">预约信息</view>
@@ -129,8 +129,8 @@
 		}
 	},
 	onLoad: function(e) {
-		// this.id=base64.decode(e.id);
-		this.id=e.id;
+		this.id=base64.decode(e.id);
+		// this.id=e.id;
 		this.init()
 		this.getDataFn()
 	},

components/order/list.vue

@@ -2,7 +2,7 @@
   <view>
 	<view v-if="datalist.length>0">
 		<!-- 预约 -->
-		<block v-if="type=='order'">
+		<block v-if="type=='order'||type=='search'">
 			<view class="ylist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.reservatId)">
 				<image :src="ysta" class="ystaimg" v-if="ite.visitType==3"></image>
 				<image :src="ystb" class="ystaimg" v-if="ite.visitType==2"></image>
@@ -26,12 +26,12 @@
 					<view class="yblist mw50"><text>来访地点</text>{{kaType(ite.appointmentSite,adrlist)}}</view>
 					<view class="yblist mw50"><text>来访事由</text>{{ite.visitReason}}</view>
 				</view>
-				<view class="ybtn">
-					<view class="ybtns btn1" @click.stop="getDelFn(ite.reservatId)">删除</view>
+				<view class="ybtn" v-if="type=='order'">
+					<view class="ybtns btn1" v-if="checkPermi(['system:reservat:remove'])" @click.stop="getDelFn(ite.reservatId)">删除</view>
 					<view class="flex1"></view>
-					<block v-if="ite.visitType==1">
-						<view class="ybtns btn2" @click.stop="gettypeFn(2,ite.reservatId)">拒绝</view>
-						<view class="ybtns btn3" @click.stop="gettypeFn(3,ite.reservatId)">同意</view>
+					<block v-if="ite.visitType==1&&checkPermi(['system:reservat:sh'])">
+						<view class="ybtns btn2"  @click.stop="gettypeFn(2,ite.reservatId)">拒绝</view>
+						<view class="ybtns btn3"  @click.stop="gettypeFn(3,ite.reservatId)">同意</view>
 					</block>
 					
 				</view>
@@ -98,6 +98,7 @@
 </template>
 
 <script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { selectDictValue } from '@/utils/common.js';
 	import noData from "@/components/nodata/nodata.vue"
   export default {
@@ -146,6 +147,7 @@
 	onLoad: function() {
 	},
 	methods:{
+		checkPermi, checkRole,
 		kaType(data, list) {
 			return selectDictValue(list, data);
 		},

components/wait/list.vue

@@ -17,7 +17,7 @@
 					<view class="time">{{ite.createTime}}</view>
 				</view>
 				<view class="ctxt">
-					<view>{{ite.noticeContent}}</view>
+					<!-- <view>{{ite.noticeContent}}</view> -->
 					<view class="tzhu">{{ite.noticeTitle}}</view>
 				</view>
 			</view>

config.js

@@ -1,7 +1,8 @@
 // 应用全局配置
 module.exports = {
-  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'https://zxyyq.qs163.cn/prod-api',
+  
+  baseUrl: 'https://zxyyq.qs163.cn/prod-api',
+  // baseUrl: 'http://47.99.82.249:5010/prod-api',
   // baseUrl: 'http://192.168.101.168:8065',
   // baseUrl: 'http://192.168.101.245:8065',
   // baseUrlimg: 'http://114.99.127.243:2001',

pages.json

@@ -106,6 +106,15 @@
 	 		}
 	 	}
 	 },
+	 {
+	   "path": "pages/order/search",
+	   "style": {
+	     "navigationBarTitleText": "预约查询",
+	 		"h5":{
+	 			"titleNView":false
+	 		}
+	 	}
+	 },
 	{
 	  "path": "pages/agreement",
 	  "style": {

pages/index/index.vue

@@ -272,7 +272,7 @@
 		this.init()
 		this.getNoticeList()
 		this.getcount()
-		
+		this.getWeeksDay()
 		uni.getSystemInfo({
 			success: (e) => {
 				this.stubarHeight=Number(e.statusBarHeight);
@@ -288,7 +288,7 @@
 	onShow() {
 		var that=this;
 		this.time();
-		this.getWeeksDay()
+		
 		// #ifndef H5
 		self.getLocation(function(res){
 			if(res==-1){
@@ -331,7 +331,7 @@
 			}).exec();
 		},
 		getNoticeDet(e){
-			// this.$tab.navigateTo("/pages/index/noticedetail?type=xttz&id="+e)
+			this.$tab.navigateTo("/pages/index/noticedetail?id="+e)
 		},
 		getNoticeFn(e){
 			this.$tab.navigateTo("/pages/index/notice")
@@ -381,7 +381,10 @@
 		},
 		// 打卡记录
 		getmMoreFn(){
-			this.$tab.navigateTo("/pages/order/list")
+			this.$tab.navigateTo("/work/pages/yyorder/eatlist")
+		},
+		getmClockFn(){
+			this.$tab.navigateTo("/work/pages/record/clockin")
 		},
 		getDelFn(id){
 			var that=this;
@@ -493,7 +496,7 @@
 				visitType:1
 			}
 			
-			if(!checkRole(['manager'])){
+			if(!checkRole(['administrators'])){
 				// 个人
 				params.userId=this.userId;
 				params.startTime=this.startDate;

pages/mine/index.vue

@@ -10,7 +10,7 @@
 			<view class="infobox flexc" @click="handleToInfo">
 				<view class="cbox">
 					<view class="tit">{{name?name:'登录账号'}}</view>
-					<view class="txt">点击登录 享受更多精彩信息</view>
+					<view class="txt">点击详情 享受更多精彩信息</view>
 					<!-- <view class="flexc pr" v-if="deptName">
 						<image :src="headl"></image>
 							<view class="txt">{{deptName}}点击登录 享受更多精彩信息</view>
@@ -24,12 +24,12 @@
 				<image  @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image>
 			</view>
 			<view class="conts flexc">
-				<view class="contn" v-if="checkPermi(['system:reservat:sh'])" @click="handleToYy">
+				<!-- <view class="contn" v-if="checkPermi(['system:reservat:sh'])" @click="handleToYy">
 					<view class="img">
 						<image :src="listimga" class="imga"></image>
 					</view>
 					<view class="ctit">待我审批</view>
-				</view>
+				</view> -->
 				<view class="contn" v-if="checkPermi(['system:reservat:list'])" @click="handleToYy">
 					<view class="img">
 						<image :src="listimgb" class="imgb"></image>
@@ -48,14 +48,14 @@
 					<view class="limg">
 						<image :src="listimgd" class="imga"></image>
 					</view>
-					<view class="tit flex1">我的会议预约</view>
+					<view class="tit flex1">会议预约</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
 				<view class="flexc mine_list" @click="handleToMyjc" v-if="checkPermi(['system:food:list'])">
 					<view class="limg">
 						<image :src="listimge" class="imgb"></image>
 					</view>
-					<view class="tit flex1">我的订餐记录</view>
+					<view class="tit flex1">订餐记录</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
 				<!-- <view class="flexc mine_list" v-if="checkPermi(['system:reservat:add'])" @click="handleToAddYy" >

pages/order/info.vue

@@ -44,7 +44,7 @@
 		newcode:'',//验证码1419
 		user:{},
 		list:[],
-		type:'1',
+		type:'order',
 		pageSize: 10,
 		pageNum: 1,
 		reachflag: true,

pages/order/search.vue

@@ -35,12 +35,12 @@
       return {
 		timefalg:false,
 		time:'',
-		phonenumber:'17856919066',
+		phonenumber:'',
 		code:'',
 		newcode:'',//验证码1419
 		user:{},
 		list:[],
-		type:'1',
+		type:'search',
 		pageSize: 10,
 		pageNum: 1,
 		reachflag: true,
@@ -128,7 +128,7 @@
 						var len=list.length;
 						if(len==1&&!this.backflag&&this.pageNum==1){
 							var id=list[0].reservatId
-							this.$tab.navigateTo('/pages/order/comedetail?id='+base64.encode(id))
+							this.$tab.navigateTo('/a/code?id='+base64.encode(id))
 						}else{
 							if (res.rows.length < this.pageSize) {
 								this.reachflag = false
@@ -162,13 +162,11 @@
 		this.reachflag=false;
 		this.pageNum=1;
 		this.list=[];
-		this.getDataFn()
-		return
 		if (!this.phonenumber ) {
 			that.$toast("请输入手机号")
 			return
 		}
-		if (!this.code ) {
+		if (!this.code) {
 			that.$toast("请输入验证码")
 			return
 		}

pages/order/staffcode.vue

@@ -14,13 +14,13 @@
 			<image :src="ystb" class="ystaimg" v-if="datainfo.visitType==2"></image>
 			<view class="code_box">
 				<!-- 预约成功 -->
-				<view class="cdet" v-if="datainfo.visitType==3">
+				<!-- <view class="cdet" v-if="datainfo.visitType==3">
 					<view class="ctit">通行路线</view>
 					<view class="adrtip">
 						您好，请您于【<text>园区大门</text>】扫脸进入，通过【<text>1号 楼</text>
 						】的【<text>2号电梯</text>】直达【<text>5F</text>】
 					</view>
-				</view>
+				</view> -->
 				<!-- 预约失败 -->
 				<view class="cdet">
 					<view class="ctit">预约信息</view>
@@ -83,8 +83,8 @@
 				</view> 
 			</view>
 			<view class="ybtn" >
-				<view class="ybtns btn1 flex1" @click="getFail">删除</view>
-				<block v-if="datainfo.visitType==1">
+				<view class="ybtns btn1 flex1" v-if="checkPermi(['system:reservat:remove'])" @click="getFail">删除</view>
+				<block v-if="datainfo.visitType==1&&checkPermi(['system:reservat:sh'])">
 					<view class="ybtns btn2 flex1" @click="gettypeFn(2)" >拒绝</view>
 					<view class="ybtns btn3 flex1" @click="gettypeFn(3)">同意</view>
 				</block>
@@ -107,6 +107,7 @@
 	import {getReservatDetail,getReservatDel,getReservatSh} from "@/api/mine/order.js"
 	import { selectDictValue } from '@/utils/common.js';
 	import {getDictionaryFn} from "@/api/mine/register.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import QR from "@/utils/wxqrcode.js" // 二维码生成器 
 	import config from '@/config'
 	const baseUrlimg = config.baseUrlimg
@@ -144,6 +145,7 @@
 		this.getDataFn()
 	},
 	methods:{
+		checkPermi, checkRole,
 		getClose(){
 			this.type=0;
 		},

pages/video/index.vue

@@ -36,11 +36,11 @@
 				</view> -->
 			</view>
 			<view class="openbox flexcj">
-				<view class="btns bga" @click="getOpenFn">
+				<view class="btns bga" @click="getOpenFn" v-if="checkPermi(['system:camera:openDz'])">
 					<image :src="openimg"></image>
 					开门
 				</view>
-				<view class="btns bgb" @click="getCloseFn">
+				<view class="btns bgb" @click="getCloseFn" v-if="checkPermi(['system:camera:closeDz'])">
 					<image :src="openimg"></image>
 					关门
 				</view>
@@ -165,7 +165,9 @@
 			 this.getDataFn();
 		})
 		this.time()
-		this.init()
+		if(checkPermi(['system:camera:list'])){
+			this.getCameraList()
+		}
 		// this.getDataFn()
 		uni.getSystemInfo({
 			success: (e) => {
@@ -371,7 +373,7 @@
 				this.tabtop=Number(top)-Number(this.nvaHeight)
 			}).exec();
 		},
-		init(){
+		getCameraList(){
 			// 设备
 			var params={
 				pageSize:1000,
@@ -384,12 +386,17 @@
 						this.adrlist =data.list;
 						this.address=data.list[0].name;
 						this.indexCode=data.list[0].indexCode;
-						this.getCameraVideo()
+						if(checkPermi(['system:camera:video'])){
+							this.getCameraVideo()
+						}
+						
 					}
 				}else{
 					this.$toast(res.msg)
 				}
 			}) 
+		},
+		init(){
 			// 门卫
 			// getDictionaryFn('is_read').then(res=>{
 			// 	if(res.code==200){

work/components/yuyue/list.vue

@@ -27,7 +27,7 @@
 					<view class="yblist mw50"><text>来访事由</text>{{ite.visitReason}}</view>
 				</view>
 				<view class="ybtn">
-					<view class="ybtns btn1" @click.stop="getDelFn(ite.reservatId)">删除</view>
+					<view class="ybtns btn1" v-if="checkPermi(['system:reservat:remove'])" @click.stop="getDelFn(ite.reservatId)">删除</view>
 					<view class="flex1"></view>
 					<block v-if="ite.visitType==1&&checkPermi(['system:reservat:sh'])">
 						<view class="ybtns btn2" @click.stop="gettypeFn(2,ite.reservatId)">拒绝</view>
@@ -53,7 +53,7 @@
 					<view class="yblist mw50"><text>记录来源</text>{{kaType(ite.recordSource,adrlist)}}</view>
 				</view>
 				<view class="ybtn">
-					<view class="ybtns btn1"  @click.stop="getDelFn(ite.recordId)">删除</view>
+					<view class="ybtns btn1" v-if="checkPermi(['system:record:remove'])"  @click.stop="getDelFn(ite.recordId)">删除</view>
 				</view>
 			</view>
 		</block>
@@ -73,7 +73,7 @@
 					<view class="yblist mw50"><text>状态</text>{{ite.isEnable=='0'?'启用':'禁用'}}</view>
 				</view>
 				<view class="ybtn">
-					<view class="ybtns btn1"  @click.stop="getDelFn(ite.personneId)">删除</view>
+					<view class="ybtns btn1" v-if="checkPermi(['system:management:remove'])"  @click.stop="getDelFn(ite.personneId)">删除</view>
 				</view>
 			</view>
 		</block>

work/pages/record/clockin.vue

@@ -13,21 +13,20 @@
 				<view class="lbtab flexc">
 					<image :src="licoimg" class="limg"  @click='getResetFn'></image>
 					<view class="lbtabs flexc">
-						<picker class="pickbox" range-key='dictLabel' 	:range="adrlist" @change="bindTimeChangea">
+						<!-- <picker class="pickbox" range-key='dictLabel' 	:range="adrlist" @change="bindTimeChangea">
 							<view class="pickboxa">
 								<view class="tit overtwo" >{{deptName||'全部部门'}}</view>
 								<image :src="wupimg" class="hupimg"></image>
 							</view>
-						</picker>
+						</picker> -->
 						<picker mode="date" class="pickbox"  
 							 @change="bindTimeChangea">
 							<view class="pickboxa">
-								<view class="tit" >{{time||'2024年07月'}}</view>
+								<view class="tit" >{{time||'选择时间'}}</view>
 								<image :src="wupimg" class="hupimg"></image>
 							</view>
 						</picker>
 					</view>
-					<!-- <view class="czbtns">重置</view> -->
 				</view>
 			</view>
 			
@@ -113,10 +112,21 @@
 				this.reachflag=true;
 				this.getDataFn()
 			},
+			getResetFn(){
+				this.time='';
+				this.title='';
+				this.getConfirm()
+			},
 			getBack() {
 				uni.navigateBack({
 					delta: 1
 				})
+			},
+			gettypeFn(){
+				
+			},
+			getDelFn(){
+				
 			},
 			getDetail(ite){
 				var obj={
@@ -127,7 +137,8 @@
 			},
 			bindTimeChangea(e){
 				var val=e.detail.value;
-				this.day=val
+				this.time=val
+				this.getConfirm()
 			},
 			getHeightFn() {
 				let query = uni.createSelectorQuery().in(this);
@@ -164,9 +175,15 @@
 					pageSize: this.pageSize,
 					pageNum: this.pageNum,
 				}
-				if(!checkRole(['manager'])){
+				if(!checkRole(['administrators'])){
 					params.userId=this.userId
 				}
+				if(this.time){
+					params.recordTime=this.time
+				}
+				if(this.title){
+					params.userName=this.title
+				}
 				getClockList(params).then(res => {
 					if (res.code == 200) {
 						if (res.rows.length < this.pageSize) {
@@ -210,12 +227,12 @@
 .search{padding: 0 52rpx;box-sizing: border-box;
 	width: 100%;height: 76rpx;background: rgba(40, 139, 214, 0.5);border-radius: 38rpx;
 	image{width: 24rpx;height: 24rpx;margin-right: 22rpx;flex: 0 0 auto;}
-	input{flex: 1;font-weight: 500;font-size: 22rpx;color: #131313;}
+	input{flex: 1;font-weight: 500;font-size: 22rpx;color: #FFFFFF;}
 }
 .lbtab{padding: 0 56rpx;
 	.limg{width: 24rpx;height: 24rpx;margin-right: 16rpx;flex:0 0 auto;}
 	.lbtabs{overflow: auto;flex-wrap: nowrap;flex:1;
-		.pickbox{flex: 1;text-align: right;font-weight: 500;font-size: 28rpx;color: #161616;min-height:88rpx;margin: 0 10rpx;
+		.pickbox{text-align: right;font-weight: 500;font-size: 28rpx;color: #161616;min-height:88rpx;margin: 0 10rpx;
 			.pickboxa{justify-content: center;	
 				min-height: 88rpx;display: flex;align-items: center;	
 			}

work/pages/yyorder/eat.vue

@@ -140,6 +140,7 @@
 				var aite=selectValueKey(list, ite);
 				if(type=='jclx'){
 					this.jclxidx=aite.key
+					this.jclx=aite.actions
 				}
 				return aite.actions;
 			},

work/pages/yyorder/eatlist.vue

@@ -20,7 +20,7 @@
 							</view>
 						</picker>
 					</view>
-					<view @click="getDetailDay" class="daybtn flexc">
+					<view @click="getDetailDay" v-if="!checkRole(['administrators'])" class="daybtn flexc">
 						<image :src="dayimg"></image>
 						预约记录</view>
 				</view>
@@ -188,7 +188,9 @@
 				var params = {
 					pageSize: this.pageSize,
 					pageNum: this.pageNum,
-					userId:this.userId
+				}
+				if(!checkRole(['administrators'])){
+					params.orderFoodUserId=this.userId
 				}
 				if(this.jclx){
 					params.orderFoodType=this.orderFoodType

work/pages/yyorder/eatlistday.vue

@@ -202,7 +202,7 @@
 				var params = {
 					orderFoodTime: time,
 				}
-				params.userId=this.userId;
+				params.orderFoodUserId=this.userId;
 				getFoodRiLi(params).then(res => {
 					if (res.code == 200) {
 						this.signList=res.data;

work/pages/yyorder/meeting.vue

@@ -32,17 +32,20 @@
 								</uni-datetime-picker>
 							</uni-forms-item>
 							<uni-forms-item label="会议室"  name="appointmentSite">
-								<w-select
-								      :list='hyslist'
-									  v-model="chooseValue"
-								      valueName='conferenceRoomName' 
-								      keyName="conferenceRoomId"
-									  :filterable='filterable'
-									  width='100%'
-									  height="36px"
-									  @change='getchangeb'
-								    >
-								    </w-select>
+								<view class="flex1">
+									<w-select
+									      :list='hyslist'
+										  v-model="chooseValue"
+									      valueName='conferenceRoomName' 
+									      keyName="conferenceRoomId"
+										  :filterable='filterable'
+										  width='100%'
+										  height="36px"
+										  @change='getchangeb'
+									    >
+									    </w-select>
+								</view>
+								
 								<!-- <picker  class="pickbox" range-key='dictLabel' :value="hysidx"
 									:range="hyslist" @change="bindTimeChangea">
 									<view class="flexc flex1">
@@ -60,6 +63,7 @@
 							</uni-forms-item>
 							<uni-forms-item label="参会人数"   name="conferenceNumber">
 								<uni-easyinput :inputBorder="false"  v-model="datainfo.conferenceNumber"
+								type="number"
 									placeholder="输入参会人数">
 								</uni-easyinput>
 							</uni-forms-item>

work/pages/yyorder/meetlist.vue

@@ -198,7 +198,9 @@
 				var params = {
 					pageSize: this.pageSize,
 					pageNum: this.pageNum,
-					userId:this.userId
+				}
+				if(!checkRole(['administrators'])){
+					params.orderUserId=this.userId
 				}
 				if(this.adrname){
 					params.conferenceRoomId=this.conferenceRoomId
@@ -246,7 +248,7 @@
 .search{padding: 0 52rpx;box-sizing: border-box;
 	width: 100%;height: 76rpx;background: rgba(40, 139, 214, 0.5);border-radius: 38rpx;
 	image{width: 24rpx;height: 24rpx;margin-right: 22rpx;flex: 0 0 auto;}
-	input{flex: 1;font-weight: 500;font-size: 22rpx;color: #131313;}
+	input{flex: 1;font-weight: 500;font-size: 22rpx;color: #FFFFFF;}
 }
 .lbtab{padding-left:18rpx;
 	.limg{width: 24rpx;height: 24rpx;margin-right: 16rpx;flex:0 0 auto;}