zouling před 1 rokem
rodič
revize
e765ec6772

+ 2 - 4
components/swiper/notice.vue

@@ -5,10 +5,8 @@
 			<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" @click="getDetail(ite.zxNoticeId)">
-						<view class="tit over" v-if="ite.noticeContent">
-						<rich-text :nodes="ite.noticeContent"></rich-text>
-						</view>
-						<view class="time">{{ite.updateTime}}</view>
+						<view class="tit over">{{ite.noticeTitle}}</view>
+						<view class="time">{{ite.issuerTime}}</view>
 					</view>
 				</swiper-item>
 <!-- 				<swiper-item>

+ 11 - 9
pages/index/index.vue

@@ -246,14 +246,16 @@
 			this.fixedflag=false
 		}
 	},
+	onUnload(){
+		uni.$off('refreshlist')
+	},
 	onLoad: function() {
-		// uni.$on('refreshdatalist',(e) => {
-		// 	this.reachflag=false;
-		// 	this.pageNum=1;
-		// 	this.list=[];
-		// 	this.getDataFn();
-		// })
-		
+		uni.$on('refreshlist',(e) => {
+			this.reachflag=false;
+			this.pageNum=1;
+			this.list=[];
+			this.getDataFn();
+		})	
 		this.init()
 		this.getDataFn()
 		if(checkPermi(['zxNotice:notice:list'])){
@@ -462,7 +464,7 @@
 							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
 							if (num < res.total) {
 								this.reachflag = true
-								this.wtdt = '上拉加载更多'
+								this.wtdt = ''
 							} else {
 								this.reachflag = false
 								this.wtdt = '到底了~';
@@ -487,7 +489,7 @@
 							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
 							if (num < res.total) {
 								this.reachflag = true
-								this.wtdt = '上拉加载更多'
+								this.wtdt = ''
 							} else {
 								this.reachflag = false
 								this.wtdt = '到底了~';

+ 3 - 1
pages/report/index.vue

@@ -194,7 +194,7 @@
 				upimg:require("@/work/static/images/report/up.png"),
 				upmimg:require("@/static/images/home/up.png"),
 				backgroundColor:'transparent',
-				year:'2024',
+				year:'',
 				
 				wtdt:'',
 				memberInfo:{},
@@ -256,6 +256,8 @@
 		},
 		onLoad(e) {
 			this.id=e.id;
+			var date = new Date();
+			this.year= date.getFullYear();
 			this.getDetail()
 			this.init()
 		},

binární
static/images/home/kricoa.png


binární
static/images/home/kricob.png


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

@@ -14,9 +14,9 @@
 				<view class="newsr">
 					<view class="flexc over mb8">
 						<view class="tit over">{{ite.noticeTitle}}</view>
-						<view class="time">{{ite.createTime}}</view>
+						<view class="time">{{ite.issuerTime}}</view>
 					</view>
-					<view class=" txt"><rich-text :nodes="ite.noticeContent"></rich-text></view>
+					<view class="txt overtwo"><rich-text :nodes="ite.noticeContent" v-if="ite.noticeContent"></rich-text></view>
 					<!-- <view class="overtwo txt">{{ite.noticeContent}}</view> -->
 				</view>
 			</view>

+ 1 - 1
work/components/report/list.vue

@@ -75,7 +75,7 @@
 			<view class="talist" v-for="(ite,idx) in datalist" :key='idx'>
 				<view class="tit overtwo">{{ite.title}}</view>
 				<view class="flexc">
-					<view class="f12 co6 fw5 mr24">{{ite.isJointly}}</view>
+					<view class="f12 co6 fw5 mr24">{{ite.isJointly=='是'?'联名提案':'个人提案'}}</view>
 					<view class="f12 co6 fw5">{{ite.createTime}}</view>
 				</view>
 				<view class="mt9 flexcj">

+ 22 - 20
work/components/single/list.vue

@@ -89,7 +89,7 @@
 		<!-- 提案催办 -->
 		<block v-if="type=='tncb'">
 			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' >
-				<view class="tit overtwo">{{ite.title}}</view>
+				<!-- <view class="tit overtwo">{{ite.title}}</view> -->
 				<view class="ftxt">
 					<text>催办标题</text>
 					<view>{{ite.urgeTitle}}</view>
@@ -98,29 +98,31 @@
 					<text>催办类型</text>
 					<view>{{ite.urgeType==1?'提案催办':'社情名义催办'}}</view>
 				</view>
-				<view class="ftxt">
-					<text>催办内容</text>
-					<view>{{ite.urgeContent}}</view>
-				</view>
-				<view class="ftxt">
-					<text>发布人</text>
-					<view>{{ite.issuer}}</view>
-				</view>
-				<view class="ftxt">
-					<text>发布单位</text>
-					<view>{{ite.issuerDept}}</view>
-				</view>
-				<view class="ftxt">
-					<text>接收人</text>
-					<view>{{ite.acceptUser}}</view>
+				<view class="flexcw">
+					<view class="ftxt">
+						<text>发布人</text>
+						<view>{{ite.issuer}}</view>
+					</view>
+					<view class="ftxt">
+						<text>接收单位</text>
+						<view>{{ite.acceptDept}}</view>
+					</view>
+					<!-- <view class="ftxt">
+						<text>接收人</text>
+						<view>{{ite.acceptUser}}</view>
+					</view> -->
+					<!-- <view class="ftxt">
+						<text>发布单位</text>
+						<view>{{ite.issuerDept}}</view>
+					</view> -->
 				</view>
 				<view class="ftxt">
-					<text>接收单位</text>
-					<view class="co0b">{{ite.acceptDept}}</view>
+					<text>催办时间</text>
+					<view>{{ite.urgeTime}}</view>
 				</view>
 				<view class="ftxt">
-					<text>接收单位</text>
-					<view class="co0b">{{ite.urgeTime}}</view>
+					<text>催办内容</text>
+					<view>{{ite.urgeContent}}</view>
 				</view>
 				<!-- <view class="ftxt">
 					<text>催办状态</text>

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

@@ -45,7 +45,7 @@
 					</uni-forms-item>
 				</picker>
 			</view>
-			<view class="boxs pdbox" style="display: none;">
+			<view class="boxs pdbox">
 				<view class="titbox mb14">
 					<view class="tit flexc">
 						<image :src="titimg"></image>

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

@@ -11,7 +11,7 @@
 					<view class="txt"><text>关联会议</text>{{datainfo.conferenceTitle}}</view>
 					<view class="txt"><text>发言单位</text>{{datainfo.speakUnit}}</view>
 					<view class="txt"><text>发言类型</text>{{typeFormat(datainfo.speakType,fylxlist)}}</view>
-					<view class="txt"><text>备注</text>{{datainfo.remark}}</view>
+					<!-- <view class="txt"><text>备注</text>{{datainfo.remark}}</view> -->
 				</view>
 			</view>
 			<view class="dbox">

+ 1 - 0
work/pages/news/detail.vue

@@ -9,6 +9,7 @@
 					<view class="txt"><text>通知类别</text>{{typeFormat(datainfo.noticeType,tzlbList)}}</view>
 					<view class="txt"><text>发布人</text>{{datainfo.issuer}}</view>
 					<view class="txt"><text>发布单位</text>{{datainfo.issuerDept}}</view>
+					<view class="txt"><text>发布时间</text>{{datainfo.issuerTime}}</view>
 					<view class="txt"><text>通知内容</text>
 						<rich-text :nodes="datainfo.noticeContent"></rich-text>
 					</view>

+ 56 - 6
work/pages/report/details.vue

@@ -55,6 +55,7 @@
 					  :headbgColor="headbgColor"
 					  :stripe="false"
 					  :fit="true"
+					  :parameter="parameter"
 					  @rowClick="rowClick"
 					  @toggleRowSelection="toggleRowSelection"
 					  @toggleAllSelection="toggleAllSelection"
@@ -84,6 +85,7 @@
 						  :headbgColor="headbgColor"
 						  :stripe="false"
 						  :fit="true"
+						  :parameter="parameter"
 						  @rowClick="rowClick"
 						  @toggleRowSelection="toggleRowSelection"
 						  @toggleAllSelection="toggleAllSelection"
@@ -173,6 +175,7 @@
 					  :headbgColor="headbgColor"
 					  :stripe="false"
 					  :fit="true"
+					  :parameter="parameter"
 					  @rowClick="rowClick"
 					  @toggleRowSelection="toggleRowSelection"
 					  @toggleAllSelection="toggleAllSelection"
@@ -218,12 +221,18 @@
 				backgroundColor:"#1D64E2",
 				titimg:require("@/work/static/images/titbg.png"),
 				columns: [
-				    { name: 'num', label: '案号',width:230,align:'center', },
-				    { name: 'name', label: '题目',align:'center'},
+				    { name: 'proposalNumber', label: '案号',width:230,align:'center', },
+				    { name: 'title', label: '题目',align:'center'},
+					{ name: 'categoryName', label: '提案类别',align:'center',},
+				    { name: 'isRecord', label: '是否立案',align:'center',type:"format",key:"sflalist"}, 
+				    { name: 'proposalProgress', label: '提案进度',align:'center',type:"format",key:"tajdlist"},
 				],
 				zxcolumns: [
-				    { name: 'num', label: '信息标题 ',width:230,align:'center', },
-				    { name: 'name', label: '类型',align:'center'},
+				    { name: 'sqmyNumber', label: '案号',width:230,align:'center', },
+				    { name: 'title', label: '信息标题 ',width:230,align:'center', },
+				    { name: 'topicType', label: '主题类型',align:'center',type:"format",key:"ztlxlist"},
+					{ name: 'isRecord', label: '是否立案',align:'center',type:"format",key:"sflalist"},
+					{ name: 'sqmyProgress', label: '提案进度',align:'center',type:"format",key:"tajdlist"},
 				],
 				hycolumns:[{ name: 'conferenceTitle', label: '会议名称 ',width:230,align:'center', },
 					{ name: 'conferenceType', type:"format", label: '会议类型',align:'center',key:"hylxlist"},
@@ -232,22 +241,30 @@
 					{ name: 'conferenceAddress', label: '会议地点',align:'center'},],
 				hdcolumns: [
 				    { name: 'activityTitle', label: '活动名称 ',width:230,align:'center', },
+					{ name: 'activityType', type:"format", label: '活动类型',align:'center',key:"hdlxlist"},
 				    { name: 'activityDate', label: '活动日期',align:'center'},
+				    { name: 'activityTime', label: '活动时间',align:'center'},
 				    { name: 'activityAddress', label: '活动地点',align:'center'},
-				    { name: 'activityType', type:"format", label: '活动类型',align:'center',key:"hdlxlist"},
 				],
 				fycolumns: [
 				    { name: 'speakTitle', label: '发言题目 ',width:230,align:'center', },
 				    { name: 'conferenceTitle', label: '关联会议',align:'center'},
+				    { name: 'inputName', label: '录入人',align:'center'},
+				    { name: 'speakType', label: '发言类型',align:'center',type:"format",key:"fylxlist"},
+				    { name: 'publishTime', label: '录入时间',align:'center'},
 				],
 				parameter:{
 					hdlxlist:[],
 					hylxlist:[],
+					ztlxlist:[],
+					fylxlist:[],
+					tajdlist:[],
+					sflalist:[ {label: '是',value:'0'},{label: '否',value:'0'},]
 				},
 				border:true,
 				borderr:false,
 				headbgColor:'#F1F1F1',
-				tableData:[{num:"111",name:'题目关于拓展市校合作,助推高质量发展的建议'},{num:"111",name:'题目关于拓展市校合作,助推高质量发展的建议'}],
+				tableData:[],
 				dwdetList:[],
 				dwVal:0,
 				ptype:'',
@@ -313,6 +330,39 @@
 						})
 					}
 				})
