投票修改

api/mine/work.js

@@ -160,4 +160,60 @@ export function getAuthorize(data) {
     'method': 'post',
 	'data':data
   })
+}
+// 管理员同意上会审核按钮system:application:review
+export function getReview(data) {
+  return request({
+    'url': '/application/review',
+    'method': 'post',
+	'data':data
+  })
+}
+// 随机生成参会人员c:conference:randomAdd
+export function getVoteFive(data) {
+  return request({
+    'url': '/conference/random/five',
+    'method': 'post',
+	'data':data
+  })
+}
+// 投票人员按照时间分组c:conference:list:time
+export function getVoteTimeList(data) {
+  return request({
+    'url': '/conference/app/time/list',
+    'method': 'get',
+	'data':data
+  })
+}
+// 投票c:conference:vote
+export function getVoteAdd(data) {
+  return request({
+    'url': '/conference/vote',
+    'method': 'post',
+	'data':data
+  })
+}
+// 投票贷款申请-列表system:application:conference:list
+export function getVoteList(data) {
+  return request({
+    'url': '/application/conference/list',
+    'method': 'get',
+	'data':data
+  })
+}
+// 重新投票c:conference:again
+export function getcxVoteAdd(data) {
+  return request({
+    'url': '/conference/again',
+    'method': 'post',
+	'data':data
+  })
+}
+// 一票否决c:conference:finish
+export function getVoteFinish(data) {
+  return request({
+    'url': '/conference/finish',
+    'method': 'post',
+	'data':data
+  })
 }

pages.json

@@ -240,6 +240,24 @@
 					"h5":{"titleNView":false}
 				}
 			},
+			{
+				"path": "pages/business/votelist",
+				"style": {
+					"navigationBarTitleText": "上会列表",
+					"navigationBarBackgroundColor": "#00A9F0",
+					"navigationBarTextStyle": "white",
+					"h5":{"titleNView":false}
+				}
+			},
+			{
+				"path": "pages/business/vote",
+				"style": {
+					"navigationBarTitleText": "投票结果",
+					"navigationBarBackgroundColor": "#00A9F0",
+					"navigationBarTextStyle": "white",
+					"h5":{"titleNView":false}
+				}
+			},
 			{
 				"path": "pages/business/zclist",
 				"style": {

pages/index/index.vue

@@ -39,40 +39,57 @@
 				<view class="banbox mb12" v-if="bannerlist.length">
 					<banner :bannerlist="bannerlist"></banner>
 				</view>
-				<view class="grid" v-if="checkPermi(['system:system:user'])">
-					<view class="grid-item-box" @click="getBusListFn(2)" v-if="checkPermi(['system:application:list'])">
-						<view class="img"><image :src="topaimg" class="imga"></image></view>
-						<view>申报审核</view>
-					</view>
-					<view class="grid-item-box" @click="getBusListFn(3)" v-if="checkPermi(['system:application:list'])">
-						<view class="img"><image :src="topbimg" class="imgb"></image></view>
-						<view>担保初审</view>
-					</view>
-					<view class="grid-item-box" @click="getMoreFn" v-if="checkPermi(['system:hyperlink:list'])">
-						<view class="img"><image :src="topcimg" class="imgc"></image></view>
-						<view>外部工具</view>
-					</view>
-					<view class="grid-item-box" @click="getBusListFn(5)" v-if="checkPermi(['system:application:list'])">
-						<view class="img"><image :src="topdimg" class="imgd"></image></view>
-						<view>尽职调查</view>
-					</view>
-					<view class="grid-item-box" @click="getBusListFn(6)" v-if="checkPermi(['system:application:list'])">
-						<view class="img"><image :src="topeimg" class="imga"></image></view>
-						<view>评审会</view>
-					</view>
-					<view class="grid-item-box" @click="getBusListFn(7)" v-if="checkPermi(['system:application:list'])">
-						<view class="img"><image :src="topfimg" class="imgc"></image></view>
-						<view>签署合同</view>
-					</view>
-					<view class="grid-item-box" @click="getLedgerFn">
-						<view class="img"><image :src="topgimg" class="imge"></image></view>
-						<view>台账表</view>
-					</view>
-					<view class="grid-item-box" @click="getFileFn" v-if="checkPermi(['system:application:listOss'])">
-						<view class="img"><image :src="tophimg" class="imgf"></image></view>
-						<view>文件管理</view>
-					</view>
-				</view>
+				<!-- 轮播 -->
+				<swiper v-if="checkPermi(['system:system:user'])" class="swiper" circular :indicator-color="incolorh" :indicator-active-color="activecolorh" :indicator-dots="indicatorDotsh" :autoplay="autoplayh">
+					<swiper-item>
+						<view class="grid">
+							<view class="grid-item-box" @click="getBusListFn(2)" v-if="checkPermi(['system:application:list'])">
+								<view class="img"><image :src="topaimg" class="imga"></image></view>
+								<view>申报审核</view>
+							</view>
+							<view class="grid-item-box" @click="getBusListFn(3)" v-if="checkPermi(['system:application:list'])">
+								<view class="img"><image :src="topbimg" class="imgb"></image></view>
+								<view>担保初审</view>
+							</view>
+							<view class="grid-item-box" @click="getMoreFn" v-if="checkPermi(['system:hyperlink:list'])">
+								<view class="img"><image :src="topcimg" class="imgc"></image></view>
+								<view>外部工具</view>
+							</view>
+							<view class="grid-item-box" @click="getBusListFn(5)" v-if="checkPermi(['system:application:list'])">
+								<view class="img"><image :src="topdimg" class="imgd"></image></view>
+								<view>尽职调查</view>
+							</view>
+							<view class="grid-item-box" @click="getBusListFn(6)" v-if="checkPermi(['system:application:list'])">
+								<view class="img"><image :src="topeimg" class="imga"></image></view>
+								<view>评审会</view>
+							</view>
+							<view class="grid-item-box" @click="getBusListFn(7)" v-if="checkPermi(['system:application:list'])">
+								<view class="img"><image :src="topfimg" class="imgc"></image></view>
+								<view>签署合同</view>
+							</view>
+							<view class="grid-item-box" @click="getLedgerFn">
+								<view class="img"><image :src="topgimg" class="imge"></image></view>
+								<view>台账表</view>
+							</view>
+							<view class="grid-item-box" @click="getFileFn" v-if="checkPermi(['system:application:listOss'])">
+								<view class="img"><image :src="tophimg" class="imgf"></image></view>
+								<view>文件管理</view>
+							</view>
+						</view>
+					</swiper-item>
+					<swiper-item>
+						<view class="grid">
+							<view class="grid-item-box" v-if="checkPermi(['system:application:conference:list'])" @click="getTouPFn">
+								<view class="img"><image :src="topiimg" class="imgg"></image></view>
+								<view>投票结果</view>
+							</view>
+							<view class="grid-item-box" @click="getTouPFn">
+								<view class="img"><image :src="topjimg" class="imgd"></image></view>
+								<view>保后报告</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
 				<!-- v-if="checkPermi(['zxNotice:notice:list'])" -->
 				<view class="mlrbox">
 					<view class="mb24">
@@ -174,6 +191,8 @@
 			topfimg:require("@/static/images/home/topa.png"),
 			topgimg:require("@/static/images/home/topg.png"),
 			tophimg:require("@/static/images/home/toph.png"),
+			topiimg:require("@/static/images/home/topi.png"),
+			topjimg:require("@/static/images/home/topj.png"),
 			haddaimg:require("@/static/images/home/hadda.png"),
 			haddbimg:require("@/static/images/home/haddb.png"),
 			haddcimg:require("@/static/images/home/haddc.png"),
@@ -182,6 +201,10 @@
 			rimg:require("@/static/images/home/rimg.png"),
 			noticelist:[],
 			autoplay:true,
+			autoplayh:false,
+			incolorh:'#cccccc',
+			activecolorh:'#00a9f0',
+			indicatorDotsh: true,
 			
 			list:[],
 			pageSize: 10,
@@ -352,6 +375,9 @@
 		getConfirm(){
 			this.$tab.reLaunch('/pages/custom/index?name='+this.usename)
 		},
+		getTouPFn(){
+			this.$tab.navigateTo('/work/pages/business/votelist')
+		},
 		getProveFn(){
 			if(checkPermi(['system:registered:user'])&&!checkPermi(['system:system:user'])){
 				this.$store.dispatch('GetInfo').then(vres => {
@@ -615,6 +641,7 @@
 </style>
 <style lang="scss" scoped>
 .navbox /deep/ .uni-navbar__header-container {align-items: center;padding-left: 0;}
+.swiper{height: 324rpx;}
 .navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;
 	.topl{padding-left: 16rpx;overflow: hidden;
 		image{width: 30rpx;height: 38rpx;margin-right: 18rpx;flex: 0 0 auto;}
@@ -652,6 +679,7 @@
 					.imgd{width: 40rpx;height: 46rpx;}
 					.imge{width: 42rpx;height: 46rpx;}
 					.imgf{width: 44rpx;height: 40rpx;}
+					.imgg{width: 44rpx;height: 44rpx;}
 				}
 				view{font-weight: bold;font-size: 26rpx;color: #222327;}
 			}

work/components/business/aqyxx.vue

@@ -19,6 +19,15 @@
 			<view class="txt">是否免税：<text><block v-if="datainfo.isDuty">{{datainfo.isDuty=='Y'?'是':'否'}}</block></text></view>
 		</view>
 		<view class="txt">公司简介：<text>{{datainfo.companyIntroduction}}</text></view>
+		<view class="txt flext" v-if="basicFj.gsjj&&basicFj.gsjj.length">
+			<view class="flex0">公司简介：</view>
+			<view class="flex1 over">
+				<block v-if="basicFj.gsjj.length>1">
+					<view v-for="(ite,idx) in basicFj.gsjj" class="filist over" @click="getDown(ite.url)">{{ite.name}}</view>
+				</block>
+				<text v-else class="txta" @click="getDown(basicFj.gsjj[0].url)">在线查看</text>
+			</view>
+		</view>
 		<view class="txt flext">
 			<view class="flex0">公司章程：</view>
 			<view class="flex1 over">

work/components/business/ewjcj.vue

@@ -4,7 +4,8 @@
 		<view class="txt">
 			<view class="flex1 flexc">{{ite.label}}
 			<!-- 有文件出具的权限 -->
-			<view class="editf" v-if="checkPermi(['system:fj:add'])&&datainfo.loanApplicationType!=4" @click="getfjEdit(ite.val)">
+			<!-- 风险报告只能有风险修改删除 -->
+			<view class="editf" v-if="checkPermi(['system:fj:add'])&&datainfo.loanApplicationType!=4&&pfrom!='vote'&&datainfo.loanApplicationType!=3" @click="getfjEdit(ite.val)">
 				<image :src="editf"></image>
 				<view>上传</view>
 			</view>
@@ -26,13 +27,15 @@
 					<view class="tit">{{fite.name}}</view>
 				</view>
 				<!-- ||ite.val=='wtdbht' -->
-				<view class="edit" v-if="(ite.val=='gdhyjy')&&datainfo.loanApplicationType!=4&&checkPermi(['word:wordFilePath:wordFilePath'])" @click="getQmFn(fite.url)">
-					<image :src="edit"></image>
-					<view>在线签名</view>
-				</view>
-				<view class="delimg flex0" v-if="checkPermi(['system:fj:remove'])&&datainfo.loanApplicationType!=4" @click.stop="getDelwjFj(fite.fjId)">
-					<image :src="fdelimg"></image>
-				</view>
+				<block v-if="pfrom!='vote'&&datainfo.loanApplicationType!=3&&datainfo.loanApplicationType!=4">
+					<view class="edit" v-if="(ite.val=='gdhyjy')&&checkPermi(['word:wordFilePath:wordFilePath'])" @click="getQmFn(fite.url)">
+						<image :src="edit"></image>
+						<view>在线签名</view>
+					</view>
+					<view class="delimg flex0" v-if="checkPermi(['system:fj:remove'])" @click.stop="getDelwjFj(fite.fjId)">
+						<image :src="fdelimg"></image>
+					</view>
+				</block>
 				<text class="txta" @click="getDown(fite.url)">预览</text>
 			</view>
 		</view>
@@ -92,6 +95,12 @@
 			default () {
 				return []
 			}
+		},
+		pfrom:{
+			type: String,
+			default () {
+				return ''
+			}
 		}
 	},
 	components:{

work/components/business/gtpjg.vue

@@ -0,0 +1,140 @@
+<template>
+	<view>
+		<view v-if="datalist&&datalist.length">
+			<view class="time" v-for="(lite,lidx) in datalist" :key="lidx">
+				<view class="time_t"  @click="getLook(lidx)" :class="lite.check?'act':''">
+					<view>{{lite.conferenceTime}}</view>
+					<image :src="timeup" class="timeup"></image>
+				 </view>
+				 <view v-if="lite.check">
+					<view class="timebox" v-for="(ite,idx) in lite.children" :key="idx">
+						<view class="list">
+							<image :src="timel" class="timel"></image>
+							<view class="listr">
+								<view class="listrx flext">
+									<view class="ltit">贷款申请编号：</view>
+									<view class="ltxt">{{ite.loanApplicationNumber}}</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">贷款公司名称：</view>
+									<view class="ltxt">{{ite.loanApplicationName}}</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">参会时间：</view>
+									<view class="ltxt">{{ite.conferenceTime}}</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">投票人员：</view>
+									<view class="ltxt">{{ite.realName}}</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">投票结果：</view>
+									<view class="ltxt" v-if="ite.votingResult">{{ite.votingResult=='Y'?'同意':'不同意'}}</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">担保额度：</view>
+									<view class="ltxt" v-if="ite.lineGuarantee">{{ite.lineGuarantee}}万元</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">担保期限：</view>
+									<view class="ltxt" v-if="ite.guaranteePeriod">{{ite.guaranteePeriod}}月</view>
+								</view>
+								<view class="listrx flext">
+									<view class="ltit">意见：</view>
+									<view class="ltxt">{{ite.argument}}</view>
+								</view>
+							</view>
+						</view>
+					</view> 
+				 </view>
+			</view>
+		</view>
+		<block v-else>
+			<no-data notxt='暂无投票信息'></no-data>
+		</block>
+	</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import { selectValue } from '@/utils/common.js';
+	import noData from "@/components/nodata/nodata.vue"
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+  export default {
+	props:{
+		shjdlist: {
+			type: Array,
+			default () {
+				return []
+			}
+		},
+		datalist:{
+			type: Array,
+			default () {
+				return []
+			}
+		},
+
+	},
+	components:{
+		noData
+	},
+	data(){
+		return{
+			timel:require("@/work/static/images/timel.png"),
+			timeup:require("@/work/static/images/timeup.png"),
+			baseUrl:'',
+		}
+	},
+	mounted: function() {
+		this.baseUrl=baseUrl;
+	},
+	methods:{
+		checkPermi, checkRole,
+		// 展开
+		getLook(idx){
+			this.datalist[idx].check=!this.datalist[idx].check
+		},
+		
+		// getPreview(url){
+		// 	this.$emit('getPreview',url)
+		// },
+	},
+	
+  }
+</script>
+
+<style lang="scss" scoped>
+// 时间轴
+.time{padding: 0 20rpx;
+	.time_t{padding: 24rpx 0;display: flex;align-items: center;
+		view{font-weight: bold;color: #4775EA;font-size: 32rpx;}
+		text{margin-left:12rpx;}
+		.timeup{width: 26rpx;height: 24rpx;margin-left: 30rpx;transition: all 0.3s; }
+		&.act .timeup{transform: rotate(-180deg);}
+	}
+	// .timebox{display: none;}
+	.list{display: flex;align-items: flex-start;padding-left: 10rpx;padding-bottom: 36rpx;position: relative;
+	
+		&::before{width: 2rpx;content: "";position: absolute;top: 44rpx;bottom: 14rpx;left: 26rpx;
+background: #DADADA;}
+		.timel{width: 32rpx;height: 32rpx;margin-right: 20rpx;position: relative;flex: 0 0 auto;}
+		.listr{flex:1;
+			.listrt{line-height: 32rpx;font-size: 30rpx;font-weight: bold;color: #161616;margin-bottom: 16rpx;display: flex;align-items: center;
+				.type{height: 30rpx;border-radius: 10rpx;margin-left: 20rpx;font-size: 24rpx;color: #FFFFFF;padding:2rpx 8rpx;
+					&.bg1{background: #AABCE9;}
+					&.bg2{background: #8CD5B3;}
+				}
+			}
+			.listrx{padding: 6rpx 0;
+				.ltit{flex:0 0 auto;font-size: 30rpx;color: #AAAAAA;}
+				.ltxt{font-weight: 500;color: #161616;flex:1;font-size: 30rpx;}
+			}
+		}
+	}
+	&.act .timebox{display: block;}
+	
+	// &.quse_txt:last-child ul:before{display: none;}
+}
+</style>

work/components/business/list.vue

@@ -2,18 +2,26 @@
   <view>
 	<view v-if="datalist.length>0">
 		<!-- 申报业务 v-if="listtype=='case'"-->
-		<block v-if="type=='work'">
+		<block v-if="type=='work'||type=='vote'">
 			<view class="lists" v-for="(ite,idx) in datalist" @click="getDetail(ite.loanApplicationId)">
 				<view class="listtop">
 					<view class="toptit over">{{ite.enterpriseName}}</view>
 					<view class="statbox" v-if="ite.isNew=='Y'">专精特新<image :src="start"></image></view>
 				</view>
 				<view class="listsm">
+					<!-- 投票结果  1：投票中 2：投票完成，3：重新投票，4：待投票-->
+					<block v-if="type=='vote'">
+						<image v-if="ite.votingResult==1" :src="voteb" class="votea"></image>
+						<image v-if="ite.votingResult==2" :src="votec" class="votea"></image>
+						<image v-if="ite.votingResult==3" :src="voted" class="votea"></image>
+						<image v-if="ite.votingResult==4" :src="votea" class="votea"></image>
+					</block>
 					<view class="txt"><text class="tit">贷款编号</text><text class="line">|</text><text>{{ite.loanApplicationNumber}}</text></view>
 					<view class="txt" v-if="ite.loanApplicationType!=1&&ite.loanApplicationType!=4"><text class="tit">审核状态</text><text class="line">|</text><text class="co28">{{kaType(ite.auditSchedule,shjdlist)}}
 					</text></view>
 					<view class="txt"><text class="tit">申报时间</text><text class="line">|</text><text>{{ite.applicationTime}}</text></view>
-					<view class="txt"><text class="tit">归档时间</text><text class="line">|</text><text>{{ite.fileTime}}</text></view>
+					<view class="txt" v-if="type=='vote'"><text class="tit">上会时间</text><text class="line">|</text><text>{{ite.reviewTime}}</text></view>
+					<view class="txt" v-else><text class="tit">归档时间</text><text class="line">|</text><text>{{ite.fileTime}}</text></view>
 					<view class="flexcw">
 						<view class="txt"><text class="tit">申请额度</text><text class="line">|</text><text>{{ite.applicationAmount}}万元</text></view>
 						<view class="txt"><text class="tit">使用期限</text><text class="line">|</text><text>{{ite.usagePeriod}}月</text></view>
@@ -273,6 +281,11 @@
 			filz:require('@/work/static/images/filz.png'),
 			titimg:require('@/work/static/images/infotit.png'),
 			fup:require('@/work/static/images/fdown.png'),
+			votea:require('@/work/static/images/votea.png'),
+			voteb:require('@/work/static/images/voteb.png'),
+			votec:require('@/work/static/images/votec.png'),
+			voted:require('@/work/static/images/voted.png'),
+			votee:require('@/work/static/images/votee.png'),
 			zlist:[]
 		}
 	},
@@ -424,7 +437,7 @@ font-size: 40rpx;display: flex;align-items: center;justify-content: center;color
 		.headx{font-weight: 500;font-size: 24rpx;color: #666666;}
 	}
 	.adr{font-weight: 500;font-size: 26rpx;color: #666666;margin-top: 12rpx;}
-	.listsm{padding: 32rpx 10rpx 16rpx 0;
+	.listsm{padding: 32rpx 10rpx 16rpx 0;position: relative;
 		.tit{font-weight: bold;margin-right: 8rpx;flex: 0 0 auto;}
 		.line{margin-right: 8rpx;color: #aaaaaa;flex: 0 0 auto;}
 		.txt{font-size: 26rpx;color: #222327;margin-bottom: 24rpx;display: flex;padding-left: 10rpx;}
@@ -463,7 +476,7 @@ font-size: 40rpx;display: flex;align-items: center;justify-content: center;color
 	// 	}
 	// }
 }
-
+.votea{width: 98rpx;height: 98rpx;position: absolute;right: 10rpx;top: 10rpx;}
 .fdzbox{width: 100%;padding: 24rpx 30rpx;box-sizing: border-box;display: flex;align-items: center;background: #E1F3FA;border-radius: 20rpx;
 		image{width: 62rpx;height: 74rpx;margin-right: 32rpx;flex: 0 0 auto;}
 		view{font-weight: bold;font-size: 26rpx;color: #00A9F0;}

work/components/popup/popup.vue

@@ -60,9 +60,24 @@
 					    </w-select>
 					<!-- <uni-data-select  v-model="mycdtxt"  placeholder="请选择B角"  :localdata="mycdlist"  ></uni-data-select> -->
 				</view>
+				<view class="mb16">
+					<view class="ttxt mb18">分配风险人员</view>
+					<w-select
+					      :list='userList'
+					      valueName='userName' 
+					      keyName="userId"
+						  :filterable='filterable'
+						  width='100%'
+						  height="44px"
+						  @change='getchangec'
+					    >
+					    </w-select>
+					<!-- <uni-data-select  v-model="mycdtxt"  placeholder="请选择B角"  :localdata="mycdlist"  ></uni-data-select> -->
+				</view>
 			</block>
 			
-			<view class="btns" @click="getupSubmit">确认<block v-if="isty!=3">并生成担保意向函</block></view>
+			<!-- <view class="btns" @click="getupSubmit">确认<block v-if="isty!=3">并生成担保意向函</block></view> -->
+			<view class="btns" @click="getupSubmit">确认</view>
 		</view>
 		<!-- a,b角色审核 -->
 		<view class="fixbox" v-if="type=='ajssh'||type=='bjssh'">
@@ -132,8 +147,8 @@
 			</view>
 			<view class="btns" @click="getupSubmit">确认</view>
 		</view>
-		<!-- 上会管理员审核 shsh -->
-		<view class="fixbox" v-if="type=='shsh'">
+		<!-- 上会同意 1-->
+		<view class="fixbox" v-if="type=='shshty'">
 			<view class="cloimg" @click="getClose">
 				<image :src="closeimg"></image>
 			</view>
@@ -142,23 +157,48 @@
 				<view class="ttxt mb18">是否同意上评审会</view>
 				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tyList" />
 			</view>
+			<view class="mb16">
+				<view class="ttxt mb18">审核意见</view>
+				<textarea class="textar" v-model="shtext" style="min-height: 156rpx;" maxlength="-1" autoHeight="true" placeholder="若不同意上会，请填写理由…"></textarea>
+			</view>
+			<view class="btns" style="margin-top: 18rpx;" @click="getupSubmit">确认</view>
+		</view>
+		<!-- 上会管理员审核2 shsh -->
+		<view class="fixbox" v-if="type=='shsh'">
+			<view class="cloimg" @click="getClose">
+				<image :src="closeimg"></image>
+			</view>
+			<view class="ttit">上会日期</view>
+			<!-- <view class="mb16">
+				<view class="ttxt mb18">是否同意上评审会</view>
+				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tyList" />
+			</view> -->
 			<view class="mb16" v-if="isty!=3">
 				<view class="ttxt mb18">评审会日期</view>
-				<picker mode="date"   @change='bindDateChangea'>
+				<picker mode="date" :start="startady"   @change='bindDateChangea'>
 					<view class="chekt">
 						<view :class="jtri?'':'coa'">{{jtri|| "请选择具体日期"}}</view>
 						<image :src="upimg"></image>
 					</view>
 				</picker>
 			</view>
-			<view class="mb16">
+			<view class="mb16" v-if="isty!=3">
+				<view class="ttxt mb18">评审会时间</view>
+				<picker mode="time"   @change='bindDateChangeb'>
+					<view class="chekt">
+						<view :class="jtsj?'':'coa'">{{jtsj|| "请选择具体时间"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+			</view>
+			<!-- <view class="mb16">
 				<view class="ttxt mb18">审核意见</view>
 				<textarea class="textar" v-model="shtext" style="min-height: 156rpx;" maxlength="-1" autoHeight="true" placeholder="若不同意上会，请填写理由…"></textarea>
-			</view>
-			<view class="mb16" v-if="isty!=3">
-				<view class="ttxt mb18 flexcj">上会人员
+			</view> -->
+			<!-- <view class="mb16" v-if="isty!=3">
+				<view class="ttxt mb18 flexcj">评委
 					<view class="addsh" @click="getAddFn" >
-						<image :src="addpeimg"></image>添加上会人员
+						<image :src="addpeimg"></image>添加评委
 					</view>
 				</view>
 				<view class="peolists">
@@ -167,10 +207,101 @@
 						<image :src="fdelimg" @click="getDelRy(idx)"></image>
 					</view>
 				</view>
+			</view> -->
+			<!-- <view class="shshtips">* 确认上会后，即出具评审意见签批表、股东会决议</view> -->
+			<view class="btns" style="margin-top: 18rpx;" @click="getupSubmit">确认</view>
+		</view>
+		<!-- 上会投票3 shshtp -->
+		<view class="fixbox" v-if="type=='shshtp'">
+			<view class="cloimg" @click="getClose">
+				<image :src="closeimg"></image>
+			</view>
+			<view class="ttit">上会投票</view>
+			<view class="mb16">
+				<view class="ttxt mb18">是否同意</view>
+				<uni-data-checkbox :selectedColor="actcolor" v-model="issf" :localdata="sfList" />
+			</view>
+			<view class="mb16">
+				<view class="ttxt mb18">担保额度</view>
+				<view class="flexc chektinp">
+					<input placeholder="请输入担保额度" type="number" v-model="dbed" placeholder-class="coa" class="flex1"/>
+					<view class="ltit flex0 ml8">万元</view>
+				</view>
 			</view>
-			<view class="shshtips">* 确认上会后，即出具评审意见签批表、股东会决议</view>
+			<view class="mb16">
+				<view class="ttxt mb18">担保期限</view>
+				<view class="flexc chektinp">
+					<input placeholder="请输入担保期限" type="number" v-model="dbqx" placeholder-class="coa" class="flex1"/>
+					<view class="ltit flex0 ml8">月</view>
+				</view>
+			</view>
+			<view class="mb16">
+				<view class="ttxt mb18">意见</view>
+				<textarea class="textar" v-model="shtext" style="min-height: 156rpx;" maxlength="-1" autoHeight="true" placeholder="若不同意上会，请填写理由…"></textarea>
+			</view>
+			<!-- <view class="shshtips">* 确认上会后，即出具评审意见签批表、股东会决议</view> -->
 			<view class="btns" style="margin-top: 18rpx;" @click="getupSubmit">确认</view>
 		</view>
+		<!-- 重新投票 cxtp -->
+		<view class="fixbox" v-if="type=='cxtp'">
+			<view class="cloimg" @click="getClose">
+				<image :src="closeimg"></image>
+			</view>
+			<view class="ttit">投票日期</view>
+			<view class="mb16" v-if="isty!=3">
+				<view class="ttxt mb18">投票日期</view>
+				<picker mode="date"   @change='bindDateChangea'>
+					<view class="chekt">
+						<view :class="jtri?'':'coa'">{{jtri|| "请选择投票日期"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+			</view>
+			<view class="mb16" v-if="isty!=3">
+				<view class="ttxt mb18">投票时间</view>
+				<picker mode="time"   @change='bindDateChangeb'>
+					<view class="chekt">
+						<view :class="jtsj?'':'coa'">{{jtsj|| "请选择投票时间"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+			</view>
+			<view class="btns" style="margin-top: 18rpx;" @click="getupSubmit">确认</view>
+		</view>
+		<!-- 申诉 -->
+		<view class="fixbox" v-if="type=='sssh'">
+			<view class="cloimg" @click="getClose">
+				<image :src="closeimg"></image>
+			</view>
+			<view class="ttit">申诉</view>
+			<view class="mb16">
+				<view class="ttxt mb18">是否通过</view>
+				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tgList" />
+			</view>
+			<view class="mb16">
+				<view class="ttxt mb18">审核意见</view>
+				<textarea class="textar" style="min-height: 156rpx;" maxlength="-1" autoHeight="true" v-model="shtext" placeholder="若资料不予通过，请填写理由…"></textarea>
+			</view>
+			<!-- 其他附件 -->
+			<view class="mb16">
+				<view class="ttxt mb18 flexcj">附件信息
+					<lsj-upload ref="lsjUpload" childId="upload1" :loanApplicationId="loanApplicationId" :width="width" :height="height" :option="option" :size="size" :formats="formats" :debug="debug" :instantly="instantly"
+						    @progress="" @uploadEnd="onuploadEnd" :fileName="qtfjobj.qtfj" fileVal='qtfj' bigType="d">
+						<view class="fbtns co0a" :style="{width: width,height: height}">上传附件</view>
+					</lsj-upload>
+				</view>
+				<view class="fjlists"  v-for="(fite,fidx) in filelist" :key='fidx'>
+					<view class="flext" @click="getDown(fite.url)">
+						<view class="imgl"><image :src="filico" ></image></view>
+						<view class="tit">{{fite.name}}</view>
+					</view>
+					<view class="delimg flex0" @click.stop="getDelFj(idx)">
+						<image :src="fdelimg"></image>
+					</view>
+				</view>
+			</view>
+			<view class="btns" @click="getupSubmit">确认</view>
+		</view>
 		<!-- 上会上传附件 -->
 		<view class="fixbox" v-if="type=='shpsyj'||type=='shshjy'">
 			<view class="cloimg" @click="getClose">
@@ -458,6 +589,12 @@
 				default () {
 					return ''
 				}
+			},
+			startady:{
+				type: String,
+				default () {
+					return ''
+				}
 			}
 		},
 		data(){
@@ -510,15 +647,22 @@
 				actcolor:'#00A9F0',
 				tyList:[{text: '同意',value: '2'},{text: '不同意',value: '3'}],
 				tgList:[{text: '通过',value: '2'},{text: '不通过',value: '3'}],
+				sfList:[{text: '是',value: 'Y'},{text: '否',value: 'N'}],
+				issf:'Y',
 				mycdlist:[{text: 'a',value: '0'},{text: 'b',value: '1'}],
 				isty:'2',//同意
 				shtext:'',//审核意见
+				dbed:'',//担保额度
+				dbqx:'',//担保期限
 				aUserId:'',//A角色用户ID
 				aUserName:'',//A角色用户名称
 				bUserId:'',//B角色用户ID
 				bUserName:'',//B角色用户名称
+				fUserId:'',//风险用户id
+				fUserName:'',//风险用户名称
 				mycdtxt:'',
 				jtri:'',//具体日期
+				jtsj:'',//具体时间
 				filterable:true,
 				chooseValue:'',
 				phofile:[],
@@ -592,6 +736,10 @@
 				this.bUserId=e.userId;
 				this.bUserName=e.userName;
 			},
+			getchangec(e){//风险人员
+				this.fUserId=e.userId;
+				this.fUserName=e.userName;
+			},
 			getupSubmit(){
 				var type=this.type;
 				var data={}
@@ -613,10 +761,16 @@
 							this.$toast("请选择分配B角")
 							return
 						}
+						if(!this.fUserName){
+							this.$toast("请选择分配风险用户人员")
+							return
+						}
 						data.aUserId=this.aUserId;
 						data.aUserName=this.aUserName;
 						data.bUserId=this.bUserId;
 						data.bUserName=this.bUserName;
+						data.fUserId=this.fUserId;
+						data.fUserName=this.fUserName;
 					}	
 				}else if(type=='ajssh'||type=='bjssh'||type=='fxsh'){
 					data={
@@ -631,6 +785,7 @@
 					data={
 						auditType:this.isty,
 						fjUrl:this.filelist,
+						auditView:this.shtext,
 					}
 					if(this.isty==3&&!this.shtext){
 						this.$toast("请输入审核意见")
@@ -656,27 +811,73 @@
 						this.$toast("请上传附件")
 						return
 					}
-				}else if(type=='shsh'){
+				}else if(type=='shshty'){
 					data={
-						auditType:this.isty,
 						auditView:this.shtext,
 					}
+					if(this.isty==2){
+						data.reviewSchedule=3
+					}else if(this.isty==3){
+						data.reviewSchedule=2
+					}
 					if(this.isty==3&&!this.shtext){
 						this.$toast("请输入审核意见")
 						return
 					}
-					if(this.isty!=3){
-						if(!this.jtri){
-							this.$toast("请选择评审会日期")
+				}else if(type=='sssh'){//申诉
+					data={
+						auditView:this.shtext,
+						fjUrl:this.filelist,
+					}
+					if(this.isty==2){
+						data.ssType=1
+					}else if(this.isty==3){
+						data.ssType=2
+					}
+					if(this.isty==3&&!this.shtext){
+						this.$toast("请输入审核意见")
+						return
+					}
+				}else if(type=='shsh'||type=='cxtp'){
+					var str='评审会'
+					if(type=='cxtp'){
+						str='投票'
+					}
+					data={
+						// auditType:this.isty,
+						// auditView:this.shtext,
+					}
+					if(!this.jtri){
+						this.$toast("请选择"+str+"日期")
+						return
+					}
+					if(!this.jtsj){
+						this.$toast("请选择"+str+"时间")
+						return
+					}
+					var time=this.jtri+' '+this.jtsj
+					data.conferenceTime=time;
+				}else if(type=='shshtp'){
+					data={
+						votingResult:this.issf,
+						argument:this.shtext,
+						lineGuarantee:this.dbed,
+						guaranteePeriod:this.dbqx,
+					}
+					if(this.issf=='N'&&!this.shtext){
+						this.$toast("请输入意见")
+						return
+					}
+					if(this.issf=='Y'){
+						if(!this.dbed||this.dbed<0){
+							this.$toast("请输入担保额度")
 							return
 						}
-						if(this.shrylist.length<1){
-							this.$toast("请选择上会人员")
+						if(!this.dbqx||this.dbqx<0){
+							this.$toast("请输入担保期限")
 							return
 						}
-						data.reviewTime=this.jtri;
-						data.sysUserConferenceList=this.shrylist;
-					}
+					}	
 				}else if(type=='zhfkhgb'){
 					if(!this.shtext){
 						this.$toast("请输入暂缓原因")
@@ -705,6 +906,10 @@
 				var val=e.detail.value;
 				this.jtri=val;
 			},
+			bindDateChangeb(e){
+				var val=e.detail.value;
+				this.jtsj=val+':00';
+			},
 			getSure(){
 				this.$emit('getSure')
 			},
@@ -884,6 +1089,7 @@ border-radius: 20rpx;z-index: 10;top: 50%;transform: translateY(-50%);padding: 4
 		view{font-size: 30rpx;flex: 1;}
 		image{width: 16rpx;height: 10rpx;flex: 0 0 auto;margin-left: 12rpx;}
 	}
+	.chektinp{background-color: #EEEEEE;height: 88rpx;border-radius: 8rpx;display: flex;align-items: center;padding-left: 24rpx;padding-right: 10rpx;}
 	// 上会人员添加
 	.shshtips{font-weight: 500;padding-top: 14rpx;font-size: 24rpx;color: #FF6969;}
 	.addsh{font-weight: 500;flex:0 0 auto; font-size: 30rpx;color: #00A9F0;display: flex;align-items: center;

work/pages/business/add.vue

@@ -162,7 +162,7 @@
 					<block v-for="(ite,idx) in gdlist" :key="idx">
 						<uni-forms-item  name="iszcy">
 							<view class="labtxt">股东{{(Number(idx)+1)}}身份证
-								<text class="del" @click="getdelGdFn(idx)">删除</text>
+								<text class="del" @click="getdelGdFn(idx,ite)">删除</text>
 							</view>
 							<view class="phobox" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
 								<view class="phoboxa">
@@ -193,7 +193,7 @@
 						</uni-forms-item>
 						<uni-forms-item  name="iszcy">
 							<view class="labtxt">股东{{(Number(idx)+1)}}营业执照
-								<text class="del" @click="getdelGdFn(idx)">删除</text>
+								<text class="del" @click="getdelGdFn(idx,ite)">删除</text>
 							</view>
 							<view class="phobox">
 								<view class="phoboxa">
@@ -1408,6 +1408,8 @@
 			        // "bUserName": '',//B角色用户名称
 			        "shareholderFjList": [],//全体股东信息附件
 			        "loanApplicationFjList": [],//相关附件
+			        "loanApplicationFjIdList": [],//fj删除id集合
+			        "shareholderFjIdList": [],//股东fj表股东整体删除id集合
 					"basicFj":{},//基础附件
 					"declareFj":{},//申报附件
 					"fileFj":{},//文件出具
@@ -1476,6 +1478,9 @@
 					data: []
 				},
 				loadflag:false,
+				fjdelIdList:[],//fj删除id集合
+				gdFjdelIdList:[],//股东fj表股东整体删除id集合
+				fjRemarkFj:[],//附件pdf
 			}
 		},
 		onUnload(){
@@ -1779,7 +1784,7 @@
 				var obj = {cardz:'',cardf:'',zxurl:[],zhizhao:[],shareholderName:"",shareholderIdCard:'',}
 				this.gdlist.push(obj);
 			},
-			getdelGdFn(idx){
+			getdelGdFn(idx,ite){
 				var that=this;
 				uni.showModal({
 					title: '确认删除',
@@ -1788,6 +1793,10 @@
 					confirmText: '确认',
 					success: function(res) {
 						if (res.confirm) {
+							if(ite.shareholderFjId){
+								var id=ite.shareholderFjId;
+								that.gdFjdelIdList.push(id)
+							}
 							that.gdlist.splice(idx,1);
 						} else if (res.cancel) {
 						}
@@ -1934,6 +1943,9 @@
 			},
 			getZanFn(type){
 				var that=this;
+				if(this.loadflag){
+					return
+				}
 				var params=this.datainfo;
 				var gdlist=this.gdlist;
 				var shFjList=[]
@@ -1945,6 +1957,9 @@
 						shareholderBusinessUrl:gdlist[key].zhizhao.join(','),
 						shareholderName:gdlist[key].shareholderName,
 						shareholderIdCard:gdlist[key].shareholderIdCard,
+						shareholderFjId:gdlist[key].shareholderFjId,
+						shareholderZxUrlPdf:gdlist[key].shareholderZxUrlPdf,
+						loanApplicationNumber:gdlist[key].loanApplicationNumber,
 					} 
 					shFjList.push(fjurl)
 				})
@@ -1959,7 +1974,13 @@
 						
 					}
 				})
+				if(this.fjRemarkFj&&this.fjRemarkFj.length>0){
+					flist=flist.concat(this.fjRemarkFj)
+				}
 				params.loanApplicationFjList=JSON.parse(JSON.stringify(flist))
+				params.loanApplicationFjIdList=JSON.parse(JSON.stringify(this.fjdelIdList))
+				params.shareholderFjIdList=JSON.parse(JSON.stringify(this.gdFjdelIdList))
+				console.log(this.fjdelIdList,this.gdFjdelIdList,123)
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -2006,9 +2027,15 @@
 						if(data.loanApplicationFjList){
 							// 筛除自动生成的附件
 							var filterlist=JSON.parse(JSON.stringify(data.loanApplicationFjList))
+							var fjRemarkFj=[]
 							this.filelist=filterlist.filter((ite) => {
+								if(ite.remark==1){
+									fjRemarkFj.push(ite)
+								}
 								return ite.remark!=1;
 							})
+							this.fjRemarkFj=JSON.parse(JSON.stringify(fjRemarkFj));
+							console.log(fjRemarkFj,1)
 							// this.filelist=JSON.parse(JSON.stringify(data.loanApplicationFjList))
 						}
 						if(data.declareFj){
@@ -2018,7 +2045,7 @@
 									return ite.remark!=1
 								})
 							})
-							this.declareFj=JSON.parse(JSON.stringify(declareFj));;
+							this.declareFj=JSON.parse(JSON.stringify(declareFj));
 							// this.declareFj=data.declareFj;
 						}
 						if(data.shareholderFjList){
@@ -2026,12 +2053,15 @@
 							var gdlist=data.shareholderFjList;
 							Object.keys(gdlist).some((key) => {
 								var fjurl={
+									shareholderFjId:gdlist[key].shareholderFjId,
 									cardz:gdlist[key].shareholderFrontUrl,
 									cardf:gdlist[key].shareholderBackUrl,
 									zxurl:[],
 									zhizhao:[],
 									shareholderName:gdlist[key].shareholderName,
-									shareholderIdCard:gdlist[key].shareholderIdCard,	
+									shareholderIdCard:gdlist[key].shareholderIdCard,
+									shareholderZxUrlPdf:gdlist[key].shareholderZxUrlPdf,
+									loanApplicationNumber:gdlist[key].loanApplicationNumber,
 								}
 								if(gdlist[key].shareholderZxUrl){
 									fjurl.zxurl=gdlist[key].shareholderZxUrl.split(',')
@@ -2150,7 +2180,10 @@
 						shareholderZxUrl:gdlist[key].zxurl.join(','),
 						shareholderBusinessUrl:gdlist[key].zhizhao.join(','),
 						shareholderName:gdlist[key].shareholderName,
-						shareholderIdCard:gdlist[key].shareholderIdCard,	
+						shareholderIdCard:gdlist[key].shareholderIdCard,
+						shareholderFjId:gdlist[key].shareholderFjId,
+						shareholderZxUrlPdf:gdlist[key].shareholderZxUrlPdf,
+						loanApplicationNumber:gdlist[key].loanApplicationNumber,
 					} 
 					shFjList.push(fjurl)
 				})
@@ -2234,7 +2267,13 @@
 						})
 					}
 				})
+				if(this.fjRemarkFj&&this.fjRemarkFj.length>0){
+					flist=flist.concat(this.fjRemarkFj)
+				}
 				params.loanApplicationFjList=JSON.parse(JSON.stringify(flist))
+				params.loanApplicationFjIdList=JSON.parse(JSON.stringify(this.fjdelIdList))
+				params.shareholderFjIdList=JSON.parse(JSON.stringify(this.gdFjdelIdList))
+				console.log(this.fjdelIdList,this.gdFjdelIdList,222)
 				if(this.ptype=='add'){
 					getApplicationAdd(params).then(res=>{
 						if(res.code==200){
@@ -2357,7 +2396,7 @@
 						'<img style="max-width:100%;height:auto;display:block;margin:10rpx auto;" src="' +baseUrlimg);
 					return newContent;
 			},
-			getOcrBusinessLicense(url,idx){
+			getOcrBusinessLicense(url,name,idx){
 				var that=this;
 				var obj=this.gdlist[idx];
 				var params={
@@ -2368,6 +2407,7 @@
 						var params=JSON.parse(JSON.stringify(res.data))
 						obj.shareholderName=params.enterpriseName
 						obj.shareholderIdCard=params.creditCode
+						obj.zhizhao[0]=name
 						this.gdlist.splice(idx,1,obj)
 					}
 				})
@@ -2424,8 +2464,9 @@
 					// obj.zxurl[0]=responseText.fileName
 				}else if(type=='zhz'){
 					// obj.zhizhao.push(responseText.fileName)
-					obj.zhizhao[0]=responseText.fileName
-					this.getOcrBusinessLicense(responseText.urlOnline,idx)
+					// obj.zhizhao[0]=responseText.fileName
+					this.getOcrBusinessLicense(responseText.urlOnline,responseText.fileName,idx)
+					return
 				}
 				console.log(this.gdlist,3)
 				this.gdlist.splice(idx,1,obj)
@@ -2455,6 +2496,10 @@
 					confirmText: '确认',
 					success: function(res) {
 						if (res.confirm) {
+							var fjlist=obj.fjlist[fidx]
+							if(fjlist.fjId){
+								that.fjdelIdList.push(fjlist.fjId)
+							}
 							obj.fjlist.splice(fidx,1)
 							that.sbfjlist.splice(idx,1,obj)
 						} else if (res.cancel) {
@@ -2505,6 +2550,10 @@
 					confirmText: '确认',
 					success: function(res) {
 						if (res.confirm) {
+							var ite=that.filelist[idx];
+							if(ite.fjId){
+								that.fjdelIdList.push(ite.fjId)
+							}
 							that.filelist.splice(idx,1)
 							that.datainfo.loanApplicationFjList=JSON.parse(JSON.stringify(that.filelist))
 						} else if (res.cancel) {

work/pages/business/details.vue

@@ -57,9 +57,6 @@
 			<!-- tab -->
 			<view class="tabs" :class="fixedflag?'tabfix':''">
 				<view v-if="!ite.limit||ite.limit&&checkPermi([ite.limit])"  class="tab" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tabList" :key="idx" @click="getTab(ite.val)">{{ite.tit}}</view>
-				<!-- <view v-if='!isqiye'  class="tab" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tabList" :key="idx" @click="getTab(ite.val)">{{ite.tit}}</view>
-				<view v-if='isqiye' class="tab" :class="tabval==ite.val?'act':''" v-for="(ite,idx) in tabLists" :key="idx" @click="getTab(ite.val)">{{ite.tit}}</view>
-				 -->
 			</view>
 			<view style="height:116rpx;" v-if="fixedflag"></view>
 			<!-- 企业信息 -->
@@ -77,18 +74,22 @@
 					<dfjxx @getDown="getDown" :datainfo="datainfo" :declareFj="declareFj" :sbfjlist="sbfjlist" @getXzFn="getXzFn"></dfjxx>
 				</block>
 				<block v-if="tabval==4">
-					<ewjcj @getDown="getDown" @getQmFn="getQmFn" :datainfo="datainfo"  @getDelwjFj="getDelwjFj" @getfjEdit="getfjEdit" :wjcjlist="wjcjlist" :qtfileFj="datainfo.otherFj" :fileFj="datainfo.fileFj"></ewjcj>
+					<ewjcj @getDown="getDown" :pfrom="pfrom" @getQmFn="getQmFn" :datainfo="datainfo"  @getDelwjFj="getDelwjFj" @getfjEdit="getfjEdit" :wjcjlist="wjcjlist" :qtfileFj="datainfo.otherFj" :fileFj="datainfo.fileFj"></ewjcj>
 				</block>
 				<block v-if="tabval==5">
 					<fshxx @getDown="getDown" :shjdlist="shjdlist"  :datalist="shlist" ></fshxx>
 				</block>
+				<!-- 投票结果 -->
+				<block v-if="tabval==6">
+					<gtpjg :datalist="tplist"></gtpjg>
+				</block>
 			</view>
 			<!-- 法人信息 -->
 			
 		</view>
-		<block v-if="datainfo.loanApplicationType!=4&&tabval!=5">
+		<block v-if="datainfo.loanApplicationType!=4&&tabval!=5&&datainfo.loanApplicationType!=3">
 			<view class="h50"></view>
-			<view class="footbtns">
+			<view class="footbtns" >
 				<!-- (业务进度表查询进度列表)：1：申报提交 stepval 4,7,8,9,没有通过不通过
 				2：业务审核/分配 
 				3：担保初审 
@@ -109,102 +110,122 @@
 				6：尽职调查 
 				7：上会评审 -->
 				<!-- 申请审核 start-->
-				<block v-if="datainfo.loanApplicationType!=3">
+				<!-- 投票 -->
+				<!-- 董事长一键否决 -->
+				<view class="fbtns bgb" v-if="checkPermi(['c:conference:finish'])"  @click="getVoteFinish">一键否决</view>
+				<block v-if="pfrom=='vote'">
+					<view class="fbtns bga" v-if="checkPermi(['c:conference:vote'])&&(datainfo.votingResult==4||datainfo.votingResult==1)"  @click="getShFn('shshtp')">投票</view>
+					<!-- 管理员重新投票  只有需要重新投票才会出现 -->
+					<view class="fbtns bga" v-if="checkRole(['manager'])&&stepval==6&&datainfo.votingResult==3&&checkPermi(['c:conference:again'])" @click="getShFn('cxtp')">重新投票</view>
+				</block>
+				<block v-else>
 					<view class="fbtns bga" v-if="checkPermi(['system:application:edit'])&&stepval<2" @click="getedit">修改</view>
 					<view class="fbtns bgc" v-if="checkPermi(['system:application:remove'])&&stepval<2" @click="getDel">删除</view>
+					<!-- 申诉状态除了修改，都不给 -->
+					<block v-if="datainfo.auditType!=4&&checkPermi(['system:application:sh'])&&datainfo.loanApplicationType==2">
+						<!-- checkRole(['auditing_risk']) 风险角色 -->
+						<view class="fbtns bga" v-if="auditSchedule==1" @click="getShFn('sh')">审核</view>
+						<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&userId==datainfo.fUserId" @click="getShFn('fxsh')">风险审核</view>
+						<!-- end -->
+						<!-- a,b角按钮 start-->
+						<view class="fbtns bga" v-if="userId==datainfo.aUserId&&auditSchedule==6" @click="getShFn('jztcsh')">尽职调查反馈</view>
+						<view class="fbtns bga" v-if="userId==datainfo.aUserId&&auditSchedule==2&&datainfo.auditType==1" @click="getShFn('ajssh')">审核</view>
+						<view class="fbtns bga" v-if="userId==datainfo.bUserId&&auditSchedule==3" @click="getShFn('bjssh')">审核</view>
+					</block>
+					
+					<!-- 风险上传风险报告 v-if="auditSchedule==6"-->
+					<view class="fbtns bga" v-if="auditSchedule==6&&userId==datainfo.fUserId"  @click="getfjEdit('fxbg')">上传风险调查报告</view>
+					
+					<!-- 审核后 -->
+					<!-- 未通过申诉 风险不通过，上会不通过-->
+					<!-- 撤销， 业务分配，a,b角撤销 -->
+					<!-- 只有上会才有申诉弹窗 -->
+					<block v-if="checkPermi(['system:application:ss'])&&datainfo.auditType==4&&(userId==datainfo.aUserId||userId==datainfo.bUserId)">
+						<view class="fbtns bga" v-if="stepval==6"  @click="getShFn('sssh')">申诉</view>
+						<view class="fbtns bga" v-else  @click="getSsFn">申诉</view>
+					</block>
+					
+					<!-- 回收站，暂存，归档不能撤  项目进度是申报提交-->
+					<!-- 撤销，管理员在 a待审核 可以撤，  
+						a,b角是自己的时候可以撤
+					-->
+					
+					<!-- end -->
+					<!-- 风险部门  start-->
+					<block v-if="stepval==4&&userId==datainfo.fUserId">
+						<view class="fbtns bgb" v-if="checkPermi(['system:hyperlink:list'])" @click="getMoreFn('wb')">外部工具平台</view>
+						<!-- 初审风险审核 -->
+						<view class="fbtns bga" @click="getShFn('fxbmsh')" v-if="checkPermi(['system:application:sh'])&&datainfo.auditType!=4">审核</view>
+					</block>
+					
+					<!-- end -->
+					<!-- 上会管理员 start -->
+					<block v-if="stepval==6&&checkRole(['manager'])&&datainfo.auditType!=4">
+						<view class="fbtns bga" v-if="datainfo.reviewSchedule==1" @click="getShFn('shshty')">审核1</view>
+						<!-- 专门账号处理商行时间 -->
+						<view class="fbtns bga" v-if="datainfo.reviewSchedule==3"  @click="getShFn('shsh')">审核2</view>
+						<view class="fbtns bga" v-if="checkPermi(['c:conference:vote'])&&datainfo.reviewSchedule==4&&(datainfo.votingResult==1||datainfo.votingResult==4)" @click="getShFn('shshtp')">投票</view>
+					</block>
+					<!-- 上会管理员 end -->
+					<!-- 合同签约start -->
+					<!-- 上传附件 是上传其他 和出具合同的附件-->
+					<block v-if="stepval==7">
+						<view class="fbtns bga" @click="getMoreFn('htqy')">出具合同</view>
+						<!-- <view class="fbtns bgb" @click="getMoreFn('htsc')">上传附件</view>
+						<view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view> -->
+					</block>
+					<!-- 合同签约end -->
+					<!-- 风险部放款 start 推进，归档-->
+					<!-- a角 管理员 判断是否提前了,步骤7之后，并且暂缓了-->
+					<block  v-if="stepval==9||stepval==8&&datainfo.aAuthorize=='Y'">
+						<view class="fbtns bgb" v-if="checkRole(['manager'])||userId==datainfo.aUserId" @click="getIssureFn(4,'fktzhsh')">放款通知书</view>
+					</block>
+					<!-- 管理员重新投票  只有需要重新投票才会出现 -->
+					<view class="fbtns bga" v-if="checkRole(['manager'])&&stepval==6&&datainfo.votingResult==3&&checkPermi(['c:conference:again'])" @click="getShFn('cxtp')">重新投票</view>
+					
+					<block v-if="datainfo.auditType!=4">
+						<!-- 管理员授权判断是否提前了,步骤7之后，并且暂缓了 -->
+						<!-- 管理员 可以让a角 提前开放款通知书，意向函， a角色和管理员给 -->
+						<view class="fbtns bgb" v-if="checkPermi(['system:application:authorize'])&&stepval==8&&datainfo.aAuthorize!='Y'" @click="getAuthorize">授权放款通知书</view>
+						<view class="fbtns bga" v-if="checkPermi(['system:application:gd'])&&stepval==9" @click="getGdFn">一键归档</view>
+						<view class="fbtns bga" v-if="checkPermi(['system:application:schedule'])&&stepval<9&&stepval>6" @click="getXybFn">项目推进</view>
+					</block>
+					<!-- end -->
+					<!-- 所有出具 -->
+					<view class="fbtns bgd" v-if="stepval>1" @click="getMoreFn('chuju')">出具</view>
+					<!-- 申诉的时候不能撤销 -->
+					<!-- <view class="fbtns" :class="auditSchedule==6?'bga':'bgb'" v-if="checkPermi(['system:application:cx'])&&(stepval!=1&&stepval!=10&&(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>2))" @click="getCxFn">撤销</view> -->
+					<block v-if="checkPermi(['system:application:cx'])&&stepval!=1&&stepval!=10&&datainfo.auditType!=4">
+						<!-- <view class="fbtns bgb" @click="getCxFn">撤销</view> -->
+						<view class="fbtns bgb" v-if="userId==datainfo.aUserId&&(auditSchedule==3||auditSchedule>6)" @click="getCxFn">撤销a</view>
+						<view class="fbtns bgb" v-if="userId==datainfo.bUserId&&auditSchedule==4" @click="getCxFn">撤销b</view>
+						<!-- 风险部撤销 -->
+						<view class="fbtns bgb" v-if="userId==datainfo.fUserId&&(auditSchedule==5||stepval==5&&datainfo.auditType==1||stepval==9)" @click="getCxFn">撤销f</view>
+						<!-- stepval==6&&reviewSchedule>1 -->
+						<view class="fbtns bgb" v-if="checkRole(['manager'])&&(datainfo.auditType!=1||auditSchedule>7||auditSchedule==2||stepval==6&&datainfo.reviewSchedule>1)" @click="getCxFn">撤销g</view>
+					</block>
 				</block>
-				<view class="fbtns bga" v-if="auditSchedule==1&&checkPermi(['system:application:sh'])&&datainfo.loanApplicationType!=1" @click="getShFn('sh')">审核</view>
-				<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&checkPermi(['system:application:sh'])&&checkRole(['auditing_risk'])" @click="getShFn('fxsh')">风险审核</view>
-				<!-- end -->
-				<!-- a,b角按钮 start-->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==6" @click="getShFn('jztcsh')">尽职调查反馈</view>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==2&&datainfo.auditType==1" @click="getShFn('ajssh')">审核</view>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.bUserId&&auditSchedule==3" @click="getShFn('bjssh')">审核</view>
-				<!-- 审核后 -->
-				<!-- <view class="fbtns bga" @click="getMoreFn('more')">更多操作</view> -->
-				<!-- 未通过申诉 风险不通过，上会不通过-->
-				<!-- 撤销， 业务分配，a,b角撤销 -->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:ss'])&&datainfo.auditType==4&&userId==datainfo.aUserId" @click="getSsFn">申诉</view>
-				<!-- 回收站，暂存，归档不能撤  项目进度是申报提交-->
-				<!-- 撤销，管理员在 a待审核 可以撤，  
-					a,b角是自己的时候可以撤
-				-->
-				
-				<!-- end -->
-				<!-- 管理员业务初审审核后出具担保意向函-->
-				<!-- 管理员 可以让a角 提前开放款通知书，意向函， a角色和管理员给 -->
-				<!-- <block v-if="auditSchedule>1&&stepval<4"> -->
-				<!-- <block v-if="auditSchedule>1&&stepval<4">
-					<view class="fbtns bga" v-if="checkRole(['manager'])||userId==datainfo.aUserId" @click="getIssureFn(3,'dbyxh')">出具担保意向函</view>
-					<view class="fbtns bgb" v-if="checkRole(['manager'])&&checkPermi(['system:application:cx'])&&auditSchedule<3&&datainfo.auditType<2" @click="getCxFn">撤销</view>
-				</block> -->
-				<!-- 风险部门  start-->
-				<block v-if="stepval==4&&checkRole(['auditing_risk'])">
-					<view class="fbtns bgb" v-if="checkPermi(['system:hyperlink:list'])" @click="getMoreFn('wb')">外部工具平台</view>
-					<!-- 初审风险审核 -->
-					<view class="fbtns bga" @click="getShFn('fxbmsh')" v-if="checkPermi(['system:application:sh'])">审核</view>
-					<!-- <view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view> -->
-				</block>
-				
-				<!-- end -->
-				<!-- 上会管理员 start -->
-				<block v-if="stepval==6">
-					<view class="fbtns bga" @click="getShFn('shsh')">审核</view>
-				</block>
-				<!-- 上会管理员 end -->
-				<!-- 合同签约start -->
-				<!-- 上传附件 是上传其他 和出具合同的附件-->
-				<block v-if="stepval==7">
-					<!-- <view class="fbtns bgb" @click="getMoreFn('htsc')">上传附件</view> -->
-					<view class="fbtns bga" @click="getMoreFn('htqy')">出具合同</view>
-					<!-- <view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view> -->
-				</block>
-				<!-- 合同签约end -->
-				<!-- 风险部放款 start-->
 				
-				<!-- 管理员授权判断是否提前了,步骤7之后，并且暂缓了 -->
-				<view class="fbtns bgb" v-if="checkPermi(['system:application:authorize'])&&stepval==8&&datainfo.aAuthorize!='Y'" @click="getAuthorize">授权放款通知书</view>
-				<!-- end -->
-				<!-- a角 管理员 判断是否提前了,步骤7之后，并且暂缓了-->
-				<block v-if="checkRole(['manager'])||userId==datainfo.aUserId">
-					<!-- <view class="fbtns bgb" @click="getfjEdit('fktzs')">上传附件</view> -->
-					<view class="fbtns bgb" v-if="stepval==9||stepval==8&&datainfo.aAuthorize=='Y'" @click="getIssureFn(4,'fktzhsh')">放款通知书</view>
-				</block>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:gd'])&&stepval==9&&datainfo.loanApplicationType!=4" @click="getGdFn">一键归档</view>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:schedule'])&&stepval<9&&stepval>6" @click="getXybFn">项目推进</view>
-				<!-- 所有出具 -->
-				<view class="fbtns bgd" v-if="stepval>1" @click="getMoreFn('chuju')">出具</view>
-				<!-- 申诉的时候不能撤销 -->
-				<!-- <view class="fbtns" :class="auditSchedule==6?'bga':'bgb'" v-if="checkPermi(['system:application:cx'])&&(stepval!=1&&stepval!=10&&(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>2))" @click="getCxFn">撤销</view> -->
-				<block v-if="checkPermi(['system:application:cx'])&&stepval!=1&&stepval!=10">
-					<view class="fbtns bgb" @click="getCxFn">撤销</view>
-					<!-- <view class="fbtns bgb" v-if="userId==datainfo.aUserId&&auditSchedule==3" @click="getCxFn">撤销</view>
-					<view class="fbtns bgb" v-if="userId==datainfo.bUserId&&auditSchedule==4" @click="getCxFn">撤销</view>
-					<view class="fbtns bgb" v-if="(datainfo.auditType!=1||auditSchedule>4)" @click="getCxFn">撤销</view> -->
-				</block>
 			</view>
 		</block>
 		<!-- 更多操作 -->
 		<view class="bgbox" @click="getClose" v-if="mtype"></view>
 		<view v-if="mtype" class="morebox">
 			<view class="molists">
-				<!-- 审核详情后 -->
-				<!-- <block v-if="mtype=='more'">
-					<view class="mcoa" @click="getShFn('shhj')">上传附件</view>
-					<view>撤回</view>
-				</block> -->
 				<!-- 出具信息 -->
 				<block v-if="mtype=='chuju'">
-					<view v-if="checkRole(['manager'])||userId==datainfo.aUserId"  @click="getIssureFn(3,'dbyxh')">出具担保意向函</view>
+					<!-- 管理员业务初审审核后出具担保意向函-->
+					<view v-if="(checkRole(['manager'])||userId==datainfo.aUserId)&&auditSchedule>1"  @click="getIssureFn(3,'dbyxh')">出具担保意向函</view>
 					<!-- 材料合规 风险部上传 &&checkRole(['auditing_risk']) -->
-					<view v-if="stepval==4&&checkRole(['auditing_risk'])" @click="getIssureFn(13,'clhgb')">出具材料合规表</view>
+					<view v-if="stepval==4&&userId==datainfo.fUserId" @click="getIssureFn(13,'clhgb')">出具材料合规表</view>
+					<view v-if="stepval==6&&datainfo.reviewSchedule==4" @click="getIssureFn(15,'pshtz')">出具评审会通知</view>
 					<block v-if="stepval==7">
 						<view  @click="getIssureFn(12,'psyjqpb')">出具评审意见签批表</view>
 						<view  @click="getIssureFn(11,'gdhyjy')">出具股东会决议</view>
 						<view  @click="getIssureFn(1,'wtdbsqs')">出具委托担保申请书</view>
 					</block>
 					<!-- 放款合规表 -->
-					<block v-if="checkRole(['auditing_risk','manager'])">
+					<block v-if="checkRole(['manager'])||userId==datainfo.fUserId">
 						<view class="fbtns bga" v-if="stepval==8||stepval==9&&datainfo.aAuthorize=='Y'" @click="getIssureFn(14,'fkhgb')">出具放款合规表</view>
 						<!-- 暂缓出具  备注原因推给管理员-->
 						<view class="fbtns bgb" v-if="stepval==8&&checkPermi(['system:application:zanHuan'])" @click="getShFn('zhfkhgb')">暂缓出具放款合规表</view>
@@ -216,20 +237,10 @@
 				<block v-if="mtype=='wb'">
 					<view v-for="(ite,idx) in linkList" :key="idx" @click="getWebUel(ite.url)">{{ite.name}}</view>
 				</block>
-				<!-- 更多操作 -->
-				<block v-if="mtype=='fxmore'">
-					<!-- auditSchedule==5&& -->
-					<view @click="getShFn('fxbmsh')" v-if="checkPermi(['system:application:sh'])">审核</view>
-					<view @click="getIssureFn(13,'clhgb')">出具材料合规表</view>
-					<!-- <view @click="getfjEdit('clhgb')">上传附件</view> -->
-					<!-- <view @click="getfjEdit('clhgb')">上传材料合规表</view> -->
-					<view v-if="checkPermi(['system:application:cx'])" @click="getCxFn">撤回</view>
-				</block>
 				<!-- 风险部门 end -->
 				<!-- 上会管理员 start -->
 				<block v-if="mtype=='shmore'">
 					<view @click="getIssureFn(12,'psyjqpb')">出具评审意见签批表</view>
-					<!-- <view @click="getIssureFn()">上会纪要</view> -->
 					<view @click="getIssureFn(11,'gdhyjy')">出具股东会决议</view>
 					<!-- <view @click="getfjEdit('psyjqpb')">上传评审意见签批表</view>
 					<view @click="getfjEdit('gdhyjy')">上传上会纪要</view> -->
@@ -237,8 +248,8 @@
 				<!-- 上会管理员 end -->
 				<!-- 合同签约 start -->
 				<!-- 合同上传信息 -->
-				<block v-if="mtype=='htsc'">
-					<!-- <view @click="getfjEdit('wtdbht')">上传委托保证合同</view>
+				<!-- <block v-if="mtype=='htsc'">
+					<view @click="getfjEdit('wtdbht')">上传委托保证合同</view>
 					<block v-if="datainfo.guaranteeType=='2'">
 						<view @click="getfjEdit('bzfdbhtfr')">上传保证反担保合同(法人)</view>
 						<view @click="getfjEdit('bzfdbhtzrr')">上传保证反担保合同(自然人)</view>
@@ -246,10 +257,9 @@
 					<block v-if="datainfo.guaranteeType=='1'">
 						<view @click="getfjEdit('dyfdbhtfr')">上传抵押反担保合同(法人)</view>
 						<view @click="getfjEdit('dyfdbhtzrr')">上传抵押反担保合同(自然人)</view>
-					</block> -->
+					</block>
 					<view @click="getQtfjEdit('qtfj')">其他附件</view>
-					<!-- 其他附件 都给放 -->
-				</block>
+				</block> -->
 				<block v-if="mtype=='htqy'">
 					<view @click="getIssureFn(2,'wtdbht')">委托保证合同</view>
 					<block v-if="datainfo.guaranteeType.indexOf('2')!=-1">
@@ -264,13 +274,16 @@
 						<view @click="getIssureFn(9,'qlzqfdbhtfr')">权利质权反担保合同（适用于法人）</view>
 						<view @click="getIssureFn(10,'qlzqfdbhtzrr')">权利质权反担保合同（适用于自然人）</view>
 					</block>
+					<view @click="getIssureFn(18,'qyxyfdb')">企业信用反担保合同</view>
+					<view @click="getIssureFn(17,'wtbzgcly')">委托保证合同(工程履约)</view>
+					<view @click="getIssureFn(16,'bkcxgr')">不可撤销个人连带责任信用反担保合同</view>
 				</block>
 				<!-- 合同签约 end -->
 				
 			</view>
 			<!-- <view class="surbtns" @click="getMoreSure">确认</view> -->
 		</view>
-		<pop-up :type="type" :shtg="shtg" :loanApplicationId="datainfo.loanApplicationId" :loanApplicationNumber="datainfo.loanApplicationNumber" :userList="userList" 
+		<pop-up :type="type" :startady="daytime" :shtg="shtg" :loanApplicationId="datainfo.loanApplicationId" :loanApplicationNumber="datainfo.loanApplicationNumber" :userList="userList" 
 		:stepList="stepList" :wjcjobj='wjcjobj' :qtfjobj="qtfjobj" :stepval="stepval" :fjval="fjval"
 		 @getfjAdd="getfjAdd"
 		 @getClose="getClose" @getupSubmit="getupSubmit" @getSure="getSure"></pop-up>
@@ -290,16 +303,17 @@
 	import dfjxx from "@/work/components/business/dfjxx.vue"
 	import ewjcj from "@/work/components/business/ewjcj.vue"
 	import fshxx from "@/work/components/business/fshxx.vue"
+	import gtpjg from "@/work/components/business/gtpjg.vue"
 	import {uploadmore,selectValue} from '@/utils/common.js'
 	import {getInfo} from "@/api/login.js"
 	import {getDictionaryFn} from "@/api/mine/register.js"
 	import {getUsernoPageList,getFjAdd,getFjDel} from "@/api/common.js"
 	import {getApplicationDet,getScheduleList,getHyperlinkList,getApplicationDel,getApplicationSh,getCommentsList,getApplicationSs,getApplicationCx,getapplicationGd,getapplicationXib,getExportMb,
-	getZanHuan,getAuthorize
+	getZanHuan,getAuthorize,getReview,getVoteAdd,getcxVoteAdd,getVoteFive,getVoteTimeList,getVoteFinish
 	} from "@/api/mine/work.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
-		components:{aqyxx,bfrxx,cfdbrxx,dfjxx,ewjcj,fshxx,popUp},
+		components:{aqyxx,bfrxx,cfdbrxx,dfjxx,ewjcj,fshxx,gtpjg,popUp},
 		data(){
 			return{
 				start:require('@/work/static/images/start.png'),
@@ -308,7 +322,7 @@
 				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'},],
+				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','c:conference:list:time'"},],
 				// tabLists:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3}],
 				stepList:[],
 				stepval:0,
@@ -403,6 +417,7 @@
 				userList:[],//用户列表
 				shjdlist:[],//审核进度
 				shlist:[],//审核信息
+				tplist:[],//投票列表
 				shinfo:{},//审核信息
 				wjcjobj:{},//文件出具对象
 				qtfjobj:{'qtfj':"其他附件"},//其他附件
@@ -422,7 +437,9 @@
 					{tit:'智能文档',val:'o',children:['otl']},
 					{tit:'多维表格',val:'d',children:['dbt']},
 				],
-				isqiye:true
+				isqiye:true,
+				pfrom:'',//vote  从投票来的
+				daytime:'',
 			}
 		},
 		onUnload() {
@@ -430,6 +447,10 @@
 		},
 		onLoad(e) {
 			this.id=e.id;
+			if(e.from){
+				this.pfrom=e.from
+			}
+			this.time()
 			uni.$on('refreshywlist',(e) => {
 				this.getDetail();
 			})
@@ -444,10 +465,12 @@
 			if(checkPermi(['system:user:noPageList'])){
 				this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
 			}
-			if(checkPermi(['system:system:user']&&checkPermi(['system:comments:list']))){
+			if(checkPermi(['system:system:user','system:comments:list'])){
 				this.getCommentsList()//审核意见
 			}
-			
+			if(checkPermi(['system:system:user','c:conference:list:time'])){
+				this.getVoteTimeList()//投票结果
+			}
 			// this.getInfolis()
 		},
 		mounted() {
@@ -471,19 +494,13 @@
 			}
 		},
 		methods:{
-			// getInfolis() {
-			// 	 getInfo().then(res=>{
-			// 	 	if(res.code==200){
-			// 			if(res.roles != null && res.roles[0] == 'qy_user'){
-			// 				this.isqiye = true
-			// 			}else{
-			// 				this.isqiye = false;
-			// 				this.getCommentsList()
-			// 			}
-				 		
-			// 	 	}
-			// 	 })
-			// },
+			time() {
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				this.daytime=y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
+			},
 			checkPermi, checkRole,
 			statusFormats(ite,list,type){//多选匹配
 				if(ite){
@@ -640,15 +657,21 @@
 							}
 						})
 						this.shlist=newArr
-						// this.shlist = res.rows.map(v => {
-						// 	return {
-						// 			auditType: v.auditType,
-						// 			auditView: v.auditView,
-						// 			fjUrl:v.fjUrl,
-						// 			imageUrl:v.imageUrl.split(',')||v.imageUrl
-						// 		}
-						// 	})
-						// this.shlist=res.rows
+					}
+				})
+			},
+			// 投票结果
+			getVoteTimeList(){
+				var params={
+					loanApplicationId:this.id,
+				}
+				getVoteTimeList(params).then(res=>{
+					if(res.code==200){
+						var newArr=res.data;
+						newArr.forEach(ite=>{
+							ite.check=false
+						})
+						this.tplist=JSON.parse(JSON.stringify(newArr))
 					}
 				})
 			},
@@ -762,6 +785,8 @@
 				})
 				if(val==5){
 					this.getCommentsList()
+				}else if(val==6){
+					this.getVoteTimeList();
 				}else if(val==4&&this.iscjflag){
 					this.iscjflag=false;
 					this.getDetail();
@@ -862,6 +887,16 @@
 					this.shtg=data.auditType
 				}else if(type=='zhfkhgb'){
 					this.getZanHuanFn()
+				}else if(type=='shshty'){//上会
+					this.getReview()
+				}else if(type=='shsh'){//日期
+					this.getVoteFive()
+				}else if(type=='shshtp'){//投票
+					this.getVoteAdd()
+				}else if(type=='sssh'){//申诉
+					this.getSsshFn()
+				}else if(type=='cxtp'){//重新投票
+					this.getcxVoteAdd()
 				}else{
 					this.getApplicationSh()
 				}
@@ -904,6 +939,133 @@
 					}
 				})
 			},
+			// 上会同意接口
+			getReview(data){
+				var that=this;
+				var params=this.shinfo;
+				params.loanApplicationId=this.id;
+				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				params.auditSchedule=this.auditSchedule;
+				params.aUserId=this.datainfo.aUserId;
+				params.loanSchedule=this.datainfo.loanSchedule;
+				params.auditType=this.datainfo.auditType;
+				getReview(params).then(res=>{
+					if(res.code==200){
+						that.$toast('审核成功')
+						setTimeout(function(){
+							that.getDetail();
+							uni.$emit('refreshdatalist')
+							that.type=''
+						},1200)
+					}
+				})	
+			},
+			
+			// 上会日期
+			getVoteFive(data){
+				var that=this;
+				var params=this.shinfo;
+				params.loanApplicationId=this.id;
+				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				// params.auditSchedule=this.auditSchedule;
+				getVoteFive(params).then(res=>{
+					if(res.code==200){
+						that.$toast('操作成功')
+						setTimeout(function(){
+							that.getDetail();
+							uni.$emit('refreshdatalist')
+							that.type=''
+						},1200)
+					}
+				})	
+			},
+			// 上会投票
+			getVoteAdd(data){
+				var that=this;
+				var params=this.shinfo;
+				params.loanApplicationId=this.id;
+				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				params.auditSchedule=this.auditSchedule;
+				params.conferenceTime=this.datainfo.reviewTime;
+				getVoteAdd(params).then(res=>{
+					if(res.code==200){
+						that.$toast('投票成功')
+						setTimeout(function(){
+							that.getDetail();
+							uni.$emit('refreshdatalist')
+							that.type=''
+						},1200)
+					}
+				})	
+			},
+			// 重新投票
+			getcxVoteAdd(){
+				var that=this;
+				var params=this.shinfo;
+				params.loanApplicationId=this.id;
+				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				// params.auditSchedule=this.auditSchedule;
+				getcxVoteAdd(params).then(res=>{
+					if(res.code==200){
+						that.$toast('操作成功')
+						setTimeout(function(){
+							that.getDetail();
+							uni.$emit('refreshdatalist')
+							that.type=''
+						},1200)
+					}
+				})
+			},
+			// 一票否决
+			getVoteFinish(){
+				var that=this;
+				uni.showModal({
+					title: '确认否决',
+					content: "是否一键否决该申请",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							var params={
+								loanApplicationId:that.id,
+							}
+							getVoteFinish(params).then(res=>{
+								if(res.code==200){
+									that.$toast('一票否决成功')
+									setTimeout(function(){
+										that.getDetail();
+										uni.$emit('refreshdatalist')
+										that.type=''
+									},1200)
+								}
+							})
+						} else if (res.cancel) {
+						}
+					}
+				});
+				
+			},
+			// 申诉
+			getSsshFn(data){
+				var that=this;
+				var params=this.shinfo;
+				params.loanApplicationId=this.id;
+				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				params.auditSchedule=this.auditSchedule;
+				params.auditType=this.datainfo.auditType;
+				params.aUserId=this.datainfo.aUserId;
+				params.bUserId=this.datainfo.bUserId;
+				getApplicationSs(params).then(res=>{
+					if(res.code==200){
+						that.$toast('操作成功')
+						setTimeout(function(){
+							that.getDetail();
+							uni.$emit('refreshdatalist')
+							that.type=''
+						},1200)
+					}
+				})	
+			},
 			// 暂缓出具
 			getZanHuanFn(data){
 				var that=this;
@@ -957,6 +1119,7 @@
 			},
 			getSsFn(){
 				var that=this;
+				var datainfo=JSON.parse(JSON.stringify(this.datainfo))
 				uni.showModal({
 					title: '确认申诉',
 					content: "是否确认申诉",
@@ -966,7 +1129,11 @@
 						if (res.confirm) {
 							var params={
 								loanApplicationId:that.id,
-								aUserId:that.datainfo.aUserId
+								loanApplicationNumber:datainfo.loanApplicationNumber,
+								aUserId:datainfo.aUserId,
+								bUserId:datainfo.bUserId,
+								auditType:datainfo.auditType,
+								ssType:1,
 							}
 							getApplicationSs(params).then(res=>{
 								if(res.code==200){
@@ -974,9 +1141,6 @@
 									setTimeout(function(){
 										that.getDetail();
 										uni.$emit('refreshdatalist')
-										// uni.navigateBack({
-										// 	delta:1
-										// })
 									},1200)
 									
 								}
@@ -988,6 +1152,7 @@
 			},
 			getCxFn(){
 				var that=this;
+				var datainfo=JSON.parse(JSON.stringify(this.datainfo))
 				uni.showModal({
 					title: '确认撤销',
 					content: "是否确认撤销",
@@ -998,10 +1163,15 @@
 							that.mtype=''
 							var params={
 								loanApplicationId:that.id,
+								loanApplicationNumber:datainfo.loanApplicationNumber,
 								auditSchedule:that.auditSchedule,
-								loanSchedule:that.datainfo.loanSchedule,
-								loanApplicationType:that.datainfo.loanApplicationType,
-								auditType:that.datainfo.auditType
+								loanSchedule:datainfo.loanSchedule,
+								loanApplicationType:datainfo.loanApplicationType,
+								auditType:datainfo.auditType,
+								reviewSchedule:datainfo.reviewSchedule,
+								aUserId:datainfo.aUserId,
+								bUserId:datainfo.bUserId,
+								fUserId:datainfo.fUserId,
 							}
 							getApplicationCx(params).then(res=>{
 								if(res.code==200){
@@ -1031,9 +1201,11 @@
 						if (res.confirm) {
 							var params={
 								loanApplicationId:that.id,
-								// auditSchedule:that.auditSchedule,
+								auditSchedule:that.auditSchedule,
 								loanSchedule:that.datainfo.loanSchedule,
-								// loanApplicationType:that.datainfo.loanApplicationType
+								aUserId:that.datainfo.aUserId,
+								loanApplicationNumber:that.datainfo.loanApplicationNumber,
+								enterpriseName:that.datainfo.enterpriseName,
 							}
 							getapplicationXib(params).then(res=>{
 								if(res.code==200){

work/pages/business/vote.vue

@@ -0,0 +1,97 @@
+<template>
+	<view class="listbox">
+		<!-- 列表 -->
+		<view class="plr18">
+			<bus-list :datalist="list" :wtdt="wtdt"  :type="type" @getDetail="getDetail"></bus-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	import busList from "@/work/components/business/list.vue"
+	import {getApplicationList} from "@/api/mine/work.js"
+	import {getDictionaryFn} from "@/api/mine/register.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	export default{
+		components:{busList},
+		data(){
+			return{
+				upimg:require('@/work/static/images/sup.png'),
+				resetimg:require('@/work/static/images/reset.png'),
+				list:[{tit:'1'}],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				type:"vote",
+				userId:this.$store.state.user.userId,
+			}
+		},
+		onLoad(e) {
+			this.getDataFn()
+		},
+		methods:{
+			checkPermi, checkRole,
+
+			getDataFn(){
+				// var str='2,3,4'
+				// var params={
+				// 	pageSize:this.pageSize,
+				// 	pageNum: this.pageNum,
+				// }
+				// getApplicationList(params).then(res=>{
+				// 	if(res.code==200){
+				// 		if (res.rows.length < this.pageSize) {
+				// 			this.reachflag = false
+				// 			this.wtdt = '到底了~';
+				// 		} else {
+				// 			var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+				// 			if (num < res.total) {
+				// 				this.reachflag = true
+				// 				this.wtdt = ''
+				// 			} else {
+				// 				this.reachflag = false
+				// 				this.wtdt = '到底了~';
+				// 			}
+				// 		}
+				// 		if (this.pageNum == 1) {
+				// 			this.list = res.rows;
+				// 		} else {
+				// 			this.list = this.list.concat(res.rows)
+				// 		}
+				// 	}else{
+				// 		this.$toast(res.msg)
+				// 	}
+				// }) 
+			},
+		},
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+.fixedt{position: fixed;left: 0;right: 0;top: 0;z-index: 2;}
+.fixedt /deep/ uni-picker{flex: 1;}
+.tablists{background: $com-cd3;overflow: auto;flex-wrap: nowrap;padding:4rpx 16rpx 16rpx;
+	view{font-weight: bold;font-size: 26rpx;color: #FFFFFF;position: relative;flex: 1 0 auto;padding: 0rpx 20rpx;margin-right: 6rpx;box-sizing: border-box;text-align: center;
+		height: 80rpx;display: flex;align-items: center;
+		&:last-child{margin-right: 0;}
+		&.act{font-size: 30rpx;
+			&::after{content: '';width: 30rpx;height: 10rpx;background: #FFFFFF;border-radius: 4rpx;left: 50%;margin-left: -15rpx;bottom: 0rpx;position: absolute;}
+		}
+	}
+}
+.checkbox{padding: 4rpx 0 0 20rpx ;background-color: #efefef;
+	.chekt{display: flex;align-items: center;margin-right: 12rpx;height:88rpx;
+		view{text-align: center;
+			font-weight: bold;font-size: 26rpx;color: #374B61;width: 136rpx;word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: normal;}
+		image{width: 16rpx;height: 12rpx;flex: 0 0 auto;margin-left: 4rpx;}
+	}
+}
+.reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;
+	image{width: 26rpx;height: 30rpx;}
+}
+.listbox{padding-top: 20rpx;padding-bottom: 24rpx;}
+</style>

work/pages/business/votelist.vue

@@ -0,0 +1,227 @@
+<template>
+	<view class="listbox">
+		<view class="fixedt">
+			<!-- 选择器 -->
+			<view class="flexc checkbox">
+				<picker mode="date"   @change='bindDateChangea'>
+					<view class="chekt">
+						<view>{{shsj|| "上会时间"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker>
+				<!-- <picker range-key='label' :value="shidx" :range="shlist"  @change='bindDateChangeb'>
+					<view class="chekt">
+						<view>{{shzt || "申贷次数"}}</view>
+						<image :src="upimg"></image>
+					</view>
+				</picker> -->
+				<view class="reset" @click="getResetFn">
+					<image :src="resetimg"></image>
+				</view>
+				<view class="topc flexc">
+					<image :src="secimg"></image>
+					<input  placeholder="请输入企业名称" confirm-type="search" v-model="usename" @confirm="getConfirm"/>
+				</view>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<view class="plr18">
+			<bus-list :datalist="list" :wtdt="wtdt" :type="type" :sdyhlist="sdyhlist" :dblxlist="dblxlist" :shjdlist="shjdlist" @getDetail="getDetail"></bus-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
+	const baseName = config.baseName
+	import busList from "@/work/components/business/list.vue"
+	import {getVoteList} from "@/api/mine/work.js"
+	import {getDictionaryFn} from "@/api/mine/register.js"
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	export default{
+		components:{busList},
+		data(){
+			return{
+				secimg:require("@/static/images/home/hsearch.png"),
+				upimg:require('@/work/static/images/sup.png'),
+				resetimg:require('@/work/static/images/reset.png'),
+				scanimg:require('@/work/static/images/scan.png'),
+				list:[],
+				sdyhlist:[],
+				dblxlist:[],
+				shjdlist:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				// limit:''
+				type:'vote',
+				shsj:'',
+				usename:'',
+				// type:'//file  ',
+			}
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
+		onLoad() {
+			uni.$on('refreshywlist',(e) => {
+				this.getrefreshData()
+			})
+			uni.$on('refreshdatalist',(e) => {
+				this.getrefreshData()
+			})
+			this.init()
+			this.getDataFn()
+		},
+		methods:{
+			checkPermi, checkRole,
+			init(){
+				// 申贷银行
+				getDictionaryFn('shendai_bank').then(res=>{
+					if(res.code==200){
+						this.sdyhlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				//审核状态
+				getDictionaryFn('sh_status').then(res=>{
+					if(res.code==200){
+						this.shlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				//担保类型
+				getDictionaryFn('guarantee_type').then(res=>{
+					if(res.code==200){
+						this.dblxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				//审核进度
+				getDictionaryFn('audit_schedule').then(res=>{
+					if(res.code==200){
+						this.shjdlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getDetail(e){
+				this.$tab.navigateTo("/work/pages/business/details?id="+e+"&from=vote")
+			},
+			getConfirm(){
+				this.getrefreshData()
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.shsj=val;
+				this.getrefreshData()
+			},
+			bindDateChangeb(e){
+				var val=e.detail.value;
+				this.shzt=this.shlist[val].label;
+				this.shztid=this.shlist[val].value;
+				this.getrefreshData()
+			},
+			getResetFn(){
+				// 重置
+				this.shsj='';
+				this.usename='';
+				this.getrefreshData()
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getDataFn(){
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+					// loanApplicationType:4,
+				}
+				if(this.shsj){
+					params.reviewTime=this.shsj
+				}
+				
+				if(this.usename){
+					params.enterpriseName=this.usename
+				}
+				getVoteList(params).then(res=>{
+					if(res.code==200){
+						if (res.rows.length < this.pageSize) {
+							this.reachflag = false
+							this.wtdt = '到底了~';
+						} else {
+							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+							if (num < res.total) {
+								this.reachflag = true
+								this.wtdt = ''
+							} else {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							}
+						}
+						if (this.pageNum == 1) {
+							this.list = res.rows;
+						} else {
+							this.list = this.list.concat(res.rows)
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				}) 
+			},
+		},
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+.fixedt{position: fixed;left: 0;right: 0;top: 0;z-index: 2;}
+// .fixedt /deep/ uni-picker{flex: 1;}
+
+.checkbox{padding:16rpx 32rpx;background-color: #efefef;
+	.chekt{display: flex;align-items: center;margin-right: 12rpx;height:88rpx;
+		view{text-align: center;
+			font-weight: bold;font-size: 26rpx;color: #374B61;width: 136rpx;word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: normal;}
+		image{width: 16rpx;height: 12rpx;flex: 0 0 auto;margin-left: 4rpx;}
+	}
+}
+.reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;
+	image{width: 26rpx;height: 30rpx;}
+}
+.topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 28rpx;position: relative;flex:1;background-color:rgba(90, 135, 186, 0.2);width: 260rpx;
+	margin-left: 20rpx;
+	input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
+	image{width: 30rpx;height: 30rpx;margin-right: 16rpx;flex: 0 0 auto;}
+}
+// .listbox{padding-top: 120rpx;padding-bottom: 100rpx;}
+.listbox{padding-top: 120rpx;}
+.scanbox{position: fixed;left: 0;right: 0;bottom: 0;height: 100rpx;
+background: #00A9F0;font-weight: bold;font-size: 30rpx;color: #FFFFFF;
+	image{width: 26rpx;height: 26rpx;margin-right: 24rpx;}
+}
+</style>