zouling 1 year ago
parent
commit
52c9cc10d9
4 changed files with 7 additions and 6 deletions
  1. 2 2
      manifest.json
  2. 2 2
      work/pages/case/mine.vue
  3. 1 1
      work/pages/meeting/addactive.vue
  4. 2 1
      work/pages/report/info.vue

+ 2 - 2
manifest.json

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

+ 2 - 2
work/pages/case/mine.vue

@@ -104,7 +104,7 @@
 				tabtype:'',//进度查询
 				// {tit:'征集通知',val:0}, 提案催办 目前看所有
 				tabList:[
-					{tit:'提案列表',val:'qb',limit:'proposalInfo:info:list'},
+					{tit:'提案列表',val:'qb',limit:'proposalInfo:info:alllist'},
 					{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'},
@@ -744,7 +744,7 @@
 					if(this.tabidx=='qb'&&this.tajd){
 						params.proposalProgress=this.tajdid
 					}
-					if(!checkPermi(['proposalInfo:info:alllist'])&&this.tabidx=='qb'){
+					if(this.tabidx=='wdta'){
 						params.proposalUserId=this.userId
 					}
 					getCaseListFn(params).then(res=>{

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

@@ -344,7 +344,7 @@
 				that.editorCtx.getContents({
 					success: function(data) { 
 						var params=that.datainfo;
-						params.contactsContent=data.html;
+						params.activityDetails=data.html;
 						var regex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
 						var s=regex.test(that.datainfo.activityDate);
 						if(!s){

+ 2 - 1
work/pages/report/info.vue

@@ -61,8 +61,9 @@
 			<view v-if="checkPermi(['member:info:alllist'])||tabidx=='jfju'" style="height: 112rpx;"></view>
 			<report-list :type="tabidx" :datalist="list" :wtdt="wtdt" :khlxList='khlxList' :jflxList="jflxList"  :wybgslist="wybgslist" :jblist='jblist'  @getDetail="getDetail" @getTuiFn="getTuiFn"></report-list>
 		</view>
-		<view style="height: 100rpx;" v-if="checkPermi(['member:info:add'])&&tabidx=='lzxx'"></view>
+		<view style="height: 100rpx;" v-if="checkPermi(['member:info:add','zxBonus:bonus:add'])"></view>
 		<view class="fwbtns" @click="getAddFn" v-if="checkPermi(['member:info:add'])&&tabidx=='lzxx'">履职档案</view>
+		<view class="fwbtns" @click="getChFn" v-if="checkPermi(['zxBonus:bonus:add'])&&tabidx=='jfju'">履职加分</view>
 		
 		<!-- 弹窗 -->
 		<pop-up :type='ptype' @getClose="getClose"></pop-up>