测试问题修改

config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'https://lyyy.qs163.cn/prod-api',
-  baseUrl: 'http://192.168.101.168:8055',
+  baseUrl: 'https://qszx.qs163.cn/prod-api',
+  // baseUrl: 'http://192.168.101.168:8055',
   // baseUrl: 'http://192.168.101.245:8055',
-  // baseUrlimg: 'http://114.99.127.243:2001',
+  baseUrls: 'https://qszx.qs163.cn',
   Clientid:'428a8310cd442757ae699df5d894f051',//
  // https://xygl.cnzxy.cn h5链接地址
   confirmflag:false,//是否有弹窗

manifest.json

@@ -2,8 +2,8 @@
     "name" : "政协",
     "appid" : "__UNI__FF95F38",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/mine/index.vue

@@ -89,7 +89,7 @@
 					<view class="tit flex1">会议活动</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
+				<!-- <view class="flexc mine_list" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
 					<view class="limg">
 						<image :src="listimgf" class="imgc"></image>
 					</view>
@@ -102,7 +102,7 @@
 					</view>
 					<view class="tit flex1">催办列表</view>
 					<image :src="rimg" class="rimg"></image>
-				</view>
+				</view> -->
 			</view>
 			<view class="mbgbox">
 				<view class="flexc mine_list" @click="handleUpassword">
