zouling 1 anno fa
parent
commit
ed02e1670c

+ 7 - 8
pages/mine/index.vue

@@ -20,14 +20,13 @@
 				<image v-else @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image>
 				<view class="cbox">
 					<view class="tit">{{name?name:'登录账号'}}</view>
-					<view class="flexc pr">
-						<image :src="headl"></image>
-						<block v-if="roleName&&roleName.length">
-							<view class="txt" v-for="(ite,idx) in roleName" :key="idx">{{ite}}</view>
-						</block>
-						
-						<image :src="headr"></image>
-					</view>
+					<block v-if="roleName&&roleName.length">
+						<view class="flexc pr" v-for="(ite,idx) in roleName" :key="idx">
+							<image :src="headl"></image>
+								<view class="txt" >{{ite}}</view>
+							<image :src="headr"></image>
+						</view>
+					</block>
 				</view>
 				<image :src="wrimg" class="rimg"></image>
 			</view>

+ 16 - 4
pages/work/index.vue

@@ -28,12 +28,12 @@
 							<image :src="upimg"></image>
 						</view>
 					</picker>
-					<picker range-key='label' :value="shidx" :range="shlist"  @change='bindDateChangeb'>
+					<!-- <picker range-key='label' :value="shidx" :range="shlist"  @change='bindDateChangeb'>
 						<view class="chekt">
 							<view>{{shzt || "申请额度"}}</view>
 							<image :src="upimg"></image>
 						</view>
-					</picker>
+					</picker> -->
 					<picker range-key='label' :value="sdyhidx" :range="sdyhlist"  @change='bindDateChangec'>
 						<view class="chekt">
 							<view>{{sdyh || "申贷银行"}}</view>
@@ -49,7 +49,7 @@
 			<image :src="bgimg" class="bgimg"></image>
 			<view class="zxmain" :style="'margin-top:-'+marTop+'rpx;'">
 				<!-- list -->
-				<bus-list :datalist="list" :wtdt="wtdt" :sdyhlist="sdyhlist" :dblxlist="dblxlist" :type="type" @getDetail="getDetail"></bus-list>
+				<bus-list :datalist="list" :wtdt="wtdt" :shjdlist="shjdlist" :sdyhlist="sdyhlist" :dblxlist="dblxlist" :type="type" @getDetail="getDetail"></bus-list>
 			</view>
 		</view>
 	<footers v-if="isfootflag"  :footerindex="footerindex"  :isHomeIndex="true"></footers>
@@ -93,7 +93,8 @@
 			shidx:0,
 			shzt:'',
 			shztid:'',
-			shlist:[{label:"未审",value:'0'},{label:"已审",value:'1'},{label:"已拒",value:'2'}],
+			shlist:[],
+			shjdlist:[],//审核进度
 			sdyhlist:[],//申贷银行,
 			dblxlist:[],//担保类型
 			sdyh:'',
@@ -235,6 +236,17 @@
 					})
 				}
 			})
+			//审核进度
+			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)

+ 1 - 1
uni_modules/lsj-upload/hybrid/html/uploadFile.html

@@ -8,7 +8,7 @@
 		<style type="text/css">
 			.content {background: transparent;}
 			.btn {position: relative;top: 0;left: 0;bottom: 0;right: 0;}
-			.btn .file {position: fixed;z-index: 93;left: 0;right: 0;top: 0;bottom: 0;width: 100%;opacity: 0;}
+			.btn .file {position: fixed;z-index: 3;left: 0;right: 0;top: 0;bottom: 0;width: 100%;opacity: 0;}
 		</style>
 	</head>
 

+ 3 - 3
work/components/popup/popup.vue

@@ -282,11 +282,11 @@
 				<image :src="closeimg"></image>
 			</view>
 			<view class="ttit">业务审核</view>
-			<!-- <view class="mb16">
+			<view class="mb16">
 				<view class="ttxt mb18">是否通过</view>
 				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tgList" />
 			</view>
-			<view class="mb16">
+			<!-- <view class="mb16">
 				<view class="ttxt mb18">审核意见</view>
 				<textarea class="textar" v-model="shtext" style="height: 156rpx;" placeholder="若不同意,请填写理由…"></textarea>
 			</view> -->