+				// 提案进度
+				getDictionaryFn('proposal_progress').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.parameter.tajdlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 主题类型
+				getDictionaryFn('sqmy_topic_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.parameter.ztlxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
+				// 发言类型
+				getDictionaryFn('speak_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.parameter.fylxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
 				//会议类型
 				getDictionaryFn('conference_type').then(res=>{
 					if(res.code==200&&res.data.length){

+ 3 - 1
work/pages/report/report.vue

@@ -181,7 +181,7 @@
 				upimg:require("@/work/static/images/report/up.png"),
 				upmimg:require("@/static/images/home/up.png"),
 				backgroundColor:'transparent',
-				year:'2024',
+				year:'',
 				
 				wtdt:'',
 				memberInfo:{},
@@ -243,6 +243,8 @@
 		},
 		onLoad(e) {
 			this.id=e.id;
+			var date = new Date();
+			this.year= date.getFullYear();
 			this.getDetail()
 			this.init()
 		},

+ 1 - 1
work/pages/single/urge.vue

@@ -39,7 +39,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="mbox">
-			<single-list :datalist="list" :wtdt="wtdt" :tajdlist='tajdlist' :type='tabidx' @getDetail="getDetail" @getTuiFn="getTuiFn"></single-list>
+			<single-list :datalist="list" :wtdt="wtdt" :tajdlist='tajdlist' type='tncb' @getDetail="getDetail" @getTuiFn="getTuiFn"></single-list>
 		</view>
 		<!-- 弹窗 -->
 		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist"  @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>