@@ -469,7 +469,7 @@ page {background-color: #f5f5f5;}
 .zxbox{
 	.bgimg{width: 100%;height: 416rpx;}
 	.mbox{margin-top: -280rpx;padding: 0 24rpx;z-index: 1;position: relative;
-		.infobox{
+		.infobox{margin-bottom: 60rpx;
 			.limg{width: 140rpx;height: 140rpx;flex: 0 0 auto;margin-right: 26rpx;border-radius: 50%;}
 			.cbox{flex: 1;z-index: 1;
 				.tit{font-weight: bold;font-size: 40rpx;color: #ffffff;margin-bottom: 14rpx;}
@@ -477,7 +477,7 @@ page {background-color: #f5f5f5;}
 			}
 			.rimg{width: 12rpx;height: 20rpx;flex: 0 0 auto;margin-left: 20rpx;}
 		}
-		.conts{margin-top: 60rpx;margin-bottom: 24rpx;
+		.conts{margin-bottom: 24rpx;
 			.clist{width: 164rpx;height: 246rpx;background: #FFFFFF;border-radius: 10rpx;padding: 24rpx;box-sizing: border-box;display: flex;flex-direction: column;
 				image{width: 42rpx;height: 42rpx;flex: 0 0 auto;}
 				.num{font-weight: bold;font-size: 48rpx;color: #222327;flex: 1;display: flex;align-items: center;}

work/components/meeting/list.vue

@@ -44,7 +44,7 @@
 							<!-- <view class="lftit">当前会议已结束，查看<text class="lfdet">签到情况</text></view> -->	
 					</view>
 				</block>
-				<block v-if="type=='hdtz'">
+				<block v-if="type=='hdtz'||type=='zxhd'">
 					<view class="ftxt">
 						<text>活动时间</text>
 						<view>{{ite.activityDate}} {{ite.activityTime}}</view>
@@ -68,11 +68,11 @@
 							<rich-text :nodes="ite.activityDetails"></rich-text>
 						</view>
 					</view>
-					<view class="casebtn flexc">
+					<view class="casebtn flexc" v-if="type=='zxhd'">
 						<view class="lfread">未读人数({{ite.noRead}})<text class="lfdet">已读人数({{ite.read}})</text></view>
 						<view class="co1d" v-if="checkPermi(['zxActivity:activity:getUserInfo'])"  @click.stop="getReadFn(ite.activityId)">查看阅读详情</view>
 					</view>
-					<view class="casebtn  flexc" v-if="checkPermi(['zxActivity:activity:updateReply'])">
+					<view class="casebtn  flexc" v-if="checkPermi(['zxActivity:activity:updateReply'])&&type=='hdtz'">
 						<block v-if="ite.isJoin">
 							<view class="lftit">是否参会已答复，查看<text class="lfdet" @click.stop="getDfFn(ite)">答复内容</text></view>
 							<view class="btn btn3" @click.stop="">已答复</view>
@@ -255,7 +255,7 @@
 				id=e.conferenceId
 			}else if(type=='wdfy'||type=='hyfy'){
 				id=e.speakId
-			}else if(type=='hdtz'){
+			}else if(type=='hdtz'||type=='zxhd'){
 				id=e.activityId
 			}
 			this.$emit('getDetail',id)

work/components/popup/popup.vue

@@ -441,7 +441,7 @@
 					></uni-data-select>
 					<view class="ptips">* 若选择否，请务必填写请假事由并提交</view>
 				</view>
-				<view class="mb16">
+				<view class="mb16" v-if="isJoin!='Y'">
 					<!-- @change="change" -->
 					<view class="ttxt mb18"><text class="cof0"></text>请假类型</view>
 					<uni-data-select
@@ -450,7 +450,7 @@
 					  :localdata="qjlxlist"  
 					></uni-data-select>
 				</view>
-				<view class="mb16">
+				<view class="mb16" v-if="isJoin!='Y'">
 					<view class="ttxt mb18"><text class="cof0"></text>请假事由</view>
 					<textarea class="textar " style="height: 186rpx;" @blur="getBlur" v-model="content" placeholder="请输入请假事由" maxlength="1000" ></textarea>
 				</view>
@@ -1081,9 +1081,12 @@
 					}
 					var obj={
 						isJoin:this.isJoin,
-						leaveType:this.qjlxtxt,
-						leaveReason:this.content,
 					}
+					if(this.isJoin!='Y'){
+						obj.leaveType=this.qjlxtxt;
+						obj.leaveReason=this.content;
+					}
+					
 					this.$emit('getupSubmit',obj)
 				}
 				

work/pages/meeting/activedetails.vue

@@ -6,6 +6,7 @@
 			<view class="dbox fmt30">
 				<view class="dtit">{{datainfo.activityTitle}}</view>
 				<view class="titinf">
+					<view class="txt"><text>活动类型</text>{{typeFormat(datainfo.activityType,hdlxlist)}}</view>
 					<view class="txt"><text>活动日期</text>{{datainfo.activityDate}}</view>
 					<view class="txt"><text>活动时间</text>{{datainfo.activityTime}}</view>
 					<view class="txt"><text>活动地点</text>{{datainfo.activityAddress}}</view>
@@ -46,11 +47,11 @@
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<view class="btn btn1" @click="getDelFn" v-if="checkPermi(['zxActivity:activity:remove'])">删除</view>
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['zxActivity:activity:edit'])">修改</view>
-				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['zxActivity:activity:updateReply'])">答复反馈</view>
+				<view class="btn btn2" @click="getScfkFn('chdf')" v-if="checkPermi(['zxActivity:activity:updateReply'])&&type=='hdtz'&&!dfinfo.isJoin">参会答复</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>
 
@@ -78,7 +79,11 @@
 				zheList:[{val:0,zheflag:true,moreflag:true},],
 				ptype:'',
 				datainfo:{},
-				tary:''
+				tary:'',
+				hdlxlist:[],
+				qjlxlist:[],
+				type:'',
+				dfinfo:{}
 			}
 		},
 		onUnload(){
@@ -86,6 +91,7 @@
 		},
 		onLoad(e) {
 			this.id=e.id;
+			this.type=e.pt;
 			this.getDetail()
 			this.init()
 			uni.$on('refreshdetail', (e) => {
@@ -117,24 +123,44 @@
 				return selectValuetext(list, ite);
 			},
 			init(){
-
+				// 活动类型
+				getDictionaryFn('activity_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.hdlxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
+				// 请假类型
+				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;
 				var type=this.ptype;
-				if(type=='dffk'){
-					var params=JSON.parse(JSON.stringify(e))
-					params.proposalId=this.id
-					getzxActivityReplyFn(params).then(res=>{
-						if(res.code==200){
-							this.$toast("回复成功");
-							setTimeout(function(){
-								that.ptype='';
-								that.getDetail()
-							},1200)	
-						}
-					})
-				}
+				var params=JSON.parse(JSON.stringify(e))
+				params.activityId=this.id
+				getzxActivityReplyFn(params).then(res=>{
+					if(res.code==200){
+						this.$toast("回复成功");
+						setTimeout(function(){
+							uni.$emit('refreshlist')
+							that.ptype='';
+							that.getDetail()
+						},1200)	
+					}
+				})
 			},
 			getEditFn(){
 				this.$tab.navigateTo('/work/pages/meeting/addactive?type=edit&id='+this.id)
@@ -178,9 +204,15 @@
 				var params={
 					activityId:this.id
 				}
+				if(this.type=='hdtz'){
+					params.userId=this.userId
+				}
 				getzxActivityDetailFn(params).then(res=>{
 					if(res.code==200){
 						this.datainfo=res.data;
+						if(res.data.zxActivityUserList){
+							this.dfinfo=res.data.zxActivityUserList[0]
+						}
 						if(res.data.zxFjList&&res.data.zxFjList.length){
 							this.filelist=JSON.parse(JSON.stringify(res.data.zxFjList))
 						}

work/pages/meeting/details.vue

@@ -6,6 +6,7 @@
 			<view class="dbox fmt30">
 				<view class="dtit">{{datainfo.conferenceTitle}}</view>
 				<view class="titinf">
+					<view class="txt"><text>会议类型</text>{{typeFormat(datainfo.conferenceType,hylxlist)}}</view>
 					<view class="txt"><text>会议日期</text>{{datainfo.conferenceDate}}</view>
 					<view class="txt"><text>会议时间</text>{{datainfo.conferenceTime}}</view>
 					<view class="txt"><text>会议地点</text>{{datainfo.conferenceAddress}}</view>
@@ -51,7 +52,7 @@
 					<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 class="btn btn2" @click="getScfkFn('chdf')" v-if="checkPermi(['zxConference:conference:updateReply'])&&type=='hyhd'">会议答复</view> -->
 			</view>
 			
 		</view>
@@ -67,7 +68,7 @@
 	import noData from "@/components/nodata/nodata.vue"
 	import {getDeptTree} from"@/api/mine/mine.js"
 	import { selectValue,selectValuetext } from '@/utils/common.js';
-	import {getMeetDetaiFn,getMeetDelFn,} from "@/api/mine/meeting.js"
+	import {getMeetDetaiFn,getMeetDelFn,getupdateReplyFn} from "@/api/mine/meeting.js"
 	import {getDictionaryFn} from "@/api/mine/register.js"
 	export default{
 		components:{popUp,noData},
@@ -85,6 +86,7 @@
 				datainfo:{},
 				tary:'',
 				qjlxlist:[],
+				hylxlist:[],
 				type:'',
 				userId:this.$store.state.user.userId,
 				dfinfo:{}
@@ -141,23 +143,32 @@
 						})
 					}
 				})
+				getDictionaryFn('conference_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.hylxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getupSubmit(e){
 				var that=this;
 				var type=this.ptype;
-				if(type=='zxmyfk'){
-					var params=JSON.parse(JSON.stringify(e))
-					params.proposalId=this.id
-					getInfozxIdeaFn(params).then(res=>{
-						if(res.code==200){
-							this.$toast("提案办结成功");
-							setTimeout(function(){
-								that.ptype='';
-								that.getDetail()
-							},1200)	
-						}
-					})
-				}
+				var params=JSON.parse(JSON.stringify(e))
+				params.conferenceId=this.id
+				getupdateReplyFn(params).then(res=>{
+					if(res.code==200){
+						this.$toast("回复成功");
+						setTimeout(function(){
+							uni.$emit('refreshlist')
+							that.ptype='';
+							that.getDetail()
+						},1200)	
+					}
+				})
 			},
 			getEditFn(){
 				this.$tab.navigateTo('/work/pages/meeting/add?type=edit&id='+this.id)

work/pages/meeting/list.vue

@@ -30,13 +30,13 @@
 			<view class="lbtab flexc">
 				<image :src="lbicoimg" class="limg"></image>
 				<view class="lbtabs flexc">
-					<view class="lbtabp" v-if="tabidx!='hdtz'">
+					<view class="lbtabp" v-if="tabidx!='hdtz'&&tabidx!='zxhd'">
 						<picker mode="date" :value="time"   @change='bindDateChangeb'>
 							<view :class="time?'':'f16 co80'">{{time || "会议日期"}}</view>
 						</picker>
 						<image :src="upimg" class="upimg"></image>
 					</view>
-					<view class="lbtabp" v-if="tabidx=='hdtz'">
+					<view class="lbtabp" v-if="tabidx=='hdtz'||tabidx=='zxhd'">
 						<picker mode="date" :value="time"   @change='bindDateChangeb'>
 							<view :class="time?'':'f16 co80'">{{time || "活动日期"}}</view>
 						</picker>
@@ -81,7 +81,7 @@
 				tabidx:'hytz',
 				// 会议活动 管理员看的{tit:'会议发言',val:'hyfy',limit:'zx:speak:list'},
 				tabList:[{tit:'会议通知',val:'hytz',limit:'zxConference:conference:list'},{tit:'会议活动',val:'hyhd',limit:'zxConference:conference:alllist'},{tit:'我的发言',val:'wdfy',limit:'zx:speak:list'},{tit:'会议发言',val:'hyfy',limit:'zx:speak:alllist'},
-					{tit:'活动通知',val:'hdtz',limit:'zxActivity:activity:list'}
+					{tit:'政协活动',val:'zxhd',limit:'zxActivity:activity:alllist'},{tit:'活动通知',val:'hdtz',limit:'zxActivity:activity:list'}
 				],
 				litablist:[{tit:'会议日期',val:0},],
 				nvaHeight:44,
@@ -215,7 +215,7 @@
 				console.log(e,2)
 			},
 			getReadFn(e){
-				if(this.tabidx=='hyhd'||this.tabidx=='hdtz'){
+				if(this.tabidx=='hyhd'||this.tabidx=='hdtz'||this.tabidx=='zxhd'){
 					this.$tab.navigateTo('/work/pages/meeting/readdetail?id='+e+'&a='+this.tabidx)
 				}else if(this.tabidx=='hyfy'){
 					this.$tab.navigateTo('/work/pages/meeting/speaklist?id='+e)
@@ -237,8 +237,8 @@
 					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)	
+				}else if(type=='hdtz'||type=='zxhd'){
+					this.$tab.navigateTo('/work/pages/meeting/activedetails?id='+data+"&pt="+type)	
 				}	
 			},
 			getAddMeet(){
@@ -348,10 +348,13 @@
 							this.$toast(res.msg)
 						}
 					})
-				}else if(this.tabidx=='hdtz'){
+				}else if(this.tabidx=='hdtz'||this.tabidx=='zxhd'){
 					if(this.time){
 						params.activityDate=this.time
 					}
+					if(this.tabidx=='hdtz'){
+						params.userId=this.userId
+					}
 					params.activityTitle=this.title
 					getzxActivityListFn(params).then(res=>{
 						if(res.code==200){

work/pages/meeting/speakdetails.vue

@@ -44,7 +44,7 @@
 			</view>
 			
 		</view>
-		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype'    @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 

work/pages/report/mineinfo.vue

@@ -169,6 +169,7 @@
 				tpidx:'',
 				dpidx:'',
 				grade:'',
+				jebidx:'',
 			}
 		},
 		onLoad(e) {