123

components/swiper/notice.vue

@@ -1,20 +1,22 @@
 <template>
-  <view>
+  <view v-if="noticelist.length">
 	  <view class="hswip flexc" >
 	  		<image :src="tztip"></image>
 			<swiper class="swiper" circular :autoplay="autoplay" :interval="interval" :duration="duration" vertical='true'>
-				<swiper-item>
+				<swiper-item v-for="(ite,idx) in noticelist" :key="">
 					<view class="flexc swipers">
-						<view class="tit over">1《关于优化我市惠企利民政策“免审即…</view>
-						<view class="time">02-27</view>
+						<view class="tit over" v-if="ite.noticeContent">
+						<rich-text :nodes="ite.noticeContent"></rich-text>
+						</view>
+						<view class="time">{{ite.updateTime}}</view>
 					</view>
 				</swiper-item>
-				<swiper-item>
+<!-- 				<swiper-item>
 					<view class="flexc swipers">
 						<view class="tit over">2《关于优化我市惠企利民政策“免审即…</view>
 						<view class="time">02-27</view>
 					</view>
-				</swiper-item>
+				</swiper-item> -->
 			</swiper>
 	  		
 	  </view>
@@ -30,7 +32,13 @@
 	  			return false
 	  		}
 	  	},
-	  	confdat:{}
+	  	confdat:{},
+		noticelist:{
+			type: Array,
+			default () {
+				return []
+			}
+		}
 	  },
 	data(){
 		return{

manifest.json

@@ -25,23 +25,12 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ]
             },
             "ios" : {
@@ -62,7 +51,6 @@
                         "appkey_android" : "b85f0c64b3c9a082d740912cf3019c88"
                     }
                 },
-                "speech" : {},
                 "push" : {}
             },
             "icons" : {

pages.json

@@ -26,7 +26,9 @@
 	  "path": "pages/notice/index",
 	  "style": {
 	    "navigationBarTitleText": "会议通知",
-	    "navigationStyle": "custom"
+		"navigationBarBackgroundColor": "#1D64E2",
+		"navigationBarTextStyle": "white"
+	    // "navigationStyle": "custom"
 	}},
 	
   {

pages/index/index.vue

@@ -45,7 +45,7 @@
 				<view class="hbox">
 					<!-- 通知栏 -->
 					<block v-if="checkPermi(['zxNotice:notice:list'])">
-						<h-notice></h-notice>
+						<h-notice :noticelist="noticelist" :autoplay='autoplay'></h-notice>
 					</block>
 					
 					<!-- 入口 -->
@@ -92,6 +92,27 @@
 									<image :src="hrimgd" class="flex0 imgd"></image>
 								</view>
 							</view>
+							
+							<view class="htbox" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
+								<image :src="hrbgc" class="hrbg"></image>
+								<view class="htboxa flexc">
+									<view class="flex1 mr10">
+										<view class="tit">提案办理</view>
+										<view class="txt">管理委员履职信息</view>
+									</view>
+									<image :src="hrimgc" class="flex0 imgc"></image>
+								</view>
+							</view>
+							<view class="htbox" @click="handleTocu" v-if="checkPermi(['zxUrge:urge:list'])">
+								<image :src="hrbgd" class="hrbg"></image>
+								<view class="htboxa flexc">
+									<view class="flex1 mr10">
+										<view class="tit">催办信息</view>
+										<view class="txt">了解催办信息</view>
+									</view>
+									<image :src="hrimgd" class="flex0 imgd"></image>
+								</view>
+							</view>
 						</view>
 					</view>
 					
@@ -181,6 +202,8 @@
 			tajdlist:[],
 			ztlxlist:[],
 			minheight:0,
+			noticelist:[],
+			autoplay:true
 		}
 	},
 	onPageScroll(e) {
@@ -257,7 +280,7 @@
 			}
 			getNoticeList(params).then(res=>{
 				if(res.code==200){
-					
+					this.noticelist=res.rows
 				}
 			})
 		},
@@ -382,6 +405,12 @@
 		getDetail(data){
 			// this.$tab.navigateTo('/pages/order/staffcode?type=look&id='+data)
 		},
+		handleTotabl(){
+			this.$tab.navigateTo('/work/pages/single/unitList')
+		},
+		handleTocu(){
+			this.$tab.navigateTo('/work/pages/single/urge')
+		},
 		getDataFn(){
 			var params={
 				pageSize:this.pageSize,

pages/mine/index.vue

@@ -96,7 +96,7 @@
 					<view class="tit flex1">提案办理</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleTocu" v-if="checkPermi(['zxConference:conference:list'])">
+				<view class="flexc mine_list" @click="handleTocu" v-if="checkPermi(['zxUrge:urge:list'])">
 					<view class="limg">
 						<image :src="listimgf" class="imgc"></image>
 					</view>
@@ -285,7 +285,7 @@
 		onLoad() {
 			this.nvaHeight=uni.getSystemInfoSync().statusBarHeight+44;
 			if (checkPermi(['system:notice:number'])) {
-				this.getNoticenumber()
+				// this.getNoticenumber()
 			}
 		},
 		methods: {

pages/notice/index.vue

@@ -1,20 +1,22 @@
 <template>
   <view >
 	  <view class="notbox">
-		   <meet-list :datalist="list" :wtdt="wtdt"   :type='ptype' @getDetail="getDetail" ></meet-list>
+		   <meet-list :datalist="list" :wtdt="wtdt"   :type='type' @getDetail="getDetail" @getTuiFn="getTuiFn"></meet-list>
 	  </view>
-	 
+	 <pop-up :type='ptype' :codeQr="codeQr" @getClose="getClose" @getupSubmit="getupSubmit" :qjlxlist="qjlxlist"></pop-up>
 	<footers v-if="isfootflag" :footlist="footlist" :footerindex="footerindex" :color_checked="color_checked" :color_nochecked="color_nochecked" :isHomeIndex="true"></footers>
  </view>
 </template>
 
 <script>
+	import popUp from "@/work/components/popup/popup.vue"
 	import footers from '@/components/footer/footer.vue'
   import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-  import {getMeetListFn} from "@/api/mine/meeting.js"
+  import {getMeetListFn,getzxActivityReplyFn} from "@/api/mine/meeting.js"
+  import {getDictionaryFn} from "@/api/mine/register.js"
   import meetList from "@/work/components/meeting/list.vue"
   export default {
-	components:{footers,meetList},
+	components:{footers,meetList,popUp},
     data() {
       return {
 		  footlist:[
@@ -32,7 +34,10 @@
 		  pageNum: 1,
 		  reachflag: true,
 		  wtdt:'',
-		  ptype:'hytz',
+		  type:'hytz',
+		  ptype:'',
+		  codeQr:"",
+		  qjlxlist:[],
 		  userId:this.$store.state.user.userId,
       }
     },
@@ -40,9 +45,67 @@
 	},
 	onLoad() {
 		this.getDataFn()
+		this.init()
 	},
     methods: {
 		checkPermi, checkRole,
+		getClose(){
+			this.ptype=""
+		},
+		getDetail(data){
+			var type=this.tabidx;
+			this.$tab.navigateTo('/work/pages/meeting/details?id='+data+"&pt="+type)		
+		},
+		getTuiFn(ite){
+			if(ite.type=='hyqd'){
+				this.$tab.navigateTo('/work/pages/meeting/signin?id='+ite.id)
+			}else{
+				this.codeQr=ite.item.conferenceQr
+				this.ptype=ite.type;
+				this.id=ite.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
+						}
+					})
+					this.aqjlxlist = res.data.map(v => {
+						return {
+							label: v.dictLabel,
+							value: v.dictValue
+						}
+					})
+				}
+			})
+		},
+		getupSubmit(e){
+			var that=this;
+			var type=this.type;
+			var params=JSON.parse(JSON.stringify(e))
+			params.userId=this.userId;
+			params.conferenceId=this.id;
+			getupdateReplyFn(params).then(res=>{
+				if(res.code==200){
+					this.$toast("答复成功");
+					setTimeout(function(){
+						that.ptype='';
+						that.pageNum=1;
+						that.list=[];
+						that.reachflag=true;
+						that.getDataFn()
+					},1200)
+					
+				}
+			})
+			
+			
+		},
 		getDataFn(){
 			var params={
 				pageSize:this.pageSize,

work/components/popup/popup.vue

@@ -724,19 +724,19 @@
 		},
 		mounted() {
 			this.baseUrl=baseUrl;
-			var that=this;
-					// #ifdef APP-PLUS
-					// 监听语音识别事件
-					plus.speech.addEventListener('recognizing', this.onRecognizing, false);
-					// #endif	
+			// var that=this;
+			// 		// #ifdef APP-PLUS
+			// 		// 监听语音识别事件
+			// 		plus.speech.addEventListener('recognizing', this.onRecognizing, false);
+			// 		// #endif	
 							  
-					recorderManager.onStop(function(res) {
-						//录音后的回调函数
-						if(!this.sendLock){
-							console.log(that.voicetext,that.partialResult)
-						}
-						console.log('recorder stop' + JSON.stringify(res));
-					});  
+			// 		recorderManager.onStop(function(res) {
+			// 			//录音后的回调函数
+			// 			if(!this.sendLock){
+			// 				console.log(that.voicetext,that.partialResult)
+			// 			}
+			// 			console.log('recorder stop' + JSON.stringify(res));
+			// 		});  
 							  
 		},
 		methods:{

work/pages/case/details.vue

@@ -173,7 +173,7 @@
 			</view>
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<!-- 按角色选择按钮 -->
-				<view class="btn btn1" @click="getDelFn" v-if="checkPermi(['proposalInfo:info:remove'])">删除</view>
+				<view class="btn btn3" @click="getDelFn" v-if="checkPermi(['proposalInfo:info:remove'])">删除</view>
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['proposalInfo:info:edit'])&&progress==1">修改</view>
 				<view class="btn btn2" @click="getScfkFn('scfk')" v-if="checkPermi(['proposalInfo:info:isRecord'])&&progress==1">2审查反馈</view>
 				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['proposalInfo:info:assign'])&&progress==2">3提案交办</view>

