zouling 1 anno fa
parent
commit
1657a841e7

+ 2 - 2
components/footer/footer.vue

@@ -3,7 +3,7 @@
 	<view style="height: 100rpx;"></view>
     <view class="com_footer">
 		<block v-for="(item,k) in footlist" :key="k" >
-			<view class="in_item" v-if="!item.limit||item.limit&&checkPermi([item.limit])"  @click="gotopage(item)">
+			<view class="in_item" v-if="!item.limit||item.limit&&checkPermi([item.limit])&&checkPermi([item.limita])"  @click="gotopage(item)">
 				<view class="im_imgs">
 					<image class="in_img" :class="item.img" v-if="active == item.module" :src="item.icon_checked" mode="scaleToFill"></image>
 					<image class="in_img" :class="item.img" v-else :src="item.icon_nochecked" mode="scaleToFill"></image>
@@ -33,7 +33,7 @@
 				footlist:[
 					{module:'home',title:'首页',img:"imga",icon_checked:require('@/static/images/tabbar/home_.png'),icon_nochecked:require('@/static/images/tabbar/home.png')},
 					{module:'work',title:'业务',img:"imgb",icon_checked:require('@/static/images/tabbar/work_.png'),icon_nochecked:require('@/static/images/tabbar/work.png')},
-					{module:'custom',title:'客户',img:"imgc",icon_checked:require('@/static/images/tabbar/custom_.png'),icon_nochecked:require('@/static/images/tabbar/custom.png'),limit:'idcard:idcard:list'},
+					{module:'custom',title:'客户',img:"imgc",icon_checked:require('@/static/images/tabbar/custom_.png'),icon_nochecked:require('@/static/images/tabbar/custom.png'),limit:'idcard:idcard:list',limita:"system:system:user"},
 					{module:'mine',title:'我的',img:"imga",icon_checked:require('@/static/images/tabbar/mine_.png'),icon_nochecked:require('@/static/images/tabbar/mine.png')},
 					],
 				color_checked :'00A9F0',

+ 6 - 4
components/wait/list.vue

@@ -4,10 +4,9 @@
 	<!-- 代办提醒 -->
 		<block v-if="type=='dbtx'">
 			<view class="watlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.remindId)">
-				<view class="tit flex1 over">{{ite.tit}}</view>
-				<view class="txt flex0">{{ite.time}}</view>
+				<view class="tit flex1 over">{{ite.remindTitle}}</view>
+				<view class="txt flex0">{{ite.remindTime}}</view>
 			</view>
-			<view class="shax" v-if="wtdt">{{wtdt}}</view>
 		</block>
 		<!-- 系统通知 -->
 		<block v-if="type=='xttz'">
@@ -22,6 +21,7 @@
 					<view class="tzhu">祝您生活愉快!</view>
 				</view>
 			</view>
+			<view class="shax" v-if="wtdt">{{wtdt}}</view>
 		</block>
 		<!-- 代办通知 -->
 		<block v-if="type=='dbtz'">
@@ -34,12 +34,14 @@
 				<view class="ctxt">
 					<view>
 						{{ite.remindContent}}
-						您有<text class="cof6">1</text>条来自【潜山弘立新型建材有限公司】的申报信 息,请您前往审核。
+						<!-- 您有<text class="cof6">1</text>条来自【潜山弘立新型建材有限公司】的申报信 息,请您前往审核。 -->
 					</view>
 					<view class="tzhu">祝您生活愉快!</view>
 				</view>
 			</view>
+			<view class="shax" v-if="wtdt">{{wtdt}}</view>
 		</block>
+		
 	</view>
 	<block v-else>
 		<no-data></no-data>

+ 7 - 7
pages.json

