1

manifest.json

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

pages/index/index.vue

@@ -29,7 +29,7 @@
 						</view>
 						<view class="tit">上报社情民意</view>
 					</view>
-					<view class="htop" @click="getAddlzda" v-if="checkPermi(['member:info:MemberReport'])">
+					<view class="htop" @click="getAddlzda" v-if="checkPermi(['member:info:add'])">
 						<view class="imgs">
 							<image :src="htopc" class="imgc"></image>
 						</view>
@@ -324,14 +324,16 @@
 			}
 		},
 		getAddlzda(){
-			this.$tab.navigateTo('/work/pages/report/info')
+			this.$tab.navigateTo('/work/pages/report/mineinfo?type=add')
+			// this.$tab.navigateTo('/work/pages/report/info')
 		},
 		getAddhy(){
-			if(uni.getStorageSync('cjhyList')){
-				this.ptype='zchy'
-			}else{
-				this.$tab.navigateTo('/work/pages/meeting/add')
-			}
+			this.$tab.navigateTo('/work/pages/meeting/add')
+			// if(uni.getStorageSync('cjhyList')){
+			// 	this.ptype='zchy'
+			// }else{
+			// 	this.$tab.navigateTo('/work/pages/meeting/add')
+			// }
 		},
 		getFaFn(type,ptype){
 			this.ptype='';

pages/notice/index.vue

@@ -12,7 +12,7 @@
 	import popUp from "@/work/components/popup/popup.vue"
 	import footers from '@/components/footer/footer.vue'
   import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-  import {getMeetListFn,getzxActivityReplyFn} from "@/api/mine/meeting.js"
+  import {getMeetListFn,getzxActivityReplyFn,getupdateReplyFn} from "@/api/mine/meeting.js"
   import {getDictionaryFn} from "@/api/mine/register.js"
   import meetList from "@/work/components/meeting/list.vue"
   export default {
@@ -41,11 +41,20 @@
 		  userId:this.$store.state.user.userId,
       }
     },
+	onUnload(){
+		uni.$off('refreshlist')
+	},
 	onShow() {
 	},
 	onLoad() {
 		this.getDataFn()
 		this.init()
+		uni.$on('refreshlist', (e) => {
+			this.pageNum=1;
+			this.list=[];
+			this.reachflag=true;
+			this.getDataFn()
+		})
 	},
     methods: {
 		checkPermi, checkRole,
@@ -54,7 +63,7 @@
 		},
 		getDetail(data){
 			var type=this.tabidx;
-			this.$tab.navigateTo('/work/pages/meeting/details?id='+data+"&pt="+type)		
+			this.$tab.navigateTo('/work/pages/meeting/details?id='+data+"&pt=hytz")		
 		},
 		getTuiFn(ite){
 			if(ite.type=='hyqd'){

work/components/meeting/list.vue

@@ -39,7 +39,7 @@
 							<view class="lftit">是否成参会暂未答复</view>
 							<view class="btn btn2"  @click.stop="getTuiFn(ite,'chdf')">参会答复</view>
 						</block>
-						<view v-if="ite.isJoin=='Y'&&!ite.zxConferenceUserList[0]" class="btn btn2" @click.stop="getTuiFn(ite,'hyqd')">去签到</view>
+						<view v-if="ite.isJoin=='Y'&&ite.zxConferenceUserList[0]&&!ite.zxConferenceUserList[0].signIn" 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>
@@ -111,7 +111,7 @@
 						<view>{{kaType(ite.speakType,fylxlist)}}</view>
 					</view>
 					<view class="ftxt">
-						<text>提交时间</text>
+						<text>录入时间</text>
 						<view>{{ite.publishTime}}</view>
 					</view>
 					<!-- <view class="ftxt">

work/components/popup/popup.vue

@@ -196,6 +196,14 @@
 						<view class="tit" :class="recorddwm?'':'coa'">{{recorddwm||'请选择协办单位'}}</view>
 					</view>
 				</view>
+				<view class="mb16">
+					<view class="ttxt mb18"><text class="cof0">*</text>答复类型</view>
+					<uni-data-select
+					  v-model="dflxtxt"
+					  placeholder="请选择答复类型"
+					  :localdata="dflxlist"  
+					></uni-data-select>
+				</view>
 			</view>
 			<view class="fixedbtn flexcj">
 				<view class="btns btn1" @click="getClose">取消</view>
@@ -583,6 +591,12 @@
 					return []
 				}
 			},
+			dflxlist:{
+				type: Array,
+				default () {
+					return []
+				}
+			},
 			progress:{
 				type: [String,Number],
 				default () {
@@ -661,6 +675,7 @@
 				ftype:'',//二层弹窗
 				blfsval:'',//办理方式
 				cheklist:[],
+				dflxtxt:'',//答复类型
 				baseUrl:'',
 				
 				voiceflag:false,
@@ -921,10 +936,15 @@
 						this.$toast('请选择协办单位')
 						return
 					}
+					if(!this.dflxtxt){
+						this.$toast('请选择答复类型')
+						return
+					}
 					var obj={
 						proposalUnitReplyList:xbdwList,
 						sqmyUnitReplyList:xbdwList,
-						zbUnitReply:newArr
+						zbUnitReply:newArr,
+						complexType:this.dflxtxt
 					}
 					this.$emit('getupSubmit',obj)
 				}else if(type=='dffk'){

work/pages/case/details.vue

@@ -221,7 +221,7 @@
 			</view>
 			
 		</view>
-		<pop-up :type='ptype' :blfsList="matterList" :progress="progress" :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>
 
@@ -253,7 +253,7 @@
 				ptype:'',
 				datainfo:{},
 				
-				dflxList:[],
+				dflxlist:[],
 				stepList:[],//提案状态
 				jblist:[],//界别
 				dplist:[],//党派
@@ -382,6 +382,17 @@
 						})
 					}
 				})
+				//答复类型
+				getDictionaryFn('proposal_complex_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.dflxlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getupSubmit(e){
 				var that=this;
@@ -453,6 +464,7 @@
 						if(res.code==200){
 							this.$toast("交办审核成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)	
@@ -644,7 +656,7 @@
 			&.nact{height: 0;overflow: hidden;}
 			&.act{height: auto;}
 			.txt{font-weight: 500;font-size: 26rpx;margin-bottom: 20rpx;color: #222327;display: flex;align-items: flex-start;flex:0 1 auto;min-width: 50%;
-				&.nact{height: 200rpx;overflow: hidden;}
+				&.nact{height: 80rpx;overflow: hidden;}
 				&.act{height: auto;}
 				text{color: #AAAAAA;min-width: 104rpx;text-align-last: justify;flex: 0 0 auto;margin-right: 20rpx;
 					&.w65{width: 130rpx;}

work/pages/case/mine.vue

@@ -71,7 +71,7 @@
 		
 		
 		<!-- 弹窗 -->
-		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist" @getFaFn="getFaFn" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" :mycdlist="mycdlist" @getFaFn="getFaFn" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
@@ -145,6 +145,7 @@
 				matterList:[],
 				blcdlist:[],
 				mycdlist:[],
+				dflxlist:[],
 				id:'',
 				userId:this.$store.state.user.userId,
 				deptId:this.$store.state.user.deptId,
@@ -237,6 +238,17 @@
 						})
 					}
 				})
+				//答复类型
+				getDictionaryFn('proposal_complex_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.dflxlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getFaFn(type,ptype){
 				this.ptype='';

work/pages/meeting/add.vue

@@ -279,6 +279,10 @@
 					this.$toast("请输入会议名称")
 					return
 				}
+				if(!this.hylxtxt){
+					this.$toast("请选择会议类型")
+					return
+				}
 				if(!this.datainfo.conferenceDate){
 					this.$toast("请选择会议日期")
 					return
@@ -444,6 +448,7 @@ font-size: 30rpx;height: 100%;color: #222327;
 	// 按钮
 	.addbtn{display: flex;align-items: center;justify-content: space-between;padding-top: 26rpx;
 		.btn{width: 336rpx;height: 80rpx;font-weight: bold;font-size: 30rpx;box-sizing: border-box;border-radius: 40rpx;display: flex;align-items: center;justify-content: center;
+			flex:1;
 			&.btn1{border: 2rpx solid #1D64E2;background: #ffffff;color: #1D64E2;}
 			&.btn2{background: #1D64E2;color: #ffffff;}
 		}

work/pages/meeting/addactive.vue

@@ -112,7 +112,7 @@
 				<view class="edtip flext mb24 mt14"><text>*</text> 提案正文内容原则上不超过2000字，提案正文内容输入完毕后， 可点击右上角的“一键排版”按钮进行快速排版</view>
 			</view>
 			<view class="addbtn">
-				<view class="btn btn1" @click="getZanFnt">暂存</view>
+				<!-- <view class="btn btn1" @click="getZanFnt">暂存</view> -->
 				<view class="btn btn2" @click="getSubmit">提交</view>
 			</view>
 		</view>
@@ -480,6 +480,7 @@ font-size: 30rpx;height: 100%;color: #222327;
 	// 按钮
 	.addbtn{display: flex;align-items: center;justify-content: space-between;padding-top: 26rpx;
 		.btn{width: 336rpx;height: 80rpx;font-weight: bold;font-size: 30rpx;box-sizing: border-box;border-radius: 40rpx;display: flex;align-items: center;justify-content: center;
+			flex:1;
 			&.btn1{border: 2rpx solid #1D64E2;background: #ffffff;color: #1D64E2;}
 			&.btn2{background: #1D64E2;color: #ffffff;}
 		}

work/pages/meeting/addspeak.vue

@@ -45,7 +45,7 @@
 					</uni-forms-item>
 				</picker>
 			</view>
-			<view class="boxs pdbox">
+			<view class="boxs pdbox" style="display: none;">
 				<view class="titbox mb14">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -84,7 +84,7 @@
 				</view>
 			</view>
 			<view class="addbtn">
-				<view class="btn btn1" @click="getZanFnt">暂存</view>
+				<!-- <view class="btn btn1" @click="getZanFnt">暂存</view> -->
 				<view class="btn btn2" @click="getSubmit">提交</view>
 			</view>
 		</view>
@@ -279,7 +279,7 @@
 				var val=e.detail.value;
 				this.datainfo.name=this.fyrlist[val].label
 				this.datainfo.userId=this.fyrlist[val].value
-				this.userId=this.fyrlist[val].userId;
+				this.userId=this.fyrlist[val].value;
 				this.datainfo.conferenceTitle=''
 				this.datainfo.conferenceId=''
 				this.getTree()
@@ -501,6 +501,7 @@ font-size: 30rpx;height: 100%;color: #222327;
 	// 按钮
 	.addbtn{display: flex;align-items: center;justify-content: space-between;padding-top: 26rpx;
 		.btn{width: 336rpx;height: 80rpx;font-weight: bold;font-size: 30rpx;box-sizing: border-box;border-radius: 40rpx;display: flex;align-items: center;justify-content: center;
+			flex:1;
 			&.btn1{border: 2rpx solid #1D64E2;background: #ffffff;color: #1D64E2;}
 			&.btn2{background: #1D64E2;color: #ffffff;}
 		}

work/pages/meeting/list.vue

@@ -115,6 +115,9 @@
 			this.getDataFn()
 			this.init()
 			uni.$on('refreshlist', (e) => {
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
 				this.getDataFn()
 			})
 		},

work/pages/report/addscore.vue

@@ -319,6 +319,7 @@ font-size: 30rpx;height: 100%;color: #AAAAAA;}
 	// 按钮
 	.addbtn{display: flex;align-items: center;justify-content: space-between;padding-top: 26rpx;
 		.btn{width: 336rpx;height: 80rpx;font-weight: bold;font-size: 30rpx;box-sizing: border-box;border-radius: 40rpx;display: flex;align-items: center;justify-content: center;
+			flex:1;
 			&.btn1{border: 2rpx solid #1D64E2;background: #ffffff;color: #1D64E2;}
 			&.btn2{background: #1D64E2;color: #ffffff;}
 		}

work/pages/report/info.vue

@@ -337,7 +337,7 @@
 						}
 					}) 
 				}else if(this.tabidx=='jfju'){
-					if(checkPermi(['zxBonus:bonus:list'])){
+					if(checkPermi(['zxBonus:bonus:alllist'])){
 						
 					}else {
 						params.userId=this.userId

work/pages/sqmyInfo/add.vue

@@ -31,8 +31,8 @@
 					</view>
 				</view>
 				<view class="pb8">
-					<uni-forms-item label="题目" name="title" required>
-						<uni-easyinput :inputBorder="false" type="text" v-model="datainfo.title" placeholder="请输入标题" />
+					<uni-forms-item label="信息标题" name="title" required>
+						<uni-easyinput :inputBorder="false" type="text" v-model="datainfo.title" placeholder="请输入信息标题" />
 						<view class="edtip pa">* 标题前无须加关于，标题后无须加的建议，系统将自动填写</view>
 					</uni-forms-item>
 				</view>
@@ -47,10 +47,10 @@
 						</view>
 					</uni-forms-item>
 				</picker>
-				<uni-forms-item label="联系人" name="lxrName" >
+				<uni-forms-item label="联系人" name="lxrName" required>
 					<uni-easyinput :inputBorder="false" type="text" v-model="datainfo.lxrName" placeholder="请输入联系人" />
 				</uni-forms-item>
-				<uni-forms-item label="联系人联系方式" name="lxrPhone" >
+				<uni-forms-item label="联系人联系方式" name="lxrPhone" required>
 					<uni-easyinput :inputBorder="false" type="number" v-model="datainfo.lxrPhone" placeholder="请输入联系人联系方式" />
 				</uni-forms-item>
 			</view>
@@ -297,16 +297,12 @@
 							this.filelist=JSON.parse(JSON.stringify(data.zxFjList))
 						}
 						this.editinfo=data.sqmyContent;
-						var taryList=data.proposalUserList;
-						if(taryList&&taryList.length){
-							var newArr=[]
-							taryList.forEach(ite=>{
-								newArr.push(ite.name)
+						uni.createSelectorQuery().select('#editor').context(function(res) {
+							that.editorCtx = res.context;
+							that.editorCtx.setContents({
+								html:data.sqmyContent
 							})
-							this.tary=newArr.join('/')
-						}
-						that.checkidx=data.negotiateType.split(',')
-						// this.dwdetList=res.data.proposalUnitReplyList;
+						}).exec();
 					}
 				})
 			},
@@ -352,22 +348,21 @@
 			getSubmit(){
 				var that=this;
 				if(!this.datainfo.title){
-					this.$toast("请输入标题")
+					this.$toast("请输入信息标题")
 					return
 				}
 				if(!this.datainfo.topicType){
-					this.$toast("请选择提案类别")
+					this.$toast("请选择主题类型")
+					return
+				}
+				if(!this.datainfo.lxrName){
+					this.$toast("请输入联系人姓名")
+					return
+				}
+				if(!this.datainfo.lxrPhone){
+					this.$toast("请输入联系人手机号")
 					return
 				}
-				// if(!this.datainfo.lxrName){
-				// 	this.$toast("请输入联系人姓名")
-				// 	return
-				// }
-				// if(!this.datainfo.lxrPhone){
-				// 	this.$toast("请输入联系人手机号")
-					
-				// 	return
-				// }
 				if(this.datainfo.lxrPhone){
 					let regphone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
 					if (this.datainfo.lxrPhone && !regphone.test(this.datainfo.lxrPhone)) {

work/pages/sqmyInfo/details.vue

@@ -219,10 +219,9 @@
 			</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" :dflxlist="dflxlist" :blcdlist="blcdlist" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
-
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
@@ -251,7 +250,7 @@
 				ptype:'',
 				datainfo:{},
 				
-				dflxList:[],
+				dflxlist:[],
 				ztlxlist:[],//主题类型
 				stepList:[],//提案状态
 				jblist:[],//界别
@@ -368,6 +367,17 @@
 						})
 					}
 				})
+				//答复类型
+				getDictionaryFn('proposal_complex_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.dflxlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getsqmyInfoisRecordFn(){
 				getsqmyInfoisRecordFn().then(res=>{
@@ -388,6 +398,7 @@
 							}
 							this.$toast(str+"成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)
@@ -401,6 +412,7 @@
 						if(res.code==200){
 							this.$toast("提案办结成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)
@@ -415,6 +427,7 @@
 							if(res.code==200){
 								this.$toast("答复反馈成功");
 								setTimeout(function(){
+									uni.$emit('refreshlist')
 									that.ptype='';
 									that.getDetail()
 								},1200)	
@@ -425,6 +438,7 @@
 							if(res.code==200){
 								this.$toast("答复反馈成功");
 								setTimeout(function(){
+									uni.$emit('refreshlist')
 									that.ptype='';
 									that.getDetail()
 								},1200)	
@@ -439,6 +453,7 @@
 						if(res.code==200){
 							this.$toast("交办审核成功");
 							setTimeout(function(){
+								uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)	
@@ -451,6 +466,7 @@
 						if(res.code==200){
 							this.$toast("提案办结成功");
 							setTimeout(function(){
+								// uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)	
@@ -463,6 +479,7 @@
 						if(res.code==200){
 							this.$toast("提案办结成功");
 							setTimeout(function(){
+								// uni.$emit('refreshlist')
 								that.ptype='';
 								that.getDetail()
 							},1200)	
@@ -605,7 +622,7 @@
 			&.nact{height: 0;overflow: hidden;}
 			&.act{height: auto;}
 			.txt{font-weight: 500;font-size: 26rpx;margin-bottom: 20rpx;color: #222327;display: flex;align-items: flex-start;flex:0 1 auto;min-width: 50%;
-				&.nact{height: 200rpx;overflow: hidden;}
+				&.nact{height: 80rpx;overflow: hidden;}
 				&.act{height: auto;}
 				text{color: #AAAAAA;min-width: 104rpx;text-align-last: justify;flex: 0 0 auto;margin-right: 20rpx;
 					&.w65{width: 130rpx;}

work/pages/sqmyInfo/mine.vue

@@ -73,14 +73,14 @@
 		<view class="mbox">
 			<sqmy-info-list :datalist="list" :listtype="listtype" :wtdt="wtdt" :ztlxlist='ztlxlist' :tajdlist="tajdlist" :type='tabidx' @getDetail="getDetail"  @getTuiFn="getTuiFn"></sqmy-info-list>
 		</view>
-		<view v-if="checkPermi(['proposalInfo:info:add'])&&tabidx=='wdta'">
+		<view v-if="checkPermi(['sqmyInfo:info:add'])&&tabidx=='xxsb'">
 			<view style="height: 100rpx;"></view>
-			<view class="fwbtns" @click="getAddCase">提交提案</view>
+			<view class="fwbtns" @click="getAddsqmy">上报社情民意</view>
 		</view>
 		
 		
 		<!-- 弹窗 -->
-		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" @getFaFn="getFaFn" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+		<pop-up :type='ptype' :blfsList="matterList" :dflxlist="dflxlist" :blcdlist="blcdlist" @getFaFn="getFaFn" :mycdlist="mycdlist" :dataTree="deptTree" @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
 	</view>
 </template>
 
@@ -141,6 +141,7 @@
 				blcdlist:[],
 				mycdlist:[],
 				ztlxlist:[],//主题类型
+				dflxlist:[],//答复类型
 				ztlx:"",//主题
 				ztlxid:"",
 				ztlxidx:'',
@@ -244,6 +245,17 @@
 						})
 					}
 				})
+				//答复类型
+				getDictionaryFn('proposal_complex_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.dflxlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getConfirm(){
 				this.pageNum=1;
@@ -443,12 +455,11 @@
 				// 	})
 				}
 			},
-			getAddCase(){
-				if(uni.getStorageSync('tjtaList')){
-					// var newObj=JSON.parse(JSON.stringify(uni.getStorageSync('tjtaList')))
-					this.ptype='zcta'
+			getAddsqmy(){
+				if(uni.getStorageSync('sqmyList')){
+					this.ptype='sqmy'
 				}else{
-					this.$tab.navigateTo('/work/pages/case/add')
+					this.$tab.navigateTo('/work/pages/sqmyInfo/add')
 				}
 			},
 			getHeightFn(){
@@ -590,6 +601,7 @@
 				}else{
 					if(!checkPermi(['sqmyInfo:info:alllist'])&&tab=='qb'){
 						params.sqmyUserId=this.userId
+						// console.log(235)
 					}
 					getsqmyInfoListFn(params).then(res=>{
 						if(res.code==200){