zouling 1 년 전
부모
커밋
2f66e60511

+ 2 - 2
components/notice/list.vue

@@ -3,7 +3,7 @@
 	<view v-if="datalist.length>0">
 		<!-- 新闻 -->
 		<block v-if="type==1">
-			<view class="nlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.categoryId)">
+			<view class="nlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.proposalId)">
 				<!-- 置顶 -->
 				<!-- <block v-if="ite.isTop">
 					<view class="nrbox">
@@ -27,7 +27,7 @@
 		</block>
 		<!--  -->
 		<block v-if="type==2">
-			<view class="nlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.reservatId)">
+			<view class="nlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.sqmyId)">
 				<view class="tit overtwo">{{ite.title}}</view>
 				<view class="txt flexcj mb10">
 					<view class="flex0 label">案号</view>

+ 5 - 1
pages/index/index.vue

@@ -403,7 +403,11 @@
 			// this.kaTime = yearStr + ' ' + timeStr;
 		},
 		getDetail(data){
-			// this.$tab.navigateTo('/pages/order/staffcode?type=look&id='+data)
+			if(this.tabval==1){
+				this.$tab.navigateTo('/work/pages/case/details?id='+data)
+			}else{
+				this.$tab.navigateTo('/work/pages/sqmyInfo/details?id='+data)
+			}	
 		},
 		handleTotabl(){
 			this.$tab.navigateTo('/work/pages/single/unitList')

+ 1 - 1
pages/mine/index.vue

@@ -281,7 +281,7 @@
 			// }else{
 			// 	this.fixedflag=false
 			// }
-		},
+		}, 
 		onLoad() {
 			this.nvaHeight=uni.getSystemInfoSync().statusBarHeight+44;
 			if (checkPermi(['system:notice:number'])) {

+ 12 - 6
work/components/popup/popup.vue

@@ -298,7 +298,7 @@
 					<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">
+				<view class="mb16" v-if="progress!=7">
 					<view class="flexcj mb10">
 						<view class="ttxt">添加附件</view>
 						<view class="fjadd"><lsj-upload
@@ -582,6 +582,12 @@
 				default () {
 					return []
 				}
+			},
+			progress:{
+				type: [String,Number],
+				default () {
+					return ''
+				}
 			}
 		},
 		data(){
@@ -613,7 +619,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10
@@ -907,7 +913,7 @@
 				}else if(type=='tajb'){
 					var newArr=this.recorddwlist;
 					var xbdwList=this.recorddwmlist;
-					if(!newArr){
+					if(!newArr||newArr.length<1){
 						this.$toast('请选择主办单位')
 						return
 					}
@@ -923,7 +929,7 @@
 					this.$emit('getupSubmit',obj)
 				}else if(type=='dffk'){
 					if(!this.handling){
-						this.$toast('请选择理方式')
+						this.$toast('请选择理方式')
 						return
 					}
 					if(!this.degree){
@@ -1063,7 +1069,7 @@
 				newobj.name=responseText.originalFilename;
 				newobj.url=responseText.fileName;
 				this.filelist.push(newobj)
-					this.datainfo.zsyzFjList=JSON.parse(JSON.stringify(this.filelist))
+				// this.datainfo.zsyzFjList=JSON.parse(JSON.stringify(this.filelist))
 			},
 			getDelFj(idx){
 				var that=this;
@@ -1075,7 +1081,7 @@
 					success: function(res) {
 						if (res.confirm) {
 							that.filelist.splice(idx,1)
-							that.datainfo.zsyzFjList=JSON.parse(JSON.stringify(that.filelist))
+							// that.datainfo.zsyzFjList=JSON.parse(JSON.stringify(that.filelist))
 						} else if (res.cancel) {
 						}
 					}

+ 2 - 2
work/components/single/list.vue

@@ -3,7 +3,7 @@
 	<view v-if="datalist.length>0">
 		<!-- 我的提案 -->
 		<block v-if="type=='tabl'">
-			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.categoryId)">
+			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.proposalId)">
 				<view class="tit overtwo">{{ite.title}}</view>
 				
 				<view class="flexcw" >
@@ -88,7 +88,7 @@
 		</block>
 		<!-- 提案催办 -->
 		<block v-if="type=='tncb'">
-			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.sqmyId)">
+			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' >
 				<view class="tit overtwo">{{ite.title}}</view>
 				<view class="ftxt">
 					<text>催办标题</text>

+ 1 - 1
work/pages/case/add.vue

@@ -186,7 +186,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 25 - 18
work/pages/case/details.vue

