线索状态

manifest.json

@@ -2,8 +2,8 @@
     "name" : "政协",
     "appid" : "__UNI__FF95F38",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages.json

@@ -255,7 +255,7 @@
 			{
 				"path": "pages/meeting/list",
 				"style": {
-					"navigationBarTitleText": "阅读详情",
+					"navigationBarTitleText": "会议活动列表",
 					"navigationBarBackgroundColor": "#1D64E2",
 					"navigationBarTextStyle": "white",
 					"h5":{"titleNView":false}

pages/index/index.vue

@@ -530,7 +530,7 @@
 
 .zxbox{
 	.bgimg{width: 100%;height: 420rpx;}
-	.zxmain{margin-top: -300rpx;z-index: 1;position: relative;
+	.zxmain{margin-top: -260rpx;z-index: 1;position: relative;
 		.htop{width: 25%;display: flex;flex-direction: column;align-items: center;justify-content: center;
 			.imgs{
 				width: 74rpx;height: 74rpx;display: flex;align-items: center;justify-content: center;

pages/report/index.vue

@@ -184,8 +184,8 @@
 			<view class="list" v-if="tabval!=0">
 				<view class="zfbox" v-if="tabval==2">个人提案方面总计得分 <text class="znum">{{scorecount.proposalScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==3">个人社情民意方面总计得分 <text class="znum">{{scorecount.sqmyScore||0}}</text> 分</view>
-		<!-- 		<view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
-				<view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view> -->
+				<view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
+				<!-- <view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view> -->
 				<view class="zfbox" v-if="tabval==7">个人招商方面总计得分 <text class="znum">{{scorecount.investmentScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==8">个人视察调研活动总计得分 <text class="znum">{{scorecount.activityScdyScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==9">个人政协委员工作室活动总计得分 <text class="znum">{{scorecount.activityLlzScore||0}}</text> 分</view>
@@ -266,10 +266,10 @@
 				scorecount:{},
 				tabval:0,
 				list:[],
-				tabList:[{tit:'履职状况',val:'0'},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'招商引资',val:7},
+				tabList:[{tit:'履职状况',val:'0'},{tit:'会议参与情况',val:4},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'招商引资',val:7},
 				{tit:'视察调研活动',val:8},{tit:'政协委员工作室活动',val:9},{tit:'界别活动',val:10},
 				{tit:'为群众办实事活动',val:11}
-				// {tit:'会议参与情况',val:4},{tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6},
+				// {tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6},
 				],
 				chartData:{
 					categories: ["政协提案","社情民意","招商","视察调研活动","政协委员工作室活动","界别活动","为群众办实事活动",],
@@ -365,6 +365,8 @@
 					this.$tab.navigateTo('/work/pages/case/details?id='+data)
 				}else if(val==3){//社情
 					this.$tab.navigateTo('/work/pages/sqmyInfo/details?id='+data)
+				}else if(val==4){//会议
+					this.$tab.navigateTo('/work/pages/meeting/details?id='+data)
 				}else if(val==7){//招商
 					this.$tab.navigateTo('/work/pages/meeting/zsyzdetails?id='+data)
 				}else{//活动
@@ -486,9 +488,9 @@
 			
 			
 						
-						// this.zxConferenceList=res.data.zxConferenceList;
-						// this.zxActivityList=res.data.zxActivityList;
-						// this.zxSpeakList=res.data.zxSpeakList;
+						this.zxConferenceList=res.data.zxConferenceList;
+						this.zxActivityList=res.data.zxActivityList;
+						this.zxSpeakList=res.data.zxSpeakList;
 					}
 				})
 			},

static/style.css

@@ -3,6 +3,7 @@
 .flex1{flex: 1 !important;}
 .flex0{flex: 0 0 auto;}
 .flex01{flex: 0 1 auto;}
+.flexdc{display: flex;flex-direction: column;flex: 1;}
 .flexcc{display: flex;align-items: center;justify-content: center;}
 .clearf::after {
   content: "";

work/components/meeting/list.vue

@@ -145,15 +145,7 @@
 					</view>
 					<view class="ftxt">
 						<text>状态</text>
-						
-						<view class="co0b" v-if="ite.type==2">已签约</view>
-						<!-- <view class="co0b" v-else-if="ite.type==3">已签约</view> -->
-						<view class="co0b" v-else>待签约</view>
-					</view>
-					<view class="casebtn  flexc" v-if="checkPermi(['zx:investment:examine'])&&type=='zsyz'">
-						<view class="lftit">点击按钮 即为同意</view>
-						<!-- <view class="btn btn2" v-if="ite.type==1"  @click.stop="getTuiFn(ite,'zsyzsh')">审核</view> -->
-						<view class="btn btn2" v-if="ite.type==1"  @click.stop="getTuiFn(ite,'zsyzqy')">签约</view>
+						<view class="co0b">{{kaType(ite.type,xsztlist)}}</view>
 					</view>
 				</block>
 				<!-- 会议活动，活动通知管理员 -->
@@ -230,6 +222,12 @@
 				return []
 			}
 		},
+		xsztlist:{
+			type: Array,
+			default () {
+				return []
+			}
+		},
 		listtype:{
 			type: [String,Number],
 			default () {

work/components/report/list.vue

@@ -99,7 +99,7 @@
 		</block>
 		<!-- 会议集合 -->
 		<block v-if="type==4">
-			<view class="talist" v-for="(ite,idx) in datalist" :key='idx'>
+			<view class="talist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.conferenceId)">
 				<view class="tit overtwo">{{ite.conferenceTitle}}</view>
 				<view class="f12 co6 fw5 mr24">{{kaType(ite.conferenceType,hylxlist)}}</view>
 				<view class="f12 co6 fw5">{{ite.conferenceDate}} {{ite.conferenceTime}}</view>

work/pages/case/details.vue

@@ -14,7 +14,7 @@
 			<view class="bghbox"></view>
 			<view class="dbox fmt30">
 				<!-- <text>【市政协十五届一 次会议第301号提案】</text> -->
-				<view class="dtit">关于{{datainfo.titile}}</view>
+				<view class="dtit">{{datainfo.title}}</view>
 				<!-- <view class="titbox mb14">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -99,10 +99,12 @@
 					<block v-if="ite.zxFjList.length">
 						<view class="txt fjbox">
 							<text class="w65">附件</text>
-							<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fite.id' @click="getDown(fite.url)">
-								<view class="imgl"><image :src="fjimg" ></image></view>
-								<view class="tit">{{fite.name}}</view>
-								<view class="fjlook">查看</view>
+							<view class="flexdc">
+								<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fite.id' @click="getDown(fite.url)">
+									<view class="imgl"><image :src="fjimg" ></image></view>
+									<view class="tit">{{fite.name}}</view>
+									<view class="fjlook">查看</view>
+								</view>
 							</view>
 						</view>
 					</block>
@@ -113,11 +115,14 @@
 					<block v-if="datainfo.dfFjList&&datainfo.dfFjList.length">
 						<view class="txt fjbox">
 							<text class="w65">附件</text>
-							<view class="fjlists flext"  v-for="(fite,fidx) in datainfo.dfFjList" :key='fidx' @click="getDown(fite.url)">
-								<view class="imgl"><image :src="fjimg" ></image></view>
-								<view class="tit">{{fite.name}}</view>
-								<view class="fjlook">查看</view>
+							<view class="flexdc">
+								<view class="fjlists flext"  v-for="(fite,fidx) in datainfo.dfFjList" :key='fidx' @click="getDown(fite.url)">
+									<view class="imgl"><image :src="fjimg" ></image></view>
+									<view class="tit">{{fite.name}}</view>
+									<view class="fjlook">查看</view>
+								</view>
 							</view>
+							
 						</view>
 					</block>
 				</view>
@@ -191,7 +196,7 @@
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<!-- 按角色选择按钮 -->
 				<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'])">修改</view>
+				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['proposalInfo:info:edit'])&&progress<8&&progress!=3">修改</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 -->

work/pages/meeting/addzsyz.vue

@@ -32,7 +32,15 @@
 							<view :class="datainfo.publishTime?'':'coa'">{{datainfo.publishTime || "请选择录入日期"}}</view>
 						</view>
 					</uni-forms-item>
-				</picker>		
+				</picker>
+				<picker  range-key='label' :value="xsztidx" :range="xsztlist"   @change='bindDateChangec'>
+					<uni-forms-item label="线索状态" name="type" required>
+						<view class="lbtabp">
+							<view v-if="datainfo.type&&!xszttxt">{{statusFormat(datainfo.type,xsztlist)}}</view>
+							<view v-else :class="xszttxt?'':'coa'">{{xszttxt||"请选择线索状态"}}</view>
+						</view>	
+					</uni-forms-item>
+				</picker>
 			</view>
 			<view class="boxs pdbox">
 				<view class="titbox mb14 flexc">
@@ -85,6 +93,9 @@
 				hylxidx:"",
 				pbFlag:false,
 				readOnly:false,
+				xsztlist:[],
+				xsztidx:'',
+				xszttxt:'',
 			}
 		},
 		onUnload(){
@@ -104,6 +115,18 @@
 		methods:{
 			checkPermi, checkRole,
 			init(){
+				// 线索状态
+				getDictionaryFn('investment_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.xsztlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
+				
 			},
 			kayType(ite,list){
 				return selectValue(list, ite);
@@ -119,6 +142,11 @@
 				var val=e.detail.value;
 				this.datainfo.publishTime=val;
 			},
+			bindDateChangec(e){
+				var val=e.detail.value;
+				this.xszttxt=this.xsztlist[val].label;
+				this.datainfo.type=this.xsztlist[val].value
+			},
 			getDetail(){
 				var that=this;
 				var params={
@@ -159,6 +187,10 @@
 						return
 					}
 				}
+				if(!this.datainfo.type){
+					this.$toast("请选择线索状态")
+					return
+				}
 				var params=this.datainfo
 				that.editorCtx.getContents({
 					success: function(data) {

work/pages/meeting/list.vue

@@ -64,7 +64,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="mbox">
-			<meet-list :datalist="list" :wtdt="wtdt" :hdlxlist="hdlxlist" :fylxlist='fylxlist' :qjlxlist="aqjlxlist"  :type='tabidx' @getDetail="getDetail" @getReadFn="getReadFn" @getTuiFn="getTuiFn"></meet-list>
+			<meet-list :datalist="list" :wtdt="wtdt" :xsztlist="xsztlist" :hdlxlist="hdlxlist" :fylxlist='fylxlist' :qjlxlist="aqjlxlist"  :type='tabidx' @getDetail="getDetail" @getReadFn="getReadFn" @getTuiFn="getTuiFn"></meet-list>
 		</view>
 		<view v-if="checkPermi(['zxConference:conference:add'])||checkPermi(['zx:speak:add'])||checkPermi(['zxActivity:activity:add'])">
 			<view style="height: 100rpx;"></view>
@@ -120,6 +120,7 @@
 				hdlxlist:[],
 				aqjlxlist:[],
 				hylxlist:[],
+				xsztlist:[],
 				hdlxtxt:'',
 				hdlxid:'',
 				hylxtxt:'',
@@ -208,6 +209,17 @@
 						})
 					}
 				})
+				// 线索状态
+				getDictionaryFn('investment_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.xsztlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			bindDateChangeb(e){
 				var val=e.detail.value;

work/pages/meeting/people.vue

@@ -13,7 +13,7 @@
 				<view class="lbtabs flexc">
 					<view class="lbtabp">
 						<picker  range-key='label' :value="jbidx" :range="jblist"  @change='bindDateChangea'>
-							<view >{{jbtxt || "选择届次"}}</view>
+							<view >{{jbtxt || "选择届别"}}</view>
 						</picker>
 						<image :src="upimg" class="upimg"></image>
 					</view>

work/pages/meeting/zsyzdetails.vue

@@ -11,10 +11,7 @@
 					<view class="txt"><text>联系人</text>{{datainfo.contactsName}}</view>
 					<view class="txt"><text>联系方式</text>{{datainfo.contactsPhone}}</view>
 					<view class="txt"><text>录入时间</text>{{datainfo.publishTime}}</view>
-					<view class="txt"><text>状态</text>
-					<block v-if="datainfo.type=='2'">已签约</block>
-					<block v-else>待签约</block>
-					</view>
+					<view class="txt"><text>状态</text>{{typeFormat(datainfo.type,xsztlist)}}</view>
 					<!-- <view class="txt"><text>备注</text>{{datainfo.remark}}</view> -->
 				</view>
 			</view>
@@ -38,10 +35,6 @@
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<view class="btn btn3" @click="getDelFn" v-if="checkPermi(['zx:investment:remove'])">删除</view>
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['zx:investment:edit'])">修改</view>
-				<block v-if="checkPermi(['zx:investment:examine'])&&type=='zsyz'">
-					<!-- <view class="btn btn2" v-if="datainfo.type==1"  @click.stop="getShFn('zsyzsh')">审核</view> -->
-					<view class="btn btn2" v-if="datainfo.type==1"  @click.stop="getShFn('zsyzqy')">签约</view>
-				</block>
 			</view>
 			
 		</view>
@@ -76,6 +69,7 @@
 				tary:'',
 				hdlxlist:[],
 				qjlxlist:[],
+				xsztlist:[],
 				type:'',
 				dfinfo:{}
 			}
@@ -116,46 +110,19 @@
 			typeFormattext(ite,list){
 				return selectValuetext(list, ite);
 			},
-			getShFn(type){
-				var that=this;
-				uni.showModal({
-					title: '确认签约',
-					content: "是否确认签约",
-					cancelText: '取消',
-					confirmText: '确认',
-					success: function(res) {
-						if (res.confirm) {
-							var params={
-								investmentId:that.id,
-								type:2
+			init(){
+				// 线索状态
+				getDictionaryFn('investment_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.xsztlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
 							}
-							getinvestmentshlFn(params).then(res=>{
-								if(res.code==200){
-									that.$toast('签约成功')
-									uni.$emit('refreshlist')
-									that.ptype='';
-									that.getDetail()
-								}
-							})
-						} else if (res.cancel) {
-							
-						}
+						})
 					}
 				})
 			},
-			init(){
-				// 活动类型
-				// getDictionaryFn('activity_type').then(res=>{
-				// 	if(res.code==200&&res.data.length){
-				// 		this.hdlxlist = res.data.map(v => {
-				// 			return {
-				// 				label: v.dictLabel,
-				// 				value:v.dictValue
-				// 			}
-				// 		})
-				// 	}
-				// })
-			},
 			getupSubmit(e){
 				var that=this;
 				var type=this.ptype;

work/pages/report/addscore.vue

@@ -177,7 +177,7 @@
 				
 				
 				dfdwpicker: {
-					title: '选择考核届次',
+					title: '选择考核界别',
 					layer: null,
 					titflag:true,
 					data: []

work/pages/report/details.vue

@@ -39,6 +39,36 @@
 					<view class="txt"><text>乡镇(经开区)委员工作室</text>{{kaType(memberInfo.studio,wybgslist)}}</view>
 				</view>
 			</view>
+			<view class="dbox">
+				<view class="titbox mb27 flexc">
+					<view class="tit flexc flex1">
+						<image :src="titimg"></image>
+						<view>会议参与情况</view>
+					</view>
+					<view class="tips">请左右滑动查看详细信息</view>
+				</view>
+				<view class="mb10">
+					<block v-if="zxConferenceList&&zxConferenceList.length">
+						<zb-table
+						  :show-header="true"
+						  :columns="hycolumns"
+						  :headbgColor="headbgColor"
+						  :stripe="false"
+						  :fit="true"
+						  :parameter="parameter"
+						  @rowClick="getDetailhy"
+						  @toggleRowSelection="toggleRowSelection"
+						  @toggleAllSelection="toggleAllSelection"
+						  :border="border"
+						  :borderr="borderr"
+						  @detail="getDetailhy"
+						  :data="zxConferenceList"></zb-table>
+					</block>
+					<block v-else>
+						<no-data padtop="0" padbottom="20"></no-data>
+					</block>
+				</view>
+			</view>
 			<view class="dbox">
 				<view class="titbox mb27 flexc">
 					<view class="tit flexc flex1">
@@ -280,36 +310,6 @@
 					</block>
 				</view>
 			</view> -->
-			<!-- <view class="dbox">
-				<view class="titbox mb27 flexc">
-					<view class="tit flexc flex1">
-						<image :src="titimg"></image>
-						<view>会议参与情况</view>
-					</view>
-					<view class="tips">请左右滑动查看详细信息</view>
-				</view>
-				<view class="mb10">
-					<block v-if="zxConferenceList&&zxConferenceList.length">
-						<zb-table
-						  :show-header="true"
-						  :columns="hycolumns"
-						  :headbgColor="headbgColor"
-						  :stripe="false"
-						  :fit="true"
-						  :parameter="parameter"
-						  @rowClick="rowClick"
-						  @toggleRowSelection="toggleRowSelection"
-						  @toggleAllSelection="toggleAllSelection"
-						  :border="border"
-						  :borderr="borderr"
-						  @detail="getDetails"
-						  :data="zxConferenceList"></zb-table>
-					</block>
-					<block v-else>
-						<no-data padtop="0" padbottom="20"></no-data>
-					</block>
-				</view>
-			</view> -->
 			<!-- <view class="dbox">
 				<view class="titbox mb27 flexc">
 					<view class="tit flexc flex1">
@@ -390,6 +390,7 @@
 					{ name: 'investmentAmount', label: '拟投资额 ',width:230,align:'center', },
 					{ name: 'contactsName', label: '联系人',align:'center',},
 					{ name: 'contactsPhone', label: '联系方式',align:'center',},
+					{ name: 'type', label: '状态',align:'center',type:"format",key:"xsztlist"},
 					{ name: 'publishTime', label: '录入时间',align:'center',},
 				],
 				hycolumns:[{ name: 'conferenceTitle', label: '会议名称 ',width:230,align:'center', },
@@ -418,6 +419,7 @@
 					fylxlist:[],
 					tajdlist:[],
 					sqjdlist:[],
+					xsztlist:[],
 					sflalist:[ {label: '是',value:'0'},{label: '否',value:'0'},]
 				},
 				border:true,
@@ -471,6 +473,10 @@
 			typeFormat(ite,list){
 				return selectValue(list, ite);
 			},
+			getDetailhy(e){
+				var data=e.conferenceId
+				this.$tab.navigateTo('/work/pages/meeting/details?id='+data)
+			},
 			getDetailta(e){
 				var data=e.proposalId
 				this.$tab.navigateTo('/work/pages/case/details?id='+data)
@@ -538,6 +544,17 @@
 						})
 					}
 				})
+				// 线索状态
+				getDictionaryFn('investment_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.parameter.xsztlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value:v.dictValue
+							}
+						})
+					}
+				})
 				// 主题类型
 				getDictionaryFn('sqmy_topic_type').then(res=>{
 					if(res.code==200&&res.data.length){
@@ -638,8 +655,7 @@
 						this.activityLlzList=res.data.activityLlzList;
 						this.activityJbList=res.data.activityJbList;
 						this.activityBssList=res.data.activityBssList;
-						
-						// this.zxConferenceList=res.data.zxConferenceList;
+						this.zxConferenceList=res.data.zxConferenceList;
 						// this.zxActivityList=res.data.zxActivityList;
 						// this.zxSpeakList=res.data.zxSpeakList;
 						// if(res.data.zxFjList&&res.data.zxFjList.length){

work/pages/report/info.vue

@@ -189,7 +189,11 @@
 			},
 			getReafFn(){
 				var that=this;
+				uni.showLoading({
+					title: '加载中',
+				})
 				getinfoScoreFn().then(res=>{
+					uni.hideLoading()
 					if(res.code==200){
 						that.getrefreshData()
 					}

work/pages/report/report.vue

@@ -136,11 +136,11 @@
 					<!-- <view class="gslist">
 						<view class="gtit">活动</view>
 						<view class="gtxt">{{scorecount.activityScore}}</view>
-					</view>
+					</view> -->
 					<view class="gslist">
 						<view class="gtit">会议</view>
 						<view class="gtxt">{{scorecount.conferenceScore}}</view>
-					</view> -->
+					</view>
 					<view class="gslist">
 						<view class="gtit">社情民意</view>
 						<view class="gtxt">{{scorecount.sqmyScore}}</view>
@@ -184,8 +184,8 @@
 			<view class="list" v-if="tabval!=0">
 				<view class="zfbox" v-if="tabval==2">个人提案方面总计得分 <text class="znum">{{scorecount.proposalScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==3">个人社情民意方面总计得分 <text class="znum">{{scorecount.sqmyScore||0}}</text> 分</view>
-		<!-- 		<view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
-				<view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view> -->
+				<view class="zfbox" v-if="tabval==4">个人会议参与情况总计得分 <text class="znum">{{scorecount.conferenceScore||0}}</text> 分</view>
+				<!-- <view class="zfbox" v-if="tabval==5">个人活动参与情况总计得分 <text class="znum">{{scorecount.activityScore||0}}</text> 分</view> -->
 				<view class="zfbox" v-if="tabval==7">个人招商方面总计得分 <text class="znum">{{scorecount.investmentScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==8">个人视察调研活动总计得分 <text class="znum">{{scorecount.activityScdyScore||0}}</text> 分</view>
 				<view class="zfbox" v-if="tabval==9">个人政协委员工作室活动总计得分 <text class="znum">{{scorecount.activityLlzScore||0}}</text> 分</view>
@@ -253,10 +253,10 @@
 				scorecount:{},
 				tabval:0,
 				list:[],
-				tabList:[{tit:'履职状况',val:'0'},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'招商引资',val:7},
+				tabList:[{tit:'履职状况',val:'0'},{tit:'会议参与情况',val:4},{tit:'提案方面',val:2},{tit:'社情民意方面',val:3},{tit:'招商引资',val:7},
 				{tit:'视察调研活动',val:8},{tit:'政协委员工作室活动',val:9},{tit:'界别活动',val:10},
 				{tit:'为群众办实事活动',val:11}
-				// {tit:'会议参与情况',val:4},{tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6},
+				// {tit:'活动参与情况',val:5},{tit:'会议发言情况',val:6},
 				],
 				chartData:{
 					categories: ["政协提案","社情民意","招商","视察调研活动","政协委员工作室活动","界别活动","为群众办实事活动",],
@@ -352,6 +352,8 @@
 					this.$tab.navigateTo('/work/pages/case/details?id='+data)
 				}else if(val==3){//社情
 					this.$tab.navigateTo('/work/pages/sqmyInfo/details?id='+data)
+				}else if(val==4){//会议
+					this.$tab.navigateTo('/work/pages/meeting/details?id='+data)
 				}else if(val==7){//招商
 					this.$tab.navigateTo('/work/pages/meeting/zsyzdetails?id='+data)
 				}else{//活动
@@ -470,12 +472,9 @@
 						this.activityLlzList=res.data.activityLlzList||[];
 						this.activityJbList=res.data.activityJbList||[];
 						this.activityBssList=res.data.activityBssList||[];
-
-
-						
-						// this.zxConferenceList=res.data.zxConferenceList;
-						// this.zxActivityList=res.data.zxActivityList;
-						// this.zxSpeakList=res.data.zxSpeakList;
+						this.zxConferenceList=res.data.zxConferenceList||[];
+						this.zxActivityList=res.data.zxActivityList||[];
+						this.zxSpeakList=res.data.zxSpeakList||[];
 					}
 				})
 			},

work/pages/sqmyInfo/details.vue

@@ -14,7 +14,7 @@
 			<view class="bghbox"></view>
 			<view class="dbox fmt30">
 				<!-- <text>【市政协十五届一 次会议第301号提案】</text> -->
-				<view class="dtit">关于{{datainfo.title}}</view>
+				<view class="dtit">{{datainfo.title}}</view>
 				<!-- <view class="titbox mb14">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -104,10 +104,12 @@
 					<block v-if="ite.zxFjList.length">
 						<view class="txt fjbox">
 							<text class="w65">附件</text>
-							<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fidx' @click="getDown(fite.url)">
-								<view class="imgl"><image :src="fjimg" ></image></view>
-								<view class="tit">{{fite.name}}</view>
-								<view class="fjlook">查看</view>
+							<view class="flexdc">
+								<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fidx' @click="getDown(fite.url)">
+									<view class="imgl"><image :src="fjimg" ></image></view>
+									<view class="tit">{{fite.name}}</view>
+									<view class="fjlook">查看</view>
+								</view>
 							</view>
 						</view>
 					</block>
@@ -196,7 +198,7 @@
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<!-- 按角色选择按钮 -->
 				<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'])">修改</view>
+				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['sqmyInfo:info:edit'])&&progress<2">修改</view>
 				<view class="btn btn2" @click="getScfkFn('sfcy')" 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>
@@ -204,7 +206,7 @@
 				<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('bzhf')" v-if="checkPermi(['sqmyInfo:info:idea'])">备注回复</view> -->
-				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])">政协意见</view>
+				<view class="btn btn2" @click="getScfkFn('zxmyfk')" v-if="checkPermi(['sqmyInfo:info:zxIdea'])">备注回复</view>
 				
 				<!--委员答复填内容，委员填满意度 -->
 				<!--协办单位，主办单位 填办理方式，办理程度，内容 附件 -->