@@ -1,11 +1,6 @@
 {
   "pages": [
-	 {
-	   "path": "pages/index/index",
-	   "style": {
-	     "navigationBarTitleText": "皖源融资担保",
-	     "navigationStyle": "custom"
-	   }}, 
+	 
 	{
 	"path": "pages/login",
 	"style": {
@@ -15,7 +10,12 @@
 			}
 		}
 	},
-	
+	{
+	   "path": "pages/index/index",
+	   "style": {
+	     "navigationBarTitleText": "皖源融资担保",
+	     "navigationStyle": "custom"
+	   }},
 	{
 	  "path": "pages/index/notice",
 	  "style": {

+ 17 - 6
pages/index/index.vue

@@ -28,7 +28,7 @@
 					<banner :bannerlist="bannerlist"></banner>
 				</view>
 				<view class="grid" v-if="checkPermi(['system:system:user'])">
-					<view class="grid-item-box" @click="getBusListFn(1)" v-if="checkPermi(['system:application:list'])">
+					<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>
@@ -108,6 +108,7 @@
 			<!-- 列表 -->
 			<view class="mt2 plr12" :style="'min-height: ' + minheight + 'px;'">
 				<wait-list type='dbtx' :datalist="list" :wtdt="wtdt"  @getDetail="getDetail"></wait-list>
+				<view class="shax" v-if="wtdt" @click="getMoreDataFn">{{wtdt}}</view>
 			</view>
 		</view>
 	<view class="bgbox" @click="getClose" v-if="mtype" style="z-index: 100;"></view>
@@ -250,7 +251,11 @@
 		 
 	},
 	mounted() {
-		this.getHeightFn()
+		var that=this;
+		setTimeout(function(){
+			that.getHeightFn()
+		},200)
+		
 	},
 	// 上拉触底加载更多触发事件
 	onReachBottom() {
@@ -268,6 +273,12 @@
 		getXxwsFn(){
 			this.$tab.navigateTo(`/work/pages/prove/index`)
 		},
+		getMoreDataFn(){
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
 		getMoreFn(){
 			console.log(123)
 			this.mtype=true;
@@ -322,15 +333,14 @@
 			this.$tab.reLaunch('/pages/custom/index?name='+this.usename)
 		},
 		getProveFn(){
-			// this.$tab.navigateTo("/work/pages/prove/zctype")
-			this.$tab.navigateTo("/work/pages/business/add")
+			this.$tab.navigateTo("/work/pages/prove/zctype")
 		},
 		getBusListFn(type,from){
 			// this.$tab.navigateTo("/work/pages/business/list?type="+type)
 			if(from){
 				this.$tab.navigateTo("/work/pages/business/list?from=my&type=0")
 			}else{
-				this.$tab.navigateTo("/work/pages/business/list?type=0")
+				this.$tab.navigateTo("/work/pages/business/list?type="+type)
 			}
 			
 		},
@@ -431,6 +441,7 @@
 			let query = uni.createSelectorQuery().in(this);
 			//需要给黄色区域设置一个id标识,在这里是demo
 			query.select('.zxtop').boundingClientRect(data => {
+				console.log(data)
 				var top=data.top<0 ? -data.top : data.top;
 				this.listTop = data.height//赋值,待会要用
 				if (top <=this.nvaHeight) {
@@ -519,7 +530,7 @@
 						var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
 						if (num < res.total) {
 							this.reachflag = true
-							this.wtdt = '上拉加载更多'
+							this.wtdt = '加载更多'
 						} else {
 							this.reachflag = false
 							this.wtdt = '到底了~';

+ 6 - 8
pages/mine/index.vue

@@ -20,13 +20,11 @@
 				<image v-else @click.stop="handleToAvatar" :src="avatarimg" class="limg" mode="aspectFill"></image>
 				<view class="cbox">
 					<view class="tit">{{name?name:'登录账号'}}</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 class="flexc pr" v-if="deptName">
+						<image :src="headl"></image>
+							<view class="txt">{{deptName}}</view>
+						<image :src="headr"></image>
+					</view>
 				</view>
 				<image :src="wrimg" class="rimg"></image>
 			</view>
@@ -221,7 +219,7 @@
 				backgroundColor: 'transparent',
 
 				name: this.$store.state.user.name,
-				roleName:this.$store.state.user.roleName,
+				deptName:this.$store.state.user.deptName,
 				// version: getApp().globalData.config.appInfo.version,
 				footerindex: 'mine',
 				isfootflag: true,

+ 10 - 2
pages/mine/info/index.vue

@@ -13,8 +13,10 @@
 		<image :src="rimg" class="rimg"></image>
 	</view>
 	<view class="lists">
-		<view class="tit">职 务</view>
-		<view class="txt">{{postGroup}}</view>
+		<view class="tit">所属部门</view>
+		<view class="txt">{{deptName}}
+		<block v-if="postGroup">/{{postGroup}}</block>
+		</view>
 		<image :src="rimg" class="rimg"></image>
 	</view>
 	<view class="lists">
@@ -47,6 +49,7 @@
         user: {},
         roleGroup: "",
         postGroup: "",
+		deptName:'',
 		avatarimg:require("@/static/images/mine/profile.png"),
 		rimg:require("@/static/images/mine/rimg.png"),
       }
@@ -65,6 +68,11 @@
           this.user = response.data
           this.roleGroup = response.roleGroup
           this.postGroup = response.postGroup
+		  var data=response.data;
+		  if(data.dept&&data.dept.deptName){
+			  this.deptName=data.dept.deptName
+		  }
+		  
         })
       },
 	  handleToAvatar() {

+ 5 - 5
pages/work/index.vue

@@ -15,7 +15,7 @@
 					<block slot="right">
 						<view class="topr" @click='getNoticeFn'>
 							<image :src="noticeimg"></image>
-							<view class="cir">99+</view>
+							<view class="cir"></view>
 							<!-- <block v-if="noticenum>99">99+</block>
 							<block v-else>{{noticenum}}</block> -->
 						</view>
@@ -314,10 +314,10 @@ page{background-color: #f6f6f6;}
 	 }
 	.topr{width: 48rpx;height: 38rpx;position: relative;margin-right: 10rpx;
 		image{width: 32rpx;height: 38rpx;margin: 0 auto;}
-		.cir{background: #FF4747;font-size: 14rpx;color: #FFFFFF;border-radius: 50%;border: 2rpx solid #FFFFFF;min-width: 20rpx;height: 20rpx;
-			position: absolute;right: -5rpx;top: -5rpx;text-align: center;line-height: 16rpx;
-		}
-		// .cir{width: 14rpx;height: 14rpx;background: #DF0024;border-radius: 50%;position: absolute;right: -7rpx;top: -7rpx;}
+		// .cir{background: #FF4747;font-size: 14rpx;color: #FFFFFF;border-radius: 50%;border: 2rpx solid #FFFFFF;min-width: 20rpx;height: 20rpx;
+		// 	position: absolute;right: -5rpx;top: -5rpx;text-align: center;line-height: 16rpx;
+		// }
+		.cir{width: 14rpx;height: 14rpx;background: #DF0024;border-radius: 50%;position: absolute;right: -7rpx;top: -7rpx;}
 	}
 }
 .checkbox{padding-top: 4rpx;

+ 2 - 1
store/getters.js

@@ -3,7 +3,8 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   roles: state => state.user.roles,
-  roleName: state => state.user.roleName,
+  deptId:state=>state.user.deptId,
+  deptName: state => state.user.deptName,
   permissions: state => state.user.permissions,
   autologin:state => state.user.autologin,
   userId:state=>state.user.userId,

+ 22 - 14
store/modules/user.js

@@ -12,7 +12,8 @@ const user = {
     name: storage.get(constant.name),
     avatar: storage.get(constant.avatar),
     roles: storage.get(constant.roles),
-    roleName: storage.get(constant.roleName),
+	deptId: storage.get(constant.deptId),
+    deptName: storage.get(constant.deptName),
     permissions: storage.get(constant.permissions),
 	autologin:storage.get(constant.autologin),
 	userId: storage.get(constant.userId),
@@ -38,9 +39,13 @@ const user = {
       state.roles = roles
       storage.set(constant.roles, roles)
     },
-	SET_ROLENAME: (state, roleName) => {
-	  state.roleName = roleName
-	  storage.set(constant.roleName, roleName)
+	SET_DEPID: (state, deptId) => {
+	  state.deptId = deptId
+	  storage.set(constant.deptId, deptId)
+	},
+	SET_DEPTNAME: (state, deptName) => {
+	  state.deptName = deptName
+	  storage.set(constant.deptName, deptName)
 	},
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
@@ -108,7 +113,6 @@ const user = {
 				    if (res.confirm) {
 						commit('SET_TOKEN', '')
 						commit('SET_ROLES', [])
-						commit('SET_ROLENAME', [])
 						commit('SET_PERMISSIONS', [])
 						removeToken()
 						storage.clean()
@@ -135,21 +139,25 @@ const user = {
          const phonenumber = (user == null || user.phonenumber == "" || user.phonenumber == null) ? "" : user.phonenumber
          const initFace = (user == null || user.initFace == "" || user.initFace == null) ? "" : user.initFace
          const userType = (user == null || user.userType == "" || user.userType == null) ? "" : user.userType
-			var roleName=[]	
-			if(user&&user.roles&&user.roles.length){
-				user.roles.forEach(ite=>{
-					if(ite.roleName){
-						roleName.push(ite.roleName)
-					}
-				})
-			}
+		const deptId = (user == null || user.deptId == "" || user.deptId == null) ? "" : user.deptId
+		const deptName = (user == null ||user.dept==null|| user.dept == ""||user.dept.deptName == "" || user.dept.deptName == null) ? "" : user.dept.deptName
+		
+			// var roleName=[]	
+			// if(user&&user.roles&&user.roles.length){
+			// 	user.roles.forEach(ite=>{
+			// 		if(ite.roleName){
+			// 			roleName.push(ite.roleName)
+			// 		}
+			// 	})
+			// }
 		  if (res.roles && res.roles.length > 0) {
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
-          commit('SET_ROLENAME', roleName)
+		   commit('SET_DEPID', deptId)
+			commit('SET_DEPTNAME', deptName)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
 		  commit('SET_USERID', userId)

+ 2 - 1
utils/constant.js

@@ -2,7 +2,8 @@ const constant = {
    avatar: 'vuex_avatar',
    name: 'vuex_name',
    roles: 'vuex_roles',
-   roleName: 'vuex_roleName',
+   deptId: 'vuex_deptId',
+   deptName: 'vuex_deptName',
    permissions: 'vuex_permissions',
    scorknow: 'vuex_scorknow',
    autologin:'vuex_autologin',

+ 1 - 1
utils/storage.js

@@ -4,7 +4,7 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.autologin,constant.scorknow,constant.avatar, constant.name, constant.roles,constant.roleName, constant.permissions,constant.userId,constant.phonenumber,constant.initFace,constant.userType,constant.wgtcode]
+let storageNodeKeys = [constant.autologin,constant.scorknow,constant.avatar, constant.name, constant.roles,constant.deptId,constant.deptName, constant.permissions,constant.userId,constant.phonenumber,constant.initFace,constant.userType,constant.wgtcode]
 
 const storage = {
   set: function(key, value) {

+ 1 - 1
work/components/business/aqyxx.vue

@@ -16,7 +16,7 @@
 		<view class="flexcw">
 			<view class="txt">是否制造业:<text>{{datainfo.isMake=='Y'?'是':'否'}}</text></view>
 			<view class="txt">是否小微企业:<text>{{datainfo.isSmall=='Y'?'是':'否'}}</text></view>
-			<view class="txt">是否免税:<text>{{datainfo.isDuty=='Y'?'是':'否'}}</text></view>
+			<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">

+ 2 - 2
work/components/business/ewjcj.vue

@@ -4,7 +4,7 @@
 		<view class="txt">
 			<view class="flex1 flexc">{{ite.label}}
 			<!-- 有文件出具的权限 -->
-			<view class="editf" v-if="checkPermi(['system:shareholderFj:add'])" @click="getfjEdit(ite.val)">
+			<view class="editf" v-if="checkPermi(['system:shareholderFj:add'])&&datainfo.loanApplicationType!=4" @click="getfjEdit(ite.val)">
 				<image :src="editf"></image>
 				<view>上传</view>
 			</view>
@@ -25,7 +25,7 @@
 					<view class="imgl"><image :src="filico" ></image></view>
 					<view class="tit">{{fite.name}}</view>
 				</view>
-				<view class="edit" v-if="ite.val=='psyjqpb'||ite.val=='gdhyjy'||ite.val=='wtdbht'" @click="getQmFn(fite.url)">
+				<view class="edit" v-if="(ite.val=='psyjqpb'||ite.val=='gdhyjy'||ite.val=='wtdbht')&&datainfo.loanApplicationType!=4" @click="getQmFn(fite.url)">
 					<image :src="edit"></image>
 					<view>在线签名</view>
 				</view>

+ 1 - 1
work/components/business/fshxx.vue

@@ -168,7 +168,7 @@ background: #DADADA;}
 			}
 			// 图片
 			.limgs{display: flex;flex: 1;flex-wrap: wrap;
-				image{width: 160rpx;height: 110rpx;margin-right: 20rpx;}
+				image{width: 100rpx;height: 100rpx;margin-right: 20rpx;margin-bottom: 20rpx;}
 			}
 			// .limg{
 				

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

@@ -282,10 +282,10 @@
 				<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> -->
 			<!-- <view class="mb16">
 				<view class="ttxt mb18">审核意见</view>
 				<textarea class="textar" v-model="shtext" style="height: 156rpx;" placeholder="若不同意,请填写理由…"></textarea>
@@ -592,7 +592,8 @@
 					}
 				}else if(type=='jztcsh'){
 					data={
-						auditType:this.isty,
+						// auditType:this.isty,
+						auditType:2,
 						// auditView:this.shtext,
 						fjUrl:this.filelist,
 						imageUrl:this.phofile.join(',')

+ 5 - 5
work/pages/business/add.vue

@@ -1304,12 +1304,12 @@
 				sfidx:0,
 				frhyzkidx:0,
 				btfiles:[{tit:'公司章程',type:'gszc'},
-					{tit:'开户许可证',type:'khxkz'},{tit:'申请企业征信报告',type:'sqqyzxbg'},{tit:'关联企业征信报告',type:'glqyzxbg'},{tit:'企业法人征信报告',type:'qyfrzxbg'},{tit:'实际控股人征信报告',type:'sjkgrzxbg'},
-				{tit:'户口簿首页',type:'frhkbsy'},
+					//{tit:'开户许可证',type:'khxkz'},{tit:'申请企业征信报告',type:'sqqyzxbg'},{tit:'关联企业征信报告',type:'glqyzxbg'},{tit:'企业法人征信报告',type:'qyfrzxbg'},{tit:'实际控股人征信报告',type:'sjkgrzxbg'},
+				//{tit:'户口簿首页',type:'frhkbsy'},
 				],
 				sqbtfiles:[{tit:'委托担保申请书',type:'wtdbsqs'},
-				{tit:'股东会议纪要',type:'gdhyjy'},{tit:'上一年度财务报表',type:'syndcwbb'},{tit:'主要账户银行流水',type:'zyzhyhls'},{tit:'购销合同',type:'gxht'},
-				{tit:'当前从事项目情况证明',type:'dqcsxmqkzm'},{tit:'企业基本注册信息查询单',type:'qyjbzcxxcxd'},{tit:'水电费发票(一年)',type:'sdffpyn'},{tit:'人员工资表',type:'rggzb'},{tit:'纳税申报表',type:'nssbb'},
+				//{tit:'股东会议纪要',type:'gdhyjy'},{tit:'上一年度财务报表',type:'syndcwbb'},{tit:'主要账户银行流水',type:'zyzhyhls'},{tit:'购销合同',type:'gxht'},
+				//{tit:'当前从事项目情况证明',type:'dqcsxmqkzm'},{tit:'企业基本注册信息查询单',type:'qyjbzcxxcxd'},{tit:'水电费发票(一年)',type:'sdffpyn'},{tit:'人员工资表',type:'rggzb'},{tit:'纳税申报表',type:'nssbb'},
 				],
 				content:'',//小微企业富文本
 				
@@ -1450,7 +1450,7 @@
 				var params={
 					userid:this.userId
 				}
-				getQyListNoPage().then(res=>{
+				getQyListNoPage(params).then(res=>{
 					if(res.code==200){
 						this.qylist = res.rows.map(v => {
 							return {

+ 15 - 8
work/pages/business/details.vue

@@ -9,7 +9,8 @@
 				<block v-else>
 					<view class="speed" v-if="checkPermi(['system:schedule:list'])" @click="getSpeedFn" :style="type=='ywjd'?'z-index: 6;':''">
 						<image :src="speedimg"></image>
-						<view>业务进度</view>
+						<view>业务</view>
+						<view>进度</view>
 					</view>
 				</block>
 				
@@ -81,7 +82,7 @@
 			<!-- 法人信息 -->
 			
 		</view>
-		<block v-if="datainfo.loanApplicationType!=4">
+		<block v-if="datainfo.loanApplicationType!=4&&tabval!=5">
 			<view class="h50"></view>
 			<view class="footbtns">
 				<!-- (业务进度表查询进度列表):1:申报提交 stepval 4,7,8,9,没有通过不通过
@@ -120,7 +121,12 @@
 				<view class="fbtns bga" v-if="checkPermi(['system:application:ss'])&&datainfo.auditType==4&&userId==datainfo.aUserId" @click="getSsFn">申诉</view>
 				<!-- <block ></block> -->
 				<!-- 申诉的时候不能撤销 -->
-				<view class="fbtns" :class="auditSchedule==5?'bga':'bgb'" v-if="checkPermi(['system:application:cx'])&&(stepval!=1&&stepval!=10&&(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>1))" @click="getCxFn">撤销</view>
+				<!-- <view class="fbtns" :class="auditSchedule==5?'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 bga" v-if="userId==datainfo.aUserId&&auditSchedule==3" @click="getCxFn">撤销</view>
+					<view class="fbtns bga" v-if="userId==datainfo.bUserId&&auditSchedule==4" @click="getCxFn">撤销</view>
+					<view class="fbtns" :class="auditSchedule==5?'bga':'bgb'" v-if="(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>4)" @click="getCxFn">撤销</view>
+				</block>
 				<!-- 回收站,暂存,归档不能撤  项目进度是申报提交-->
 				<!-- 撤销,管理员在 a待审核 可以撤,  
 					a,b角是自己的时候可以撤
@@ -128,10 +134,11 @@
 				<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="checkRole(['manager'])">
+				<!-- <block v-if="auditSchedule>1&&stepval<4"> -->
+				<block v-if="checkRole(['manager'])&&auditSchedule>1&&stepval<4">
 					<view class="fbtns bgb" @click="getfjEdit('dbyxh')">上传文件</view>
 					<view class="fbtns bga" @click="getIssureFn(3)">出具担保意向函</view>
+					<view class="fbtns bgb" v-if="checkPermi(['system:application:cx'])&&auditSchedule<3&&datainfo.auditType<2" @click="getCxFn">撤销</view>
 				</block>
 				<!-- 风险部门 start-->
 				<block v-if="stepval==5&&checkRole(['auditing_risk'])">
@@ -1079,14 +1086,14 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 }
 .speed{width: 96rpx;height: 140rpx;background: #FFFFFF;box-shadow: 0px 0px 14rpx 0px rgba(184,184,184,0.76);border-radius: 20rpx;
 	display: flex;align-items: center;flex-direction: column;justify-content: center;
-	position: absolute;right: 28rpx;top: 86rpx;z-index: 2;padding: 0 26rpx; 
+	position: absolute;right: 28rpx;top: 86rpx;z-index: 2;padding: 0 6rpx; 
 	image{width: 26rpx;height: 28rpx;margin-bottom: 8rpx;}
 	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;
+.footbtns{width: 100%;height: 100rpx;position: fixed;left: 0;right: 0;bottom: 0;display: flex;
+	.fbtns{flex: 1;height: 100rpx;font-weight: bold;font-size: 30rpx;display: flex;align-items: center;justify-content: center;border-top: 2rpx solid #E6E6E6;box-sizing: border-box;
 		&.bga{background: $com-cd3;color: #FFFFFF;}
 		&.bgb{background: #FFFFFF;;color: $com-cd3;}
 		&.bgc{background: #DF0303;;color: #FFFFFF;}

+ 6 - 6
work/pages/business/limit.vue

@@ -75,18 +75,18 @@
 				limite: require('@/work/static/images/busin/limite.png'),
 				hrimg:require('@/work/static/images/hrimg.png'),
 				datainfo:{
-					applicationAmount:'1',//申请额度(万元)
-					applicationBank:'1',//申请银行
-					usagePeriod:'2',//使用期限(月)
-					purposeFunds:'资金用途',//资金用途
-					repaymentSource:'还款来源',//还款来源
+					applicationAmount:'',//申请额度(万元)
+					applicationBank:'',//申请银行
+					usagePeriod:'',//使用期限(月)
+					purposeFunds:'',//资金用途
+					repaymentSource:'',//还款来源
 					applicationType:'',//申请类型 1:企业 2:个人
 				},
 				sdyhidx:'',
 				syqxidx:'',
 				zjytidx:'',
 				hklyidx:'',
-				applicationBank:'农商行',//申贷银行
+				applicationBank:'',//申贷银行
 				sdyhlist:[],//申贷银行
 				syqxlist:[],//使用期限
 				zjytlist:[],//资金用途