@@ -72,7 +72,7 @@
 				</view>
 			</view>
 			<!-- 提案立案以下隐藏 -->
-			<view class="dbox" v-if="hflist.length||lmlist.length||datainfo.cbdwdfwy">
+			<view class="dbox" v-if="hflist.length||lmlist.length>1||datainfo.cbdwdfwy">
 				<view class="titbox mb16">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -82,8 +82,15 @@
 				<!-- 单位回复委员 -->
 				<!-- 联名反馈 -->
 				<view class="titinf" v-for="(ite,idx) in lmlist" :key="idx">
-					<view class="ftit mb10">联名人:{{ite.name}}</view>
-					<view class="txt wb100"><text class="w65">联名确认</text>{{ite.isAgree=='1'?'同意':'不同意'}}</view>
+					<block v-if="ite.userId!=datainfo.proposalUserId">
+						<view class="ftit mb10">联名人:{{ite.name}}</view>
+						<view class="txt wb100"><text class="w65">联名确认</text>
+						<block v-if="ite.isAgree!=0">
+							{{ite.isAgree=='1'?'同意':'不同意'}}
+						</block>
+						<block v-else>待确认</block>
+						</view>
+					</block>
 				</view>
 				<!-- 单位反馈 -->
 				<view class="titinf" v-for="(ite,idx) in hflist" :key="idx">
@@ -175,14 +182,15 @@
 				<!-- 按角色选择按钮 -->
 				<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>
-				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['proposal:unit:reply'])&&(progress==4||progress==6||from=='tabl')&&progress!=7">4答复反馈</view>
-				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['proposalInfo:info:assignsh'])&&progress==5">5交办审核</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposal:unit:reply'])&&progress==3&&hflist[0].isReply!=0">5单位答复反馈</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['proposalInfo:info:cbdwdfwy'])&&progress==7">5承办单位答复委员</view>
-				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['proposalInfo:info:idea'])&&progress==8">6办结审核</view>
-				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['proposalInfo:info:zxIdea'])&&progress==8">7办结审核</view>
+				<view class="btn btn2" @click="getScfkFn('scfk')" v-if="checkPermi(['proposalInfo:info:isRecord'])&&progress==1">审查反馈</view>
+				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['proposalInfo:info:assign'])&&progress==2">提案交办</view>
+				<!-- ||from=='tabl'&&progress!=3&&progress!=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('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>
 				<!-- 提案办理进来的 协办单位 不考虑进度 -->
 				<!-- 联名提案反对同意 从联名提案进来的才有按钮-->
 				<view class="btn btn3" @click="getlmtaFn('lmta',2)" v-if="checkPermi(['proposal:user:verify'])&&from=='lmta'">反对联名</view>
@@ -196,7 +204,7 @@
 				<!-- 提案进度(0:提交提案,1:提案审查,2:提案立案,3:提案交办,4:办理提案,5:提案反馈,6:办结审核,7:已办结) -->
 				<!-- 1.委员录入
 				2.提案委立案是否,否 指定答复(交办)单位           不立案 3,回复单位回复
-				3.交办 选择答复(承办)单位(主办,协办)
+				3.交办 选择答复(承办)单位(主办,协办) 答复类型
 				4.承办单位 答复反馈(办理方式,办理程度,内容)    
 				5.交办单位审核(通过,不通过),承办单位答复交办单位审核(内容,附件)
 				6.审核不通过,承办单位答复
@@ -213,7 +221,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' :blfsList="matterList" :progress="progress" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
@@ -375,11 +383,6 @@
 					}
 				})
 			},