@@ -592,7 +592,7 @@
 					}
 				}else if(type=='jztcsh'){
 					data={
-						// auditType:this.isty,
+						auditType:this.isty,
 						// auditView:this.shtext,
 						fjUrl:this.filelist,
 						imageUrl:this.phofile.join(',')

+ 12 - 3
work/pages/business/add.vue

@@ -1203,7 +1203,7 @@
 	import stepBar from "@/components/toptab/stepbar.vue"
 	import { getToken } from '@/utils/auth'
 	import {getApplicationNum,getApplicationZc,getApplicationAdd,getApplicationDet,getApplicationEdit,getExportMb,getDocumentList} from "@/api/mine/work.js"
-	import {getQyListNoPage,getOcrIdCard} from "@/api/mine/card.js"
+	import {getQyListNoPage,getOcrIdCard,getIdCardDet} from "@/api/mine/card.js"
 	import {uploadmore,selectValueKey} from '@/utils/common.js'
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {getDictionaryFn} from "@/api/mine/register.js"
@@ -1406,6 +1406,8 @@
 			
 		// },
 		onLoad(e) {
+			// this.getIdCardDet()
+			// return
 			this.baseUrl=baseUrl
 			var data=JSON.parse(decodeURIComponent(e.data))
 			if(data.type){
@@ -1445,6 +1447,13 @@
 		},
 		methods:{
 			checkPermi, checkRole,
+			getIdCardDet(){
+				getIdCardDet(this.userId).then(res=>{
+					if(res.code==200){
+						
+					}
+				})
+			},
 			init(){
 				// 用户类型
 				getDictionaryFn('customer_type').then(res=>{
@@ -1516,7 +1525,7 @@
 			getQylist(){
 				// 需要userid
 				var params={
-					
+					userid:this.userId
 				}
 				getQyListNoPage().then(res=>{
 					if(res.code==200){
@@ -2357,7 +2366,7 @@
 		}
 	}
 	.addgdbox{padding: 34rpx 10rpx 36rpx;}
-	.addbtns{z-index: 2;
+	.addbtns{z-index: 4;
 		width: 100%;height: 100rpx;position: fixed;left: 0;right: 0;bottom: 0;display: flex;
 		.addlbtn{background-color: #ffffff;font-weight: 500;justify-content: center;
 font-size: 30rpx;color: $com-cd3;display: flex;align-items: center;width: 232rpx;flex: 0 0 auto;height: 100rpx;

+ 22 - 16
work/pages/business/details.vue

@@ -5,7 +5,7 @@
 			<view class="failtit" v-if="datainfo.auditType==4">该业务申请未通过审核,可完善信息后进行申诉</view>
 			<view class="detop">
 				<!-- 归档 归档后没有业务进度-->
-				<image :src="gdicoimg" class="gdimg" v-if="gdflag"></image>
+				<image :src="gdicoimg" class="gdimg" v-if="datainfo.loanApplicationType==4"></image>
 				<block v-else>
 					<view class="speed" v-if="checkPermi(['system:schedule:list'])" @click="getSpeedFn" :style="type=='ywjd'?'z-index: 6;':''">
 						<image :src="speedimg"></image>
@@ -81,7 +81,7 @@
 			<!-- 法人信息 -->
 			
 		</view>
-		<block v-if="!gdflag">
+		<block v-if="datainfo.loanApplicationType!=4">
 			<view class="h50"></view>
 			<view class="footbtns">
 				<!-- (业务进度表查询进度列表):1:申报提交 stepval 4,7,8,9,没有通过不通过
@@ -105,11 +105,9 @@
 				7:上会评审 -->
 				<!-- 申请审核 start-->
 				<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'])" @click="getDel">删除</view>
+				<view class="fbtns bgc" v-if="checkPermi(['system:application:remove'])&&stepval<2" @click="getDel">删除</view>
 				<view class="fbtns bga" v-if="auditSchedule==1&&checkPermi(['system:application:sh'])" @click="getShFn('sh')">审核</view>
-				<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&checkPermi(['system:application:sh'])" @click="getShFn('fxsh')">风险审核</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 bgb" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==5" @click="getShFn('jztcsh')">尽职调查反馈</view>
@@ -127,15 +125,16 @@
 				<!-- 撤销,管理员在 a待审核 可以撤,  
 					a,b角是自己的时候可以撤
 				-->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:cx'])&&stepval<10&&stepval>6" @click="getXybFn">项目推进</view>
+				<view class="fbtns bga" v-if="checkPermi(['system:application:cx'])&&stepval<9&&stepval>6" @click="getXybFn">项目推进</view>
 				<!-- end -->
 				<!-- 管理员业务初审审核后出具担保意向函-->
-				<block v-if="auditSchedule>1&&stepval<3">
+				<!-- <block v-if="auditSchedule>1&&stepval<3"> -->
+				<block v-if="checkRole(['manager'])">
 					<view class="fbtns bgb" @click="getfjEdit('dbyxh')">上传文件</view>
 					<view class="fbtns bga">查看担保意向函</view>
 				</block>
 				<!-- 风险部门 start-->
-				<block v-if="stepval==5">
+				<block v-if="stepval==5&&checkRole(['auditing_risk'])">
 					<view class="fbtns bgb" v-if="checkPermi(['system:hyperlink:list'])" @click="getMoreFn('wb')">外部工具平台</view>
 					<view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view>
 				</block>
@@ -162,10 +161,10 @@
 				</block>
 				<!-- end -->
 				<block v-if="stepval==9">
-					<view class="fbtns bgb" @click="getfjEdit('fktzs')">上传附件</view>
+					<!-- <view class="fbtns bgb" @click="getfjEdit('fktzs')">上传附件</view> -->
 					<view class="fbtns bga" @click="">放款通知书</view>
 				</block>	
-				<view class="fbtns bga" v-if="stepval==10&&datainfo.loanApplicationType!=4" @click="getGdFn">一键归档</view>
+				<view class="fbtns bga" v-if="stepval==9&&datainfo.loanApplicationType!=4" @click="getGdFn">一键归档</view>
 			</view>
 		</block>
 		<!-- 更多操作 -->
@@ -378,8 +377,12 @@
 			this.init()
 			this.getDetail();
 			this.getScheduleList();
-			// this.getHyperlinkList();//外部链接stepval==5
-			// this.getUsernoPageList();//获取用户列表stepval==2
+			// if(checkPermi(['system:hyperlink:list'])){
+			// 	this.getHyperlinkList();//外部链接stepval==5	
+			// }
+			// if(checkPermi(['system:user:noPageList'])){
+			// 	this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
+			// }
 			this.getCommentsList()//审核意见
 		},
 		mounted() {
@@ -490,7 +493,7 @@
 			//用户类型(00系统用户 01注册用户 02管理用户
 			getUsernoPageList(){
 				var params={
-					// userType:'02'
+					userType:'02'
 				}
 				getUsernoPageList(params).then(res=>{
 					if(res.code==200){
@@ -874,10 +877,12 @@
 						}
 						this.stepval=res.data.loanSchedule||0;
 						var auditSchedule=res.data.auditSchedule
-						if(auditSchedule==6){
+						if(checkPermi(['system:hyperlink:list'])&&auditSchedule==6){
 							this.getHyperlinkList();//外部链接stepval==5
 						}else if(auditSchedule==1||auditSchedule==7){
-							this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
+							if(checkPermi(['system:user:noPageList'])){
+								this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
+							}
 						}
 					}
 				})
@@ -1022,6 +1027,7 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 	view{font-weight: 500;font-size: 22rpx;color: #666666;}
 }
 .gdimg{width: 110rpx;height: 86rpx;position: absolute;right: 40rpx;top: 130rpx;}
+// 
 .footbtns{width: 100%;height: 100rpx;position: fixed;left: 0;right: 0;bottom: 0;display: flex;border-top: 2rpx solid #E6E6E6;
 	.fbtns{flex: 1;height: 100rpx;font-weight: bold;font-size: 30rpx;display: flex;align-items: center;justify-content: center;
 		&.bga{background: $com-cd3;color: #FFFFFF;}