work/pages/news/list.vue

@@ -64,7 +64,7 @@
 		onLoad(e) {
 			this.init()
 			uni.$on('refreshxxlist', (e) => {
-				that.getrefreshData()
+				this.getrefreshData()
 			})
 		},
 		// 上拉触底加载更多触发事件

work/pages/report/info.vue

@@ -309,11 +309,9 @@
 				}
 				if(this.tabidx=='lzxx'){
 					if(checkPermi(['member:info:alllist'])){
-						console.log(12)
 					}else {
 						params.userId=this.userId
 					}
-					console.log(132)
 					getInfojopList(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {

work/pages/sqmyInfo/details.vue

@@ -185,7 +185,7 @@
 			</view>
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<!-- 按角色选择按钮 -->
-				<view class="btn btn1" @click="getDelFn" v-if="checkPermi(['sqmyInfo:info:remove'])">删除</view>
+				<view class="btn btn3" @click="getDelFn" v-if="checkPermi(['sqmyInfo:info:remove'])">删除</view>
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['sqmyInfo:info:edit'])&&progress==1">修改</view>
 				<view class="btn btn2" @click="getScfkFn('scfk')" v-if="checkPermi(['sqmyInfo:info:isRecord'])&&progress==1">2审查反馈</view>
 				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['sqmyInfo:info:assign'])&&progress==2">3提案交办</view>
@@ -658,6 +658,7 @@
 		justify-content: center;margin:0 12rpx;flex:1;
 			&.btn1{border: 2rpx solid #1D64E2;background: #ffffff;color: #1D64E2;}
 			&.btn2{background: #1D64E2;color: #ffffff;}
+			&.btn3{border: 2rpx solid #FF0000;background: #ffffff;color: #FF0000;}
 		}
 	}
 </style>