-			getInfoisRecordFn(){
-				getInfoisRecordFn().then(res=>{
-					
-				})
-			},
 			getupSubmit(e){
 				var that=this;
 				var type=this.ptype;
@@ -394,6 +397,7 @@
 							}
 							this.$toast(str+"成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)
@@ -407,6 +411,7 @@
 						if(res.code==200){
 							this.$toast("提案交办成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)
@@ -422,6 +427,7 @@
 							if(res.code==200){
 								this.$toast("答复反馈成功");
 								setTimeout(function(){
+									uni.$emit('refreshlist')
 									that.ptype='';
 									that.getDetail()
 								},1200)	
@@ -432,6 +438,7 @@
 							if(res.code==200){
 								this.$toast("答复反馈成功");
 								setTimeout(function(){
+									uni.$emit('refreshlist')
 									that.ptype='';
 									that.getDetail()
 								},1200)	

+ 10 - 3
work/pages/case/lmtapeople.vue

@@ -5,7 +5,7 @@
 			<!-- 搜索 -->
 			<view class="search searchbg flex0">
 				<image :src="searchimg"></image>
-				<input placeholder="输入委员姓名进行查询" />
+				<input placeholder="输入委员姓名进行查询" v-model="title" @confirm="getConfirm"/>
 			</view>
 			<view class="flex1 table">
 				<zb-table
@@ -76,7 +76,8 @@
 				],
 				tableData:[],
 				checkList:[],
-				selectList:[]
+				selectList:[],
+				title:'',
 			} 
 		},
 		onLoad(e) {
@@ -100,10 +101,16 @@
 			toggleRowSelection(e,data){
 				this.checkList=JSON.parse(JSON.stringify(data))
 			},
+			getConfirm(){
+				this.init()
+			},
 			toggleAllSelection(e){
 			},
 			init(){
-				getInfoListFn().then(res=>{
+				var params={
+					name:this.title
+				}
+				getInfoListFn(params).then(res=>{
 					if(res.code==200){
 						this.tableData=res.rows;
 						var newArr=this.checkList;

+ 3 - 0
work/pages/case/mine.vue

@@ -702,6 +702,9 @@
 					if(this.tabidx=='qb'&&this.tajd){
 						params.proposalProgress=this.tajdid
 					}
+					if(!checkPermi(['proposalInfo:info:alllist'])&&this.tabidx=='qb'){
+						params.proposalUserId=this.userId
+					}
 					getCaseListFn(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {

+ 1 - 1
work/pages/meeting/add.vue

@@ -148,7 +148,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 1 - 1
work/pages/meeting/addactive.vue

@@ -150,7 +150,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 1 - 1
work/pages/meeting/addspeak.vue

@@ -137,7 +137,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 1 - 1
work/pages/news/add.vue

@@ -118,7 +118,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 1 - 1
work/pages/sqmyInfo/add.vue

@@ -162,7 +162,7 @@
 				width: '',
 				height: '48rpx',
 				// 限制允许上传的格式,空串=不限制,默认为空
-				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word',
+				formats: 'doc,docx,xls,xlsx,ppt,txt,pdf,zip,rar,word,png,jpg,jpeg',
 				// 文件上传大小限制
 				size: 100,
 				// 文件数量限制 默认10

+ 8 - 8
work/pages/sqmyInfo/details.vue

@@ -187,14 +187,14 @@
 				<!-- 按角色选择按钮 -->
 				<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>
-				<view class="btn btn2" @click="getScfkFn('dffk')" v-if="checkPermi(['sqmy:unit:reply'])&&(progress==4||progress==6||from=='tabl')&&progress!=7">4答复反馈</view>
-				<view class="btn btn2" @click="getScfkFn('jbsh')" v-if="checkPermi(['sqmyInfo:info:assignsh'])&&progress==5">5交办审核</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmy:unit:reply'])&&progress==3&&hflist[0].isReply!=0">5答复反馈</view>
-				<view class="btn btn2" @click="getScfkFn('dwdf')" v-if="checkPermi(['sqmyInfo:info:cbdwdfwy'])&&progress==7">5承办单位答复委员</view>
-				<view class="btn btn2" @click="getScfkFn('wymyfk')" v-if="checkPermi(['sqmyInfo:info:idea'])&&progress==8">6办结审核</view>
-				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])&&progress==8">7办结审核</view>
+				<view class="btn btn2" @click="getScfkFn('scfk')" v-if="checkPermi(['sqmyInfo:info:isRecord'])&&progress==1">审查反馈</view>
+				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['sqmyInfo:info:assign'])&&progress==2">提案交办</view>
+				<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('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>
 				
 				<!--委员答复填内容,委员填满意度 -->
 				<!--协办单位,主办单位 填办理方式,办理程度,内容 附件 -->

+ 4 - 1
work/pages/sqmyInfo/mine.vue

@@ -560,7 +560,7 @@
 				}else if(tab=='tjzd'){
 					params.isKeyPoint="0"
 				}else if(tab=='xxsb'){
-					params.userId=this.userId
+					params.sqmyUserId=this.userId
 				}
 				if(tab=='xxbl'){
 					getsqmyInfounitListFn(params).then(res=>{
@@ -588,6 +588,9 @@
 						}
 					}) 
 				}else{
+					if(!checkPermi(['sqmyInfo:info:alllist'])&&tab=='qb'){
+						params.sqmyUserId=this.userId
+					}
 					getsqmyInfoListFn(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {