测试修改

pages/index/index.vue

@@ -83,10 +83,10 @@
 								<view class="img"><image :src="topiimg" class="imgg"></image></view>
 								<view>投票结果</view>
 							</view>
-							<view class="grid-item-box" @click="getTouPFn">
+							<!-- <view class="grid-item-box" @click="getTouPFn">
 								<view class="img"><image :src="topjimg" class="imgd"></image></view>
 								<view>保后报告</view>
-							</view>
+							</view> -->
 						</view>
 					</swiper-item>
 				</swiper>
@@ -247,7 +247,7 @@
 		}
 	},
 	onUnload() {
-		uni.$off('refreshdatalist')
+		// uni.$off('refreshdatalist')
 	},
 	onShow() {
 		if(checkPermi(['system:registered:user'])&&!checkPermi(['system:system:user'])){
@@ -255,9 +255,9 @@
 		}	
 	},
 	onLoad: function() {
-		uni.$on('refreshdatalist',(e) => {
-			this.getrefreshData()
-		})
+		// uni.$on('refreshdatalist',(e) => {
+		// 	this.getrefreshData()
+		// })
 		
 		// this.init()
 		var that=this;

work/components/business/cfdbrxx.vue

@@ -6,7 +6,7 @@
 		</view>
 		<view class="txt">反担保人姓名：<text>{{datainfo.guaranteeName}}</text></view>
 		<view class="txt">身份证号：<text>{{datainfo.guaranteeIdCard}}</text>
-			<text class="txta ml8" v-if="datainfo.guaranteeFront" @click="getDown(datainfo.guaranteeFront)">查看照片</text>
+			<text class="txta ml8" v-if="datainfo.guaranteeFront||datainfo.guaranteeBack" @click="getDownGd(datainfo,'fdbsfz')">查看照片</text>
 		</view>
 		<view class="txt">手机号码：<text>{{datainfo.guaranteePhone}}</text></view>	
 	</view>
@@ -95,6 +95,8 @@
 </template>
 
 <script>
+	import config from '@/config'
+	const baseUrl = config.baseUrl
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { selectValue } from '@/utils/common.js';
 	import noData from "@/components/nodata/nodata.vue"
@@ -140,6 +142,23 @@
 		getPreview(url){
 			this.$emit('getPreview',url)
 		},
+		getDownGd(ite,type){
+			var url=[]
+			if(type=='fdbsfz'){
+				if(ite.guaranteeFront){
+					var urla=baseUrl+ite.guaranteeFront;
+					url.push(urla)
+				}
+				if(ite.guaranteeBack){
+					var urlb=baseUrl+ite.guaranteeBack;
+					url.push(urlb)
+				}
+			}
+			uni.previewImage({
+				current: 0,
+				urls: url,
+			});
+		},
 	},
 	
   }

work/components/business/fshxx.vue

@@ -19,9 +19,9 @@
 							</view>
 							<view class="listrx flext">
 								<view class="ltit">审核状态：</view>
-								<view class="ltxt">{{ite.auditType=='3'?'未通过':'通过'}}</view>
+								<view class="ltxt">{{kaType(ite.auditType,shztlist)}}</view>
 							</view>
-							<view class="listrx flext">
+							<view class="listrx flext" v-if="ite.auditView">
 								<view class="ltit">审核意见：</view>
 								<view class="ltxt">{{ite.auditView}}</view>
 							</view>
@@ -89,6 +89,12 @@
 				return []
 			}
 		},
+		shztlist:{
+			type: Array,
+			default () {
+				return []
+			}
+		}
 
 	},
 	components:{

work/components/business/list.vue

@@ -30,7 +30,7 @@
 						<view class="txt"><text class="tit">担保类型</text><text class="line">|</text><text>{{statusFormats(ite.guaranteeType,dblxlist)}}</text></view>
 						<view class="txt"><text class="tit">资金用途</text><text class="line">|</text><text>{{ite.purposeFunds}}</text></view>
 						<view class="txt"><text class="tit">还款来源</text><text class="line">|</text><text>{{ite.repaymentSource}}</text></view>
-						<view class="txt"><text class="tit" v-if="ite.auditSchedule==1&&ite.auditType==3">拒绝原因</text><text class="line">|</text><text>{{ite.rejectionReason}}</text></view>
+						<view class="txt" v-if="ite.auditSchedule==1&&ite.auditType==3&&ite.rejectionReason"><text class="tit">拒绝原因</text><text class="line">|</text><text>{{ite.rejectionReason}}</text></view>
 					</view>
 				</view>
 			</view>

work/pages/business/add.vue

@@ -529,7 +529,7 @@
 				<view class="addtit mt3"><text>*</text>婚姻证明</view>
 				<view class="bgf plr12">
 					<!-- 离婚状态上传 -->
-					<uni-forms-item label="离婚证" name="iszcy" v-if="datainfo.corporationMaritalStatus==3">
+					<uni-forms-item label="离婚证" name="iszcy" v-show="datainfo.corporationMaritalStatus==3">
 						<view class="phobox">
 							<view class="phoboxa" v-if="jcfjobj.frlhz">
 								<lsj-upload ref="lsjUpload" childId="upload1" :fileName="jcfjobj.frlhz" fileVal='frlhz' bigType="a" :width="pwidth" :height="pheight" :option="option" :size="size" :formats="formats" :debug="debug" :instantly="instantly"
@@ -553,7 +553,7 @@
 							</block>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="结婚证" name="iszcy" v-else>
+					<uni-forms-item label="结婚证" name="iszcy" v-show="datainfo.corporationMaritalStatus!=3">
 						<view class="phobox">
 							<view class="phoboxa" v-if="jcfjobj.frjhz">
 								<lsj-upload ref="lsjUpload" childId="upload1" :fileName="jcfjobj.frjhz" fileVal='frjhz' bigType="a" :width="pwidth" :height="pheight" :option="option" :size="size" :formats="formats" :debug="debug" :instantly="instantly"
@@ -2015,6 +2015,9 @@
 							}
 						},1200)
 					}
+				}).catch(error => {
+					uni.hideLoading();
+					this.loadflag=false;
 				})
 			},
 			getDetail(){
@@ -2043,7 +2046,7 @@
 								return ite.remark!=1;
 							})
 							this.fjRemarkFj=JSON.parse(JSON.stringify(fjRemarkFj));
-							console.log(fjRemarkFj,1)
+							// console.log(fjRemarkFj,1)
 							// this.filelist=JSON.parse(JSON.stringify(data.loanApplicationFjList))
 						}
 						if(data.declareFj){
@@ -2297,6 +2300,9 @@
 								that.$tab.redirectTo('/work/pages/success')
 							},1200)
 						}
+					}).catch(error => {
+						uni.hideLoading();
+						this.loadflag=false;
 					})
 				}else{
 					getApplicationEdit(params).then(res=>{
@@ -2312,6 +2318,9 @@
 								})
 							},1200)
 						}
+					}).catch(error => {
+						uni.hideLoading();
+						this.loadflag=false;
 					})
 				}
 				

work/pages/business/details.vue

@@ -56,7 +56,7 @@
 		<view class="main">
 			<!-- 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="!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':''" v-for="(ite,idx) in tabList" :key="idx" @click="getTab(ite.val)">{{ite.tit}}</view>
 			</view>
 			<view style="height:116rpx;" v-if="fixedflag"></view>
 			<!-- 企业信息 -->
@@ -77,7 +77,7 @@
 					<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>
+					<fshxx @getDown="getDown" :shztlist="shztlist" :shjdlist="shjdlist"  :datalist="shlist" ></fshxx>
 				</block>
 				<!-- 投票结果 -->
 				<block v-if="tabval==6">
@@ -119,7 +119,6 @@
 					<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>
 					<!-- 申诉状态除了修改，都不给 -->
@@ -162,10 +161,10 @@
 					<!-- 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==1" @click="getShFn('shshty')">上会审核</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>
+						<view class="fbtns bga" v-if="datainfo.reviewSchedule==3"  @click="getShFn('shsh')">上会日期</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 -->
@@ -177,33 +176,29 @@
 					</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>
+						<!-- 管理员 可以让a角 提前开放款通知书，意向函， a角色和管理员给 &&datainfo.aAuthorize!='Y'-->
+						<view class="fbtns bgb" v-if="checkPermi(['system:application:authorize'])&&stepval==8" @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 bgd" v-if="stepval>1&&checkPermi(['system:system:user'])" @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.aUserId&&(auditSchedule==3||auditSchedule>6)" @click="getCxFn">撤销</view>
+						<view class="fbtns bgb" v-if="userId==datainfo.bUserId&&auditSchedule==4" @click="getCxFn">撤销</view>
 						<!-- 风险部撤销 -->
-						<view class="fbtns bgb" v-if="userId==datainfo.fUserId&&(auditSchedule==5||stepval==5&&datainfo.auditType==1||stepval==9)" @click="getCxFn">撤销f</view>
+						<view class="fbtns bgb" v-if="userId==datainfo.fUserId&&(auditSchedule==5||stepval==5&&datainfo.auditType==1||stepval==9)" @click="getCxFn">撤销</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>
+						<view class="fbtns bgb" v-if="checkRole(['manager'])&&(datainfo.auditType!=1||auditSchedule>7||auditSchedule==2||stepval==6&&datainfo.reviewSchedule>1)" @click="getCxFn">撤销</view>
 					</block>
 				</block>
 				
@@ -232,6 +227,10 @@
 						<view class="fbtns bgb" v-if="stepval==8&&checkPermi(['system:application:zanHuan'])" @click="getShFn('zhfkhgb')">暂缓出具放款合规表</view>
 						<!-- <view class="fbtns bgb" @click="getfjEdit('fkhgb')">上传附件</view> -->
 					</block>
+					<!-- 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 @click="getQtfjEdit('qtfj')">上传其他附件</view>
 				</block>
 				<!--风险部门 start 外部工具平台 -->
@@ -323,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'},{tit:"投票结果",val:6,limit:"'system:system:user','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'},{tit:"投票结果",val:6,limit:'system:system:user',limita:'c:conference:list:time'},],
 				// tabLists:[{tit:"企业信息",val:0},{tit:"法人信息",val:1},{tit:"反担保人信息",val:2},{tit:"附件信息",val:3}],
 				stepList:[],
 				stepval:0,
@@ -417,6 +416,7 @@
 				linkList:[],//外部链接
 				userList:[],//用户列表
 				shjdlist:[],//审核进度
+				shztlist:[],//审核状态
 				shlist:[],//审核信息
 				tplist:[],//投票列表
 				shinfo:{},//审核信息
@@ -443,18 +443,12 @@
 				daytime:'',
 			}
 		},
-		onUnload() {
-			// uni.$off('refreshywlist')
-		},
 		onLoad(e) {
 			this.id=e.id;
 			if(e.from){
 				this.pfrom=e.from
 			}
 			this.time()
-			// uni.$on('refreshywlist',(e) => {
-			// 	this.getDetail();
-			// })
 			this.init()
 			this.getDetail();
 			if(checkPermi(['system:schedule:list'])){
@@ -466,10 +460,10 @@
 			if(checkPermi(['system:user:noPageList'])){
 				this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
 			}
-			if(checkPermi(['system:system:user','system:comments:list'])){
+			if(checkPermi(['system:system:user'])&&checkPermi(['system:comments:list'])){
 				this.getCommentsList()//审核意见
 			}
-			if(checkPermi(['system:system:user','c:conference:list:time'])){
+			if(checkPermi(['system:system:user'])&&checkPermi(['c:conference:list:time'])){
 				this.getVoteTimeList()//投票结果
 			}
 			// this.getInfolis()
@@ -749,6 +743,17 @@
 						this.wjcjobj=obj
 					}
 				})
+				//审核状态
+				getDictionaryFn('sh_status').then(res=>{
+					if(res.code==200){
+						this.shztlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue,
+							}
+						})
+					}
+				})
 				// 其他附件
 				// getDictionaryFn('application_fj_other').then(res=>{
 				// 	if(res.code==200){
@@ -968,6 +973,7 @@
 				var params=this.shinfo;
 				params.loanApplicationId=this.id;
 				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
+				params.enterpriseName=this.datainfo.enterpriseName;
 				// params.auditSchedule=this.auditSchedule;
 				getVoteFive(params).then(res=>{
 					if(res.code==200){
@@ -1056,6 +1062,7 @@
 				params.auditType=this.datainfo.auditType;
 				params.aUserId=this.datainfo.aUserId;
 				params.bUserId=this.datainfo.bUserId;
+				params.enterpriseName=this.datainfo.enterpriseName;
 				getApplicationSs(params).then(res=>{
 					if(res.code==200){
 						that.$toast('操作成功')
@@ -1134,6 +1141,7 @@
 								aUserId:datainfo.aUserId,
 								bUserId:datainfo.bUserId,
 								auditType:datainfo.auditType,
+								enterpriseName:datainfo.enterpriseName,
 								ssType:1,
 							}
 							getApplicationSs(params).then(res=>{
@@ -1170,6 +1178,7 @@
 								loanApplicationType:datainfo.loanApplicationType,
 								auditType:datainfo.auditType,
 								reviewSchedule:datainfo.reviewSchedule,
+								enterpriseName:datainfo.enterpriseName,
 								aUserId:datainfo.aUserId,
 								bUserId:datainfo.bUserId,
 								fUserId:datainfo.fUserId,
@@ -1178,6 +1187,7 @@
 								if(res.code==200){
 									that.$toast("撤销成功")
 									setTimeout(function(){
+										that.getDetail()
 										uni.$emit('refreshywlist')
 										// uni.navigateBack({
 										// 	delta:1
@@ -1212,6 +1222,7 @@
 								if(res.code==200){
 									that.$toast("推进成功")
 									setTimeout(function(){
+										that.getDetail()
 										uni.$emit('refreshywlist')
 									},1200)
 									
@@ -1243,6 +1254,7 @@
 								if(res.code==200){
 									that.$toast("归档成功")
 									setTimeout(function(){
+										that.getDetail()
 										uni.$emit('refreshywlist')
 										// uni.navigateBack({
 										// 	delta:1
@@ -1344,7 +1356,6 @@
 						// }
 					}
 				}).catch(error => {
-					console.log(23)
 					setTimeout(function(){
 						uni.navigateBack({
 							delta:1
@@ -1492,7 +1503,7 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 	}	
 }
 .morebox{
-	position: fixed;left: 0;right: 0;bottom: 0;z-index: 10;
+	position: fixed;left: 0;right: 0;bottom: 0;z-index: 10;max-height: calc(100vh - 200rpx);overflow: auto;
 	.molists{
 		view{width: 100%;background: #ffffff;font-weight: 500;font-size: 30rpx;color: #222327;border-bottom: 2rpx solid #E6E6E6;min-height: 100rpx;display: flex;align-items: center;justify-content: center;padding: 10rpx;
 		box-sizing: border-box;

work/pages/business/votelist.vue

@@ -69,6 +69,10 @@
 				this.getDataFn()
 			}
 		},
+		onUnload() {
+			uni.$off('refreshywlist')
+			uni.$off('refreshdatalist')
+		},
 		onLoad() {
 			uni.$on('refreshywlist',(e) => {
 				this.getrefreshData()