1

components/swiper/notice.vue

@@ -4,7 +4,7 @@
 	  		<image :src="tztip"></image>
 			<swiper class="swiper" circular :autoplay="autoplay" :interval="interval" :duration="duration" vertical='true'>
 				<swiper-item v-for="(ite,idx) in noticelist" :key="">
-					<view class="flexc swipers">
+					<view class="flexc swipers" @click="getDetail(ite.zxNoticeId)">
 						<view class="tit over" v-if="ite.noticeContent">
 						<rich-text :nodes="ite.noticeContent"></rich-text>
 						</view>
@@ -51,6 +51,9 @@
 		 getRoad(){
 		 	console.log(1)
 		 },
+		 getDetail(e){
+			 this.$emit('getNoticeDet',e)
+		 }
 	},
 	onLoad: function() {
     }

pages/index/index.vue

@@ -45,7 +45,7 @@
 				<view class="hbox">
 					<!-- 通知栏 -->
 					<block v-if="checkPermi(['zxNotice:notice:list'])">
-						<h-notice :noticelist="noticelist" :autoplay='autoplay'></h-notice>
+						<h-notice :noticelist="noticelist" :autoplay='autoplay' @getNoticeDet="getNoticeDet"></h-notice>
 					</block>
 					
 					<!-- 入口 -->
@@ -97,8 +97,8 @@
 								<image :src="hrbgc" class="hrbg"></image>
 								<view class="htboxa flexc">
 									<view class="flex1 mr10">
-										<view class="tit">提案办理</view>
-										<view class="txt">管理委员履职信息</view>
+										<view class="tit">提案/社情办理</view>
+										<view class="txt">提案、社情单位处理</view>
 									</view>
 									<image :src="hrimgc" class="flex0 imgc"></image>
 								</view>
@@ -267,6 +267,9 @@
 				this.$tab.navigateTo('/work/pages/news/list')
 			}
 		},
+		getNoticeDet(e){
+			this.$tab.navigateTo('/work/pages/news/detail?id='+e)
+		},
 		getMoreFn(){
 			if (this.reachflag) {
 				this.pageNum++

work/components/popup/popup.vue

@@ -14,7 +14,7 @@
 						<view>语音输入</view>
 					</view> -->
 				</view>
-				<textarea class="textar mb25" @blur="getBlur" v-model="content" placeholder="请输入推荐意见，也可点击右上角进行 语音输入…" maxlength="1000" ></textarea>
+				<textarea class="textar mb25" @blur="getBlur" v-model="content" placeholder="请输入推荐意见" maxlength="1000" ></textarea>
 			</view>
 			<view class="fixedbtn flexcj">
 				<view class="btns btn1" @click="getClose">取消</view>
@@ -163,11 +163,11 @@
 					></uni-data-select>
 				</view>
 				<!-- 提案号 -->
-				<view class="mb16">
+				<view class="mb16" v-if="isRecord==0">
 					<view class="ttxt mb18"><text class="cof0">*</text>提案号</view>
-					<input class="input" v-model="txtnumber"  placeholder="请输入提案号"/>
+					<input class="input"  v-model="txtnumber"  placeholder="请输入提案号"/>
 				</view>
-				<view class="mb16" >
+				<view class="mb16" v-if="isRecord==1">
 					<view class="ttxt mb18"><text class="cof0">*</text>答复单位</view>
 					<view @click="getRecorddwFn" class="chosebox flexc">
 						<view class="tit" :class="recorddw?'':'coa'">{{recorddw||'若选择不予立案，请指定答复单位'}}</view>
@@ -299,14 +299,14 @@
 		</view>
 		<!-- 5提案办理 承办答复 -->
 		<view class="fixedbox" v-if="type=='dwdf'">
-			<view class="ttit">答复反馈</view>
+			<view class="ttit">单位答复</view>
 			<view  class="boxs">
 				<view class="mb16">
 					<!-- @change="change" -->
 					<view class="ttxt mb18"><text class="cof0">*</text>答复内容</view>
 					<textarea class="textar mb25" @blur="getBlur" v-model="content" placeholder="请输入答复内容" maxlength="1000" ></textarea>
 				</view>
-				<view class="mb16" v-if="progress!=7">
+				<view class="mb16" >
 					<view class="flexcj mb10">
 						<view class="ttxt">添加附件</view>
 						<view class="fjadd"><lsj-upload
@@ -602,6 +602,12 @@
 				default () {
 					return ''
 				}
+			},
+			sh:{
+				type: [String,Number],
+				default () {
+					return ''
+				}
 			}
 		},
 		data(){
@@ -693,6 +699,9 @@
 			}
 		},
 		watch:{
+			sh(val){
+				this.isRecord=Number(val);
+			},
 			// iteminfo(val){
 			// 	var that=this;
 			// 	that.psnr='';

work/components/sqmyInfo/list.vue

@@ -90,7 +90,7 @@
 						<view class="co22" v-if="ite.isRecord">已审核</view>
 						<view class="co1d" v-else>待审核</view>
 					</view>
-					<view class="btn btn2" v-if="!ite.isRecord&&checkPermi(['sqmyInfo:info:isRecord'])" @click.stop="getTuiFn(ite,'scfk','1')">审核</view>
+					<view class="btn btn2" v-if="!ite.isRecord&&checkPermi(['sqmyInfo:info:isRecord'])" @click.stop="getTuiFn(ite,'scfk')">审核</view>
 				</view>
 				<!--催办  4(不包含4) 之后 可以催办-->
 				<view class="casebtn flexc" v-if="type=='xxcb'">
@@ -239,7 +239,6 @@
 		},
 		getTuiFn(ite,txt,sh){
 			var that=this;
-			console.log(txt,2)
 			if(txt=='scfk'&&sh==0){
 				uni.showModal({
 					title: '确认立案',

work/pages/case/details.vue

@@ -188,7 +188,7 @@
 				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['proposal:unit:reply'])&&(progress==4||progress==6)">答复反馈</view>
 				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['proposalInfo:info:assignsh'])&&progress==5">交办审核</view>
 				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposal:unit:reply'])&&progress==3&&hflist[0].isReply!=0">单位答复</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposalInfo:info:cbdwdfwy'])&&progress==7">单位答复</view>
