投票显示修改

manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖源融资担保",
     "appid" : "__UNI__FA20DEF",
     "description" : "",
-    "versionName" : "1.3.0",
-    "versionCode" : 130,
+    "versionName" : "1.3.1",
+    "versionCode" : 131,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

work/pages/business/details.vue

@@ -58,8 +58,14 @@
 		<view class="main">
 			<!-- tab -->
 			<view class="tabs" :class="fixedflag?'tabfix':''">
+				<!-- 上会信息 -->
+				<template v-if="pfrom=='vote'">
+					<block v-for="(ite,idx) in tabListas" :key="idx">
+						<view v-if="!ite.limit||ite.limit&&!ite.limita&&checkPermi([ite.limit])||ite.limita&&ite.limit&&checkPermi([ite.limit])&&checkPermi([ite.limita])"  class="tab" :class="tabval==ite.val?'act':''"  @click="getTab(ite.val)">{{ite.tit}}</view>
+					</block>	
+				</template>
 				<!-- 保后信息 -->
-				<template v-if="pfrom=='bhxx'">
+				<template v-else-if="pfrom=='bhxx'">
 					<block v-for="(ite,idx) in tabLists" :key="idx">
 						<view v-if="!ite.limit||ite.limit&&!ite.limita&&checkPermi([ite.limit])||ite.limita&&ite.limit&&checkPermi([ite.limit])&&checkPermi([ite.limita])"  class="tab" :class="tabval==ite.val?'act':''"  @click="getTab(ite.val)">{{ite.tit}}</view>
 					</block>	
@@ -369,10 +375,10 @@
 				gdicoimg:require('@/work/static/images/gdico.png'),
 				tabval:0,
 				type:'',
-				tabList:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4,limit:'system:system:user'},{tit:"审核信息",val:5,limit:'system:system:user'},
-				{tit:"投票结果",val:6,limit:'system:system:user',limita:'c:conference:list:time'}],
+				tabList:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4,limit:'system:system:user'},{tit:"审核信息",val:5,limit:'system:system:user'}],
+				tabListas:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4,limit:'system:system:user'},{tit:"审核信息",val:5,limit:'system:system:user'},{tit:"投票结果",val:6,limit:'c:conference:list:time'}],
 				tabLists:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3},{tit:"文件出具",val:4,limit:'system:system:user'},{tit:"审核信息",val:5,limit:'system:system:user'},
-				{tit:"投票结果",val:6,limit:'system:system:user',limita:'c:conference:list:time'},{tit:"保后信息",val:7,limit:'system:system:user'},],
+				{tit:"投票结果",val:6,limit:'c:conference:list:time'},{tit:"保后信息",val:7,limit:'system:system:user'},],
 				stepList:[],
 				stepval:0,
 				gdflag:false,