1

api/mine/meeting.js

@@ -108,6 +108,14 @@ export function getupdateReplyFn(data) {
 	'data':data
   })
 }
+//会议活动-签到zxConference:conference:signIn
+export function getsignInFn(data) {
+  return request({
+    'url': '/zxConference/conference/signIn',
+    'method': 'post',
+	'data':data
+  })
+}
 
 
 // 政协活动-列表 zxActivity:activity:list

pages/notice/index.vue

@@ -49,7 +49,7 @@
 				pageNum: this.pageNum,
 				// visitType:3
 			}
-			// params.userId=this.userId
+			params.userId=this.userId
 			getMeetListFn(params).then(res=>{
 				if(res.code==200){
 					if (res.rows.length < this.pageSize) {

work/components/meeting/list.vue

@@ -39,8 +39,8 @@
 							<view class="lftit">是否成参会暂未答复</view>
 							<view class="btn btn2"  @click.stop="getTuiFn(ite,'chdf')">参会答复</view>
 						</block>
-						<view v-if="ite.isJoin=='Y'&&!ite.signIn" class="btn btn2" @click.stop="getTuiFn(ite,'hyhd')">去签到</view>
-						<view class="btn btn3" v-if="ite.signIn" @click.stop="">已签到</view>	
+						<view v-if="ite.isJoin=='Y'&&!ite.zxConferenceUserList[0]" class="btn btn2" @click.stop="getTuiFn(ite,'hyqd')">去签到</view>
+						<view class="btn btn3" v-if="ite.zxConferenceUserList[0].signIn" @click.stop="">已签到</view>	
 							<!-- <view class="lftit">当前会议已结束，查看<text class="lfdet">签到情况</text></view> -->	
 					</view>
 				</block>
@@ -253,7 +253,7 @@
 			var type=this.type;
 			if(type=='hyhd'||type=='hytz'){
 				id=e.conferenceId
-			}else if(type=='wdfy'){
+			}else if(type=='wdfy'||type=='hyfy'){
 				id=e.speakId
 			}else if(type=='hdtz'){
 				id=e.activityId

work/pages/case/details.vue

@@ -176,6 +176,8 @@
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import popUp from "@/work/components/popup/popup.vue"
 	import noData from "@/components/nodata/nodata.vue"

work/pages/meeting/activedetails.vue

@@ -55,6 +55,8 @@
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import popUp from "@/work/components/popup/popup.vue"
 	import noData from "@/components/nodata/nodata.vue"

work/pages/meeting/details.vue

@@ -46,15 +46,22 @@
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['zxConference:conference:edit'])">修改</view>
 				<view class="btn btn3" @click="getDelFn" v-if="checkPermi(['zxConference:conference:remove'])">删除</view>
-				<view class="btn btn2" @click="getScfkFn('chdf')" v-if="checkPermi(['zxConference:conference:updateReply'])">会议答复</view>
+				<block v-if="type=='hytz'&&checkPermi(['zxConference:conference:updateReply'])">
+					<view class="btn btn2" @click="getScfkFn('chdf')" v-if="!dfinfo.isJoin">会议答复</view>
+					<view class="btn btn2" @click="getqdFn" v-if="dfinfo.isJoin&&!dfinfo.signIn">签到</view>
+				</block>
+				
+				<view class="btn btn2" @click="getScfkFn('chdf')" v-if="checkPermi(['zxConference:conference:updateReply'])&&type=='hyhd'">会议答复</view>
 			</view>
 			
 		</view>
-		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :qjlxlist="qjlxlist"  @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import popUp from "@/work/components/popup/popup.vue"
 	import noData from "@/components/nodata/nodata.vue"
@@ -76,7 +83,11 @@
 				zheList:[{val:0,zheflag:true,moreflag:true},],
 				ptype:'',
 				datainfo:{},
-				tary:''
+				tary:'',
+				qjlxlist:[],
+				type:'',
+				userId:this.$store.state.user.userId,
+				dfinfo:{}
 			}
 		},
 		onUnload(){
@@ -84,6 +95,7 @@
 		},
 		onLoad(e) {
 			this.id=e.id;
+			this.type=e.pt;
 			this.getDetail()
 			this.init()
 			uni.$on('refreshdetail', (e) => {
@@ -114,8 +126,21 @@
 			typeFormattext(ite,list){
 				return selectValuetext(list, ite);
 			},
+			getqdFn(){
+				this.$tab.navigateTo('/work/pages/meeting/signin?id='+this.id)
+			},
 			init(){
-
+				// 请假类型
+				getDictionaryFn('leave').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.qjlxlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getupSubmit(e){
 				var that=this;
@@ -176,9 +201,15 @@
 				var params={
 					conferenceId:this.id
 				}
+				if(this.type=='hytz'){
+					params.userId=this.userId
+				}
 				getMeetDetaiFn(params).then(res=>{
 					if(res.code==200){
 						this.datainfo=res.data;
+						if(res.data.zxConferenceUserList){
+							this.dfinfo=res.data.zxConferenceUserList[0]
+						}
 						if(res.data.zxFjList&&res.data.zxFjList.length){
 							this.filelist=JSON.parse(JSON.stringify(res.data.zxFjList))
 						}

work/pages/meeting/list.vue

@@ -224,8 +224,8 @@
 			getDetail(data){
 				var type=this.tabidx;
 				if(type=='hyhd'||type=='hytz'){
-					this.$tab.navigateTo('/work/pages/meeting/details?id='+data)	
-				}else if(type=='wdfy'){
+					this.$tab.navigateTo('/work/pages/meeting/details?id='+data+"&pt="+type)	
+				}else if(type=='wdfy'||type=='hyfy'){
 					this.$tab.navigateTo('/work/pages/meeting/speakdetails?id='+data)	
 				}else if(type=='hdtz'){
 					this.$tab.navigateTo('/work/pages/meeting/activedetails?id='+data)	

work/pages/meeting/signin.vue

@@ -12,7 +12,7 @@
 			</view>
 			<view class="ftxt">
 				<text>备注信息</text>
-				<view>{{datainfo.remerk}}</view>
+				<view>{{datainfo.remark}}</view>
 			</view>
 		</view>
 		<view class="mtop madr">
@@ -22,24 +22,24 @@
 				<view>安徽省合肥市蜀山区高薪技术产业开发区黄山路59号 时代数码港</view>
 			</view> -->
 			<view class="madrb" @click="getCodeFn">
-				<view class="time">14:47:16</view>
+				<view class="time">{{kaTime}}</view>
 				<view class="mqian">扫码签到</view>
 			</view>
 			<view class="tips flexcc">
 				<!-- <image :src="choseimg"></image> -->
 				<view>会议即将开始，请尽快签到哦</view>
 			</view>
-			<view class="madrc">
-				<!-- 步骤条 -->
+			<!-- <view class="madrc">
+				
 				<meet-step></meet-step>
-			</view>
+			</view> -->
 				
 		</view>
 	</view>
 </template>
 
 <script>
-	import {getMeetDetaiFn,getMeetPeoListFn,getupdateReplyFn} from "@/api/mine/meeting.js"
+	import {getMeetDetaiFn,getsignInFn} from "@/api/mine/meeting.js"
 	import meetStep from "@/work/components/meeting/step.vue"
 	export default{
 		components:{meetStep},
@@ -50,13 +50,48 @@
 				recordList:[{tit:'123'}],
 				datainfo:{},
 				userId:this.$store.state.user.userId,
+				kaTime:''
 			}
 		},
 		onLoad(e) {
 			this.id=e.id;
 			this.getDataFn();
+			this.gettimeFn();
 		},
 		methods:{
+			gettimeFn() {
+				var that = this;
+				clearInterval(this.timefn)
+				that.time();
+				that.timefn = setInterval(function() {
+					that.time();
+				}, 1000);
+			},
+			time() {
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var week = date.getDay(); //获取当前星期X(0-6,0代表星期天)
+				var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+				var yearStr = y + '/' + (m < 10 ? ('0' + m) : m) + '/' + (d < 10 ? ('0' + d) : d)
+				var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? ('0' + s) : s);
+				// var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min);
+				this.kaTime =timeStr;
+				// if(this.endTime&&this.type==0&&!this.pwdflag){
+				// 	var endt=new Date(this.endTime).getTime()
+				// 	var nowt=date.getTime()
+				// 	if(nowt>endt){
+				// 		this.type=1
+				// 		this.videotype=1;
+				// 	}else{
+				// 		this.videotype=0;
+				// 	}
+				// }
+			},
 			getDataFn(){
 				var params={
 					conferenceId:this.id,
@@ -65,10 +100,6 @@
 				getMeetDetaiFn(params).then(res=>{
 					this.datainfo=res.data;
 				})
-				// 人员签到信息
-				// getMeetPeoListFn(params).then(res=>{
-					
-				// })
 			},
 			getCodeFn(){
 				var that = this;
@@ -95,16 +126,22 @@
 						var id = red.result
 						var params = {
 							conferenceId: id,
-							userId:this.userId
+							userId:that.userId,	
 						}
-						getupdateReplyFn(params).then(res => {
+						getsignInFn(params).then(res => {
 							if (res.code == 200) {
 								if(res.msg=='核销失败'){
 									that.$toast(res.msg)
 									// that.$tab.navigateTo('/pages/order/stafffail')
 								}else{
 									that.$toast('签到成功')
-									that.getDataFn()
+									setTimeout(function(){
+										uni.$emit('refreshdetail')
+										uni.$emit('refreshlist')
+										uni.navigateBack({
+											delta:1
+										})
+									},1200)
 								}
 								
 							} else {

work/pages/meeting/speakdetails.vue

@@ -49,6 +49,8 @@
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import popUp from "@/work/components/popup/popup.vue"
 	import noData from "@/components/nodata/nodata.vue"

work/pages/sqmyInfo/details.vue

@@ -198,6 +198,8 @@
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import popUp from "@/work/components/popup/popup.vue"
 	import noData from "@/components/nodata/nodata.vue"
@@ -477,6 +479,27 @@
 					}
 				})
 			},
+			getDown(e){
+					  uni.showLoading({
+					  	title: '加载中'
+					  });
+				var url=baseUrl+e;
+				uni.downloadFile({
+					url: url,//文件的下载路径
+					success(result) {
+							uni.hideLoading()
+						var filePath = result.tempFilePath;
+						   uni.openDocument({
+						     filePath: filePath,
+						     showMenu: true,
+						     success: function (res) {
+						       // console.log('打开文档成功');
+						     }
+						   });
+					},
+					fail(res) {uni.hideLoading()}
+				})
+			},
 		}
 	}
 </script>