+				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposalInfo:info:cbdwdfwy'])&&progress==7">单位答复委员</view>
 				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['proposalInfo:info:idea'])&&progress==8">办结审核</view>
 				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['proposalInfo:info:zxIdea'])&&progress==8">办结审核</view>
 				<!-- 提案办理进来的 协办单位 不考虑进度 -->

work/pages/case/mine.vue

@@ -71,7 +71,7 @@
 		
 		
 		<!-- 弹窗 -->
-		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" :mycdlist="mycdlist" @getFaFn="getFaFn" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :sh="sh" :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" :mycdlist="mycdlist" @getFaFn="getFaFn" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
@@ -101,7 +101,7 @@
 					{tit:'全部',val:'qb',limit:'proposalInfo:info:list'},
 					{tit:'提案审查',jd:1,val:'tasc',limit:'proposalInfo:info:isRecord'},
 					{tit:'提案交办',jd:2,val:'tajb',limit:"proposalInfo:info:assign"},
-					{tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},
+					// {tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},
 					// {tit:'办结审核',jd:6,val:'jbsh',},
 				{tit:'提案催办',val:'tacb',limit:'proposalInfo:info:tacbList'},
 				// {tit:'接收催办',val:'jstacb',limit:'zxUrge:urge:list'},
@@ -149,7 +149,8 @@
 				id:'',
 				userId:this.$store.state.user.userId,
 				deptId:this.$store.state.user.deptId,
-				iteinfo:'',//选择 的数据
+				iteinfo:'',//选择 的数据,
+				sh:""
 			}
 		},
 		onUnload(){
@@ -271,6 +272,7 @@
 				var that=this;
 				if(type=='scfk'){
 					this.ptype=data.type;
+					this.sh=data.sh;
 					// if(sh==1){
 						
 					// }else{
@@ -595,9 +597,9 @@
 					params.year=this.year
 				}
 				if(tab=='tjyx'){
-					params.isOutstanding="0"
+					// params.isOutstanding="0"
 				}else if(tab=='tjzd'){
-					params.isKeyPoint="0"
+					// params.isKeyPoint="0"
 				}else if(tab=='gkta'){
 					params.isPublicity="是"
 				}else if(tab=='wdta'){

work/pages/sqmyInfo/details.vue

@@ -192,7 +192,7 @@
 				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['sqmy:unit:reply'])&&(progress==4||progress==6)">答复反馈</view>
 				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['sqmyInfo:info:assignsh'])&&progress==5">交办审核</view>
 				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmy:unit:reply'])&&progress==3&&hflist[0].isReply!=0">答复反馈</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmyInfo:info:cbdwdfwy'])&&progress==7">单位答复</view>
+				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmyInfo:info:cbdwdfwy'])&&progress==7">单位答复委员</view>
 				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['sqmyInfo:info:idea'])&&progress==8">办结审核</view>
 				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])&&progress==8">办结审核</view>
 				
@@ -208,8 +208,10 @@
 				3.交办 选择答复(承办)单位(主办，协办)
 				4.承办单位 答复反馈(办理方式,办理程度,内容)    
 				5.交办单位审核(通过，不通过)，承办单位答复交办单位审核(内容，附件)
-				6.委员提交满意度，评价
-				7.政协 提交满意度(办结审核) -->
+				6.审核不通过，承办单位答复
+				7.审核通过 承办单位答复委员
+				8.委员提交满意度，评价                                                               
+				8.政协 提交满意度(办结审核) -->
 				
 				<!-- 只要提案就可以 推荐重点，推荐优秀
 				提案办理，催办，联名，单列表 -->
@@ -219,7 +221,7 @@
 			</view>
 			
 		</view>
-		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :progress="progress" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 <script>

work/pages/sqmyInfo/mine.vue

@@ -80,7 +80,7 @@
 		
 		
 		<!-- 弹窗 -->
-		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" @getFaFn="getFaFn" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :sh="sh" :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" @getFaFn="getFaFn" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
@@ -110,7 +110,7 @@
 				tabList:[{tit:'全部',val:'qb',limit:'sqmyInfo:info:list'},
 				{tit:'信息审核',jd:1,val:'xxsh',limit:'sqmyInfo:info:isRecord'},
 				{tit:'信息交办',jd:2,val:'xxjb',limit:'sqmyInfo:info:assign'},
-				{tit:'信息办理',val:'xxbl',limit:'sqmyInfo:info:unitList'},
+				// {tit:'信息办理',val:'xxbl',limit:'sqmyInfo:info:unitList'},
 				// {tit:'办结审核',jd:6,val:'bjsh',},
 				{tit:'信息催办',val:'xxcb',limit:'sqmyInfo:info:sqmycbList'},
 				// {tit:'接收催办',val:'jssqcb',limit:'zxUrge:urge:list'},
@@ -159,6 +159,7 @@
 				tajdidx:'',
 				id:'',
 				userId:this.$store.state.user.userId,
+				sh:'',
 			}
 		},
 		onUnload(){
@@ -277,27 +278,29 @@
 				var type=data.type;
 				var that=this;
 				if(type=='scfk'){
-					if(sh==1){
-						this.ptype=data.type;
-					}else{
-						var params={
-							proposalId:data.id,
-							isRecord:0,
-						}
-						getsqmyInfoisRecordFn(params).then(res=>{
-							if(res.code==200){
-								this.$toast("立案成功");
-								setTimeout(function(){
-									that.ptype='';
-									that.pageNum=1;
-									that.list=[];
-									that.reachflag=true;
-									that.getDataFn()
-								},1200)
+					this.ptype=data.type;
+					this.sh=data.sh;
+					// if(sh==1){
+					// 	this.ptype=data.type;
+					// }else{
+					// 	var params={
+					// 		proposalId:data.id,
+					// 		isRecord:0,
+					// 	}
+					// 	getsqmyInfoisRecordFn(params).then(res=>{
+					// 		if(res.code==200){
+					// 			this.$toast("立案成功");
+					// 			setTimeout(function(){
+					// 				that.ptype='';
+					// 				that.pageNum=1;
+					// 				that.list=[];
+					// 				that.reachflag=true;
+					// 				that.getDataFn()
+					// 			},1200)
 								
-							}
-						})
-					}
+					// 		}
+					// 	})
+					// }
 				}else{
 					this.ptype=type
 				}	
@@ -567,9 +570,9 @@
 				// }
 				
 				if(tab=='tjyx'){
-					params.isOutstanding="0"
+					// params.isOutstanding="0"
 				}else if(tab=='tjzd'){
-					params.isKeyPoint="0"
+					// params.isKeyPoint="0"
 				}else if(tab=='xxsb'){
 					params.sqmyUserId=this.userId
 				}