Explorar o código

审核,回收站

zouling hai 1 ano
pai
achega
6ded377c02

+ 8 - 0
api/mine/work.js

@@ -127,3 +127,11 @@ export function getapplicationGd(data) {
   })
 }
 
+// 进度条推行下一步 system:application:schedule
+export function getapplicationXib(data) {
+  return request({
+    'url': '/application/schedule',
+    'method': 'post',
+	'data':data
+  })
+}

+ 2 - 2
config.js

@@ -2,8 +2,8 @@
 module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
   // baseUrl: 'https://lyyy.qs163.cn/prod-api',
-  // baseUrl: 'http://192.168.101.168:8056',
-  baseUrl: 'http://192.168.101.245:8056',
+  baseUrl: 'http://192.168.101.168:8056',
+  // baseUrl: 'http://192.168.101.245:8056',
   Clientid:'428a8310cd442757ae699df5d894f051',//
   baseName:'皖源融资担保',
  // https://xygl.cnzxy.cn h5链接地址

+ 9 - 0
pages.json

@@ -231,6 +231,15 @@
 					"h5":{"titleNView":false}
 				}
 			},
+			{
+				"path": "pages/business/hszlist",
+				"style": {
+					"navigationBarTitleText": "回收站",
+					"navigationBarBackgroundColor": "#00A9F0",
+					"navigationBarTextStyle": "white",
+					"h5":{"titleNView":false}
+				}
+			},
 			{
 				"path": "pages/business/details",
 				"style": {

+ 12 - 4
pages/index/index.vue

@@ -76,12 +76,12 @@
 							<view class="txt">继续填报</view>
 						</view>
 						<!-- 普通客户  -->
-						<view class="adda bgc" @click="getBusListFn(0)" v-if="checkPermi(['system:application:list'])">
+						<view class="adda bgc" @click="getBusListFn(0,'my')" v-if="checkPermi(['system:application:list'])">
 							<image :src="haddcimg"></image>
 							<view class="tit">我的申报</view>
 							<view class="txt">查看进度</view>
 						</view>
-						<view class="adda bgd">
+						<view class="adda bgd" @click="getBushszListFn">
 							<image :src="hadddimg"></image>
 							<view class="tit">回收站</view>
 							<view class="txt">一键找回</view>
@@ -275,13 +275,21 @@
 		getProveFn(){
 			this.$tab.navigateTo("/work/pages/prove/zctype")
 		},
-		getBusListFn(type){
+		getBusListFn(type,from){
 			// this.$tab.navigateTo("/work/pages/business/list?type="+type)
-			this.$tab.navigateTo("/work/pages/business/list?type=0")
+			if(from){
+				this.$tab.navigateTo("/work/pages/business/list?from=my&type=0")
+			}else{
+				this.$tab.navigateTo("/work/pages/business/list?type=0")
+			}
+			
 		},
 		getBuszcListFn(){
 			this.$tab.navigateTo("/work/pages/business/zclist")
 		},
+		getBushszListFn(){
+			this.$tab.navigateTo("/work/pages/business/hszlist")
+		},
 		getScanFn(){
 			// 扫码识别
 			// this.$tab.navigateTo("/pages/index/notice")

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

@@ -16,6 +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>
 		<view class="txt">公司简介:<text>{{datainfo.companyIntroduction}}</text></view>
 		<view class="txt flext">
@@ -46,7 +47,7 @@
 		</view>
 		<view class="flexcw" v-for="(ite,idx) in datainfo.shareholderFjList" :key="idx">
 			<view class="txt">股东{{Number(idx)+1}}身份证:<text class="txta" @click="getDown(ite.shareholderFrontUrl)">在线查看</text></view>
-			<view class="txt">股东{{Number(idx)+1}}征信:<text class="txta" @click="getDown(ite.shareholderZxUrl.split(',')[0])">在线查看</text></view>
+			<view class="txt" v-if="ite.shareholderZxUrl">股东{{Number(idx)+1}}征信:<text class="txta" @click="getDown(ite.shareholderZxUrl.split(',')[0])">在线查看</text></view>
 		</view>
 	</view>
 	<view class="boxt">

+ 3 - 3
work/components/business/bfrxx.vue

@@ -5,11 +5,11 @@
 			<image :src="titimg"></image>基本信息
 		</view>
 		<view class="flexcw">
-			<view class="txt">法人姓名:<text>{{datainfo.categoryType}}</text></view>
+			<view class="txt">法人姓名:<text>{{datainfo.corporationName}}</text></view>
 			<view class="txt">用户类型:<text>{{kaType(datainfo.customerType,yhlxlist)}}</text></view>
 		</view>
 		<view class="txt">身份证号:<text>{{datainfo.corporationIdCard}}</text>
-			<text class="txta ml8" @click="getDown(datainfo.corporationFront)">查看照片</text>
+			<text class="txta ml8" v-if="datainfo.corporationFront" @click="getDown(datainfo.corporationFront)">查看照片</text>
 		</view>
 		<view class="txt">居住地址:<text>{{datainfo.corporationAddress}}</text></view>
 		<view class="txt">证件有效期:<text>{{datainfo.corporationExpirationDate}}</text></view>
@@ -36,7 +36,7 @@
 			<view class="txt">配偶姓名:<text>{{datainfo.spouseName}}</text></view>
 		</view>
 		<view class="txt">配偶身份证号:<text>{{datainfo.spouseIdCard}}</text>
-			<text class="txta ml8" @click="getDown(datainfo.spouseFront)">查看照片</text>
+			<text class="txta ml8" v-if="datainfo.spouseFront" @click="getDown(datainfo.spouseFront)">查看照片</text>
 		</view>
 		<view class="txt flext">结婚证:
 			<view class="flex1 over">

+ 1 - 1
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" @click="getDown(datainfo.guaranteeFront)">查看照片</text>
+			<text class="txta ml8" v-if="datainfo.guaranteeFront" @click="getDown(datainfo.guaranteeFront)">查看照片</text>
 		</view>
 		<view class="txt">手机号码:<text>{{datainfo.guaranteePhone}}</text></view>	
 	</view>

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

@@ -7,7 +7,7 @@
 			<!-- <view class="flex1"></view> -->
 			<!-- <text class="txta" @click="getDown(ite.val)">在线查看</text> -->
 		</view>
-		<view class="mt18" v-if="declareFj[ite.val]&&declareFj[ite.val].length">
+		<view class="mt18" v-if="declareFj&&declareFj[ite.val]&&declareFj[ite.val].length">
 			<view class="fjlists"  v-for="(fite,fidx) in declareFj[ite.val]" :key='fidx'>
 				<view class="flext" @click="getDown(fite.url)">
 					<view class="imgl"><image :src="filico" ></image></view>

+ 17 - 6
work/components/business/ewjcj.vue

@@ -3,7 +3,8 @@
 	<view class="boxt" v-for="(ite,idx) in wjcjlist" :key="idx">
 		<view class="txt">
 			<view class="flex1 flexc">{{ite.label}}
-			<view class="editf" @click="getfjEdit(ite.val)">
+			<!-- 有文件出具的权限 -->
+			<view class="editf" v-if="checkPermi(['system:shareholderFj:add'])" @click="getfjEdit(ite.val)">
 				<image :src="editf"></image>
 				<view>上传</view>
 			</view>
@@ -18,13 +19,13 @@
 		</view>
 		<!-- <text class="txta" @click="getDown(fite.url)">预览</text> -->
 				
-		<view class="mt18" v-if="fileFj[ite.val]&&fileFj[ite.val].length">
+		<view class="mt18" v-if="fileFj&&fileFj[ite.val]&&fileFj[ite.val].length">
 			<view class="fjlists"  v-for="(fite,fidx) in fileFj[ite.val]" :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="getDelwjFj(fite.fjId)">
+				<view class="delimg flex0" v-if="checkPermi(['system:fj:remove'])" @click.stop="getDelwjFj(fite.fjId)">
 					<image :src="fdelimg"></image>
 				</view>
 				<text class="txta" @click="getDown(fite.url)">预览</text>
@@ -41,12 +42,16 @@
 				<!-- <view class="delimg flex0" @click.stop="getDelFj(idx)">
 					<image :src="fdelimg"></image>
 				</view> -->
-		<view class="mt18" v-if="datainfo.otherFj&&datainfo.otherFj.length">
-			<view class="fjlists"  v-for="(fite,fidx) in datainfo.otherFj" :key='fidx'>
+		<view class="mt18" v-if="qtfileFj&&qtfileFj.qtfj&&qtfileFj.qtfj.length">
+			<view class="fjlists"  v-for="(fite,fidx) in qtfileFj.qtfj" :key='fidx'>
 				<view class="flext" @click="getDown(fite.url)">
 					<view class="imgl"><image :src="filico" ></image></view>
-					<view class="tit">{{fite.url}}</view>
+					<view class="tit">{{fite.name}}</view>
+				</view>
+				<view class="delimg flex0" @click.stop="getDelwjFj(fite.fjId)">
+					<image :src="fdelimg"></image>
 				</view>
+				<text class="txta" @click="getDown(fite.url)">预览</text>
 			</view>
 		</view>
 	</view>
@@ -71,6 +76,12 @@
 				return {}
 			}
 		},
+		qtfileFj:{
+			type: Object,
+			default () {
+				return {}
+			}
+		},
 		wjcjlist:{
 			type: Array,
 			default () {

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

@@ -5,7 +5,7 @@
 				<view>{{lite.ayear}}年<text>{{lite.amonth}}月</text></view>
 				<image :src="timeup" class="timeup"></image>
 			 </view> -->
-			 <view >
+			 <view v-if="datalist&&datalist.length">
 				<view class="timebox" v-for="(ite,idx) in datalist" :key="idx">
 					<view class="list">
 						<image :src="stepa" class="timel"></image>
@@ -58,6 +58,9 @@
 					</view>
 				</view> 
 			 </view>
+			 <block v-else>
+				 <no-data notxt='暂无审核信息'></no-data>
+			 </block>
 		</view>
 	</view>
 </template>

+ 3 - 3
work/components/business/list.vue

@@ -9,10 +9,10 @@
 					<view class="statbox" v-if="ite.isNew=='Y'">专精特新<image :src="start"></image></view>
 				</view>
 				<view class="listsm">
-					<view class="txt"><text class="tit">审核状态</text><text class="line">|</text><text class="co28">{{kaType(ite.auditSchedule,shjdlist)}}
-						<block v-if="ite.auditType==1">待审核</block>
+					<view class="txt" v-if="ite.loanApplicationType!=1"><text class="tit">审核状态</text><text class="line">|</text><text class="co28">{{kaType(ite.auditSchedule,shjdlist)}}
+						<!-- <block v-if="ite.auditType==1">待审核</block>
 						<block v-if="ite.auditType==2">已通过</block>
-						<block v-if="ite.auditType==3">未通过</block>
+						<block v-if="ite.auditType==3">未通过</block> -->
 					</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>

+ 59 - 7
work/components/popup/popup.vue

@@ -82,7 +82,7 @@
 			<view class="shtips" v-if="type=='ajssh'">* 提交后将交由B角复核,误操可撤回</view>
 			<view class="shtips" v-if="type=='bjssh'">* 提交后将交由风险部进行风险审核,误操可撤回</view>
 		</view>
-		<!--  风险审核 fxsh-->
+		<!--  风险审核 fxsh-->
 		<view class="fixbox" v-if="type=='fxsh'">
 			<view class="cloimg" @click="getClose">
 				<image :src="closeimg"></image>
@@ -109,6 +109,7 @@
 				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tgList" />
 			</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="wjcjobj.dbxmhfhgb" fileVal='dbxmhfhgb' bigType="c">
@@ -135,9 +136,9 @@
 			<view class="ttit">上会审核</view>
 			<view class="mb16">
 				<view class="ttxt mb18">是否同意上评审会</view>
-				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tyList" @change="change"/>
+				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tyList" />
 			</view>
-			<view class="mb16">
+			<view class="mb16" v-if="isty!=3">
 				<view class="ttxt mb18">评审会日期</view>
 				<picker mode="date"   @change='bindDateChangea'>
 					<view class="chekt">
@@ -150,7 +151,7 @@
 				<view class="ttxt mb18">审核意见</view>
 				<textarea class="textar" v-model="shtext" style="height: 156rpx;" placeholder="若不同意上会,请填写理由…"></textarea>
 			</view>
-			<view class="mb16">
+			<view class="mb16" v-if="isty!=3">
 				<view class="ttxt mb18 flexcj">上会人员
 					<view class="addsh" @click="getAddFn" >
 						<image :src="addpeimg"></image>添加上会人员
@@ -232,6 +233,35 @@
 				<view class="cbtns bgb" @click="getfjAdd">确认</view>
 			</view>
 		</view>
+		<!-- 其他附件 -->
+		<view class="fixbox" v-if="type=='qtfjadd'">
+			<view class="cloimg" @click="getClose">
+				<image :src="closeimg"></image>
+			</view>
+			<view class="ttit">上传附件</view>
+			<view class="mb16">
+				<view class="ttxt mb18 flexcj" v-if="qtfjobj[fjval]">附件信息
+					<lsj-upload ref="lsjUpload" childId="upload1" :width="width" :height="height" :option="option" :size="size" :formats="formats" :debug="debug" :instantly="instantly"
+						    @progress="" @uploadEnd="onuploadEnd" :fileName="qtfjobj[fjval]" :fileVal='fjval' 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="conbtns flexcj">
+				<!-- <view class="cbtns bga">暂存</view> -->
+				<view class="cbtns bgb" @click="getfjAdd">确认</view>
+			</view>
+		</view>
 		<!-- 审核结果二次确认弹窗 -->
 		<view class="fixbox con" v-if="type=='confirm'">
 			<view class="cloimg" @click="getClose">
@@ -270,6 +300,7 @@
 			</view>
 			<view class="ptips">* 点击添加照片可实时拍摄照片上传,也可由手 机相册中上传</view>
 			<view class="mb16">
+				<!-- 尽职调查报告 -->
 				<view class="ttxt mb18 flexcj">附件信息
 					<lsj-upload ref="lsjUpload" childId="upload1" :fileName="wjcjobj.jzdcbg" fileVal='jzdcbg' bigType="c" :width="width" :height="height" :option="option" :size="size" :formats="formats" :debug="debug" :instantly="instantly"
 						    @progress="" @uploadEnd="onuploadEnd" >
@@ -387,6 +418,12 @@
 					return {}
 				}
 			},
+			qtfjobj:{
+				type: Object,
+				default () {
+					return {}
+				}
+			},
 			fjval:{
 				type: String,
 				default () {
@@ -446,7 +483,6 @@
 				tgList:[{text: '通过',value: '2'},{text: '不通过',value: '3'}],
 				mycdlist:[{text: 'a',value: '0'},{text: 'b',value: '1'}],
 				isty:'2',//同意
-				istg:'0',//通过
 				shtext:'',//审核意见
 				aUserId:'',//A角色用户ID
 				aUserName:'',//A角色用户名称
@@ -475,6 +511,8 @@
 			type(val){
 				this.filelist=[];
 				this.shtext='';
+				this.isty='2';
+				this.phofile=[];
 			}
 		},
 		methods:{
@@ -557,9 +595,23 @@
 				}else if(type=='shsh'){
 					data={
 						auditType:this.isty,
-						reviewTime:this.jtri,
 						auditView:this.shtext,
-						sysUserConferenceList:this.shrylist
+					}
+					if(this.isty==3&&!this.shtext){
+						this.$toast("请输入审核意见")
+						return
+					}
+					if(this.isty!=3){
+						if(!this.jtri){
+							this.$toast("请选择评审会日期")
+							return
+						}
+						if(this.shrylist.length<1){
+							this.$toast("请选择上会人员")
+							return
+						}
+						data.reviewTime=this.jtri;
+						data.sysUserConferenceList=this.shrylist;
 					}
 				}
 				this.$emit('getupSubmit',data)

+ 130 - 82
work/pages/business/add.vue

@@ -372,10 +372,11 @@
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="姓名" name="corporationName">
-						<uni-easyinput v-model="datainfo.corporationName" :inputBorder='false' placeholder="自动识别" />
+						<uni-easyinput v-model="datainfo.corporationName" disabled :inputBorder='false' placeholder="自动识别" />
 					</uni-forms-item>
+					<!-- disabled -->
 					<uni-forms-item label="身份证号" name="corporationIdCard">
-						<uni-easyinput v-model="datainfo.corporationIdCard" :inputBorder='false' placeholder="自动识别" />
+						<uni-easyinput v-model="datainfo.corporationIdCard"  :inputBorder='false' placeholder="自动识别" />
 					</uni-forms-item>
 					<uni-forms-item label="手机号码" name="corporationPhone">
 						<uni-easyinput v-model="datainfo.corporationPhone" type="number" :inputBorder='false' placeholder="请输入手机号码" />
@@ -455,10 +456,10 @@
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="配偶姓名" name="spouseName">
-						<uni-easyinput v-model="datainfo.spouseName" :inputBorder='false' placeholder="自动识别" />
+						<uni-easyinput v-model="datainfo.spouseName" disabled :inputBorder='false' placeholder="自动识别" />
 					</uni-forms-item>
 					<uni-forms-item label="配偶身份证号" name="spouseIdCard">
-						<uni-easyinput v-model="datainfo.spouseIdCard" :inputBorder='false' placeholder="自动识别" />
+						<uni-easyinput v-model="datainfo.spouseIdCard" disabled :inputBorder='false' placeholder="自动识别" />
 					</uni-forms-item>
 				</view>
 				<!-- * 企业法人征信-->
@@ -608,6 +609,9 @@
 											<image :src="phoicon" class="addimg"></image>
 										</view>
 									</lsj-upload>
+									<view class="frdelimg" v-if="datainfo.guaranteeFront" @click.stop="getDelfdbfzpo('front')">
+										<image :src="fdelimg"></image>
+									</view>
 									<view class="photit atit">上传人像面</view>
 								</view>
 								<view class="phoboxa" v-if="jcfjobj.fdbrsfzghm">
@@ -621,15 +625,18 @@
 											</view>
 										</view>
 									</lsj-upload>
+									<view class="frdelimg" v-if="datainfo.guaranteeBack" @click.stop="getDelfdbfzpo('back')">
+										<image :src="fdelimg"></image>
+									</view>
 									<view class="photit">上传国徽面</view>
 								</view>
 							</view>
 						</uni-forms-item>
 						<uni-forms-item label="姓名" name="guaranteeName">
-							<uni-easyinput v-model="datainfo.guaranteeName" :inputBorder='false' placeholder="自动识别" />
+							<uni-easyinput v-model="datainfo.guaranteeName" disabled :inputBorder='false' placeholder="自动识别" />
 						</uni-forms-item>
 						<uni-forms-item label="身份证号" name="guaranteeIdCard">
-							<uni-easyinput v-model="datainfo.guaranteeIdCard" :inputBorder='false' placeholder="自动识别" />
+							<uni-easyinput v-model="datainfo.guaranteeIdCard" disabled :inputBorder='false' placeholder="自动识别" />
 						</uni-forms-item>
 						<uni-forms-item label="手机号码" name="guaranteePhone">
 							<uni-easyinput v-model="datainfo.guaranteePhone" type="number" :inputBorder='false' placeholder="请输入手机号码" />
@@ -1374,15 +1381,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:'frsfzrmx'},{tit:'法人身份证国徽面',type:'frsfzghm'},
+					{tit:'公司章程',type:'gszc'},{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'},
+				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'},
 				],
 				content:'',//小微企业富文本
 				
@@ -1427,8 +1431,8 @@
 				this.categoryId=e.categoryId
 			})
 			this.init()
-			// this.getQylist()
-			// this.getDocumentList()
+			this.getQylist()
+			this.getDocumentList()
 			
 		},
 		mounted() {
@@ -1442,39 +1446,39 @@
 		methods:{
 			checkPermi, checkRole,
 			init(){
-				// // 用户类型
-				// getDictionaryFn('customer_type').then(res=>{
-				// 	if(res.code==200){
-				// 		this.yhlxlist = res.data.map(v => {
-				// 			return {
-				// 				label: v.dictLabel,
-				// 				value: v.dictValue
-				// 			}
-				// 		})
-				// 	}
-				// })
-				// // 婚姻状况
-				// getDictionaryFn('marital_status').then(res=>{
-				// 	if(res.code==200){
-				// 		this.hyztlist = 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('customer_type').then(res=>{
+					if(res.code==200){
+						this.yhlxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 婚姻状况
+				getDictionaryFn('marital_status').then(res=>{
+					if(res.code==200){
+						this.hyztlist = 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('application_fj_jc').then(res=>{
 					if(res.code==200){
@@ -1680,6 +1684,15 @@
 					this.datainfo.spouseBack="";	
 				}	
 			},
+			getDelfdbfzpo(type){
+				if(type=='front'){
+					this.datainfo.guaranteeFront="";
+					this.datainfo.guaranteeName="";
+					this.datainfo.guaranteeIdCard="";
+				}else{
+					this.datainfo.guaranteeBack="";	
+				}	
+			},
 			bindDateChanged(e){
 				// 婚姻状态
 				var val=e.detail.value;
@@ -1735,12 +1748,35 @@
 				this.datainfo.isDuty=this.sfList[val].value;
 			},
 			getZanFn(){
-				var params=this.datainfo
+				var params=this.datainfo;
+				var gdlist=this.gdlist;
+				var shFjList=[]
+				Object.keys(gdlist).some((key) => {
+					var fjurl={
+						shareholderFrontUrl:gdlist[key].cardz,
+						shareholderBackUrl:gdlist[key].cardf,
+						shareholderZxUrl:gdlist[key].zxurl.join(','),
+					} 
+					shFjList.push(fjurl)
+				})
+				params.shareholderFjList=JSON.parse(JSON.stringify(shFjList))
+				var flist=this.filelist;
+				var sbfjlist=this.sbfjlist;
+				sbfjlist.forEach(ite=>{
+					if(ite.fjlist&&ite.fjlist.length){
+						flist.push(ite.fjlist[0])
+					}
+				})
+				
+				params.loanApplicationFjList=JSON.parse(JSON.stringify(flist))
 				getApplicationZc(params).then(res=>{
 					if(res.code==200){
 						this.$toast('暂存成功')
 						// 刷新列表
-						uni.$emit('refreshywlist')
+						setTimeout(function(){
+							uni.$emit('refreshywlist')
+						},1200)
+						
 					}
 				})
 			},
@@ -1771,8 +1807,11 @@
 								var fjurl={
 									cardz:gdlist[key].shareholderFrontUrl,
 									cardf:gdlist[key].shareholderBackUrl,
-									zxurl:gdlist[key].shareholderZxUrl.split(','),
-								} 
+									zxurl:[],
+								}
+								if(gdlist[key].shareholderZxUrl){
+									fjurl.zxurl=gdlist[key].shareholderZxUrl.split(',')
+								}
 								shFjList.push(fjurl)
 							})
 							this.gdlist=JSON.parse(JSON.stringify(shFjList))
@@ -1797,6 +1836,14 @@
 					this.$toast("请选择用户类型")
 					return
 				}
+				if(!params.corporationFront){
+					this.$toast("请上传法人身份证人面像")
+					return
+				}
+				if(!params.corporationBack){
+					this.$toast("请上传法人身份证国徽面")
+					return
+				}
 				if(!params.corporationJob){
 					this.$toast("请输入法人职业")
 					return
@@ -1811,11 +1858,11 @@
 				}
 				if(params.corporationMaritalStatus==1){
 					if(!params.spouseFront){
-						this.$toast("请上传配偶身份证面")
+						this.$toast("请上传配偶身份证人像面")
 						return
 					}
 					if(!params.spouseBack){
-						this.$toast("请上传配偶身份证面")
+						this.$toast("请上传配偶身份证国徽面")
 						return
 					}
 				}
@@ -1829,27 +1876,13 @@
 					this.$toast("请输入法人手机号")
 					return
 				}
-				if(!params.guaranteePhone){
-					// 验证手机号
-					this.$toast("请输入反担保人手机号")
-					return
-				}
-				if(!params.corporationFront){
-					this.$toast("请上传法人身份证人面像")
-					return
-				}
-				if(!params.corporationBack){
-					this.$toast("请上传法人身份证反面")
-					return
-				}
-				if(!params.guaranteeFront){
-					this.$toast("请上传反担保人身份证正面")
-					return
-				}
-				if(!params.guaranteeBack){
-					this.$toast("请上传反担保人身份证反面")
+				
+				let regphone = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
+				if (params.corporationPhone && !regphone.test(params.corporationPhone)) {
+					that.$toast("请输入正确的法人手机号")
 					return
 				}
+				
 				var gdlist=this.gdlist;
 				var shFjList=[]
 				var a=0;
@@ -1886,11 +1919,24 @@
 					var obj={tit:'企业固定资产证明',type:'qygdzczm'}
 					sqbtfiles.push(obj)
 				}else if(params.guaranteeType==2){//反担保人担保
-					var newArr=[
-						{tit:'反担保人身份证人面像',type:'fdbrsfzrmx'},
-						{tit:'反担保人身份证国徽面',type:'fdbrsfzghm'}
-					]
-					btfiles=btfiles.concat(newArr)
+					// 选择担保人担保
+					if(!params.guaranteePhone){
+						// 验证手机号
+						this.$toast("请输入反担保人手机号")
+						return
+					}
+					if (params.guaranteePhone && !regphone.test(params.guaranteePhone)) {
+						that.$toast("请输入正确的反担保人手机号")
+						return
+					}
+					if(!params.guaranteeFront){
+						this.$toast("请上传法人身份证人面像")
+						return
+					}
+					if(!params.guaranteeBack){
+						this.$toast("请上传法人身份证国徽面")
+						return
+					}
 				}
 				var b=0;
 				Object.keys(btfiles).some((key) => {
@@ -1905,7 +1951,10 @@
 				if(b==1){
 					return
 				}
-				
+				if(!params.isDuty){
+					this.$toast("请选择是否免税企业")
+					return
+				}
 				var sbfjlist=this.sbfjlist;
 				var sbArr=[]
 				var c=0;
@@ -1928,8 +1977,6 @@
 				})
 				
 				params.loanApplicationFjList=JSON.parse(JSON.stringify(flist))
-				// 申请附件
-				return
 				if(this.ptype=='add'){
 					getApplicationAdd(params).then(res=>{
 						if(res.code==200){
@@ -2257,6 +2304,7 @@
 .addbox /deep/ .uni-input-input{font-size: 30rpx;}
 .addbox /deep/ .uni-easyinput__content-input{padding-left: 0 !important;}
 .addbox /deep/ .uni-textarea-textarea{font-size: 30rpx;}
+.addbox /deep/ .is-disabled{color: #222327;background-color: #ffffff !important;}
 .isborder{border-bottom: 2rpx solid #E6E6E6;}
 .labtxt{font-weight: bold;font-size: 32rpx;color: #161616;flex: 0 0 auto;width: auto !important;padding-left: 12rpx;width: 240rpx;box-sizing: border-box;
 	position: absolute;left: -240rpx;top:50%;transform: translateY(-50%);

+ 153 - 65
work/pages/business/details.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="details">
 		<view class="zxtop">
-			<view class="failtit" v-if="datainfo.auditType==4">该业务申请未通过风险部审核,可完善信息后进行申诉</view>
+			<!-- 风险部 -->
+			<view class="failtit" v-if="datainfo.auditType==4">该业务申请未通过审核,可完善信息后进行申诉</view>
 			<view class="detop">
 				<!-- 归档 归档后没有业务进度-->
 				<image :src="gdicoimg" class="gdimg" v-if="gdflag"></image>
@@ -71,7 +72,7 @@
 					<dfjxx @getDown="getDown" :datainfo="datainfo" :declareFj="datainfo.declareFj" :sbfjlist="sbfjlist" @getXzFn="getXzFn"></dfjxx>
 				</block>
 				<block v-if="tabval==4">
-					<ewjcj @getDown="getDown" :datainfo="datainfo"  @getDelwjFj="getDelwjFj" @getfjEdit="getfjEdit" :wjcjlist="wjcjlist" :fileFj="datainfo.fileFj"></ewjcj>
+					<ewjcj @getDown="getDown" :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>
@@ -83,7 +84,7 @@
 		<block v-if="!gdflag">
 			<view class="h50"></view>
 			<view class="footbtns">
-				<!-- (业务进度表查询进度列表):1:申报提交
+				<!-- (业务进度表查询进度列表):1:申报提交 stepval
 				2:业务审核/分配 
 				3:担保初审 
 				4:尽职调查 
@@ -94,7 +95,7 @@
 				9:放款通知 
 				10:归档 -->
 				
-				<!-- 审核进度
+				<!-- 审核进度  auditSchedule
 				1:业务审核/分配 
 				2:A角色审核 
 				3:B角色审核 
@@ -103,43 +104,68 @@
 				6:初审风险合规 
 				7:上会评审 -->
 				<!-- 申请审核 start-->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:edit'])&&stepval<3" @click="getedit">修改</view>
-				<!-- <view class="fbtns bga" v-if="checkPermi(['system:application:remove'])" @click="getDel">删除</view> -->
+				<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 bga" v-if="auditSchedule==1&&checkPermi(['system:application:sh'])" @click="getShFn('sh')">审核</view>
-				<view class="fbtns bga" v-if="auditSchedule==4&&checkPermi(['system:application:sh'])" @click="getShFn('fxsh')">风险审核</view>
-				<!-- 业务审核后出具担保意向函-->
-				<!-- <view class="fbtns bgb">上传文件</view>
-				<view class="fbtns bga" @click="getSubmit">查看担保意向函</view> -->
+				<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&checkPermi(['system:application:sh'])" @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>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==2&&datainfo.auditType!=4" @click="getShFn('ajssh')">a审核</view>
+				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==2&&datainfo.auditType==1" @click="getShFn('ajssh')">a审核</view>
 				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.bUserId&&auditSchedule==3" @click="getShFn('bjssh')">b审核</view>
 				<!-- 审核后 -->
 				<!-- <view class="fbtns bga" @click="getMoreFn('more')">更多操作</view> -->
-				<!-- 未通过申诉 -->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:ss'])&&datainfo.auditType==4" @click="getSsFn">申诉</view>
-				<view class="fbtns bga" v-if="checkPermi(['system:application:cx'])&&auditSchedule>1" @click="getCxFn">撤销</view>
+				<!-- 未通过申诉 风险不通过,上会不通过-->
+				<!-- 撤销, 业务分配,a,b角撤销 -->
+				<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>
+				<!-- 回收站,暂存,归档不能撤  项目进度是申报提交-->
+				<!-- 撤销,管理员在 a待审核 可以撤,  
+					a,b角是自己的时候可以撤
+				-->
+				<view class="fbtns bga" v-if="checkPermi(['system:application:cx'])&&stepval<10&&stepval>6" @click="getXybFn">项目推进</view>
 				<!-- end -->
+				<!-- 管理员业务初审审核后出具担保意向函-->
+				<block v-if="auditSchedule>1&&stepval<3">
+					<view class="fbtns bgb" @click="getfjEdit('dbyxh')">上传文件</view>
+					<view class="fbtns bga">查看担保意向函</view>
+				</block>
 				<!-- 风险部门 start-->
-				<!-- <view class="fbtns bgb" @click="getMoreFn('wb')">外部工具平台</view>
-				<view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view> -->
+				<block v-if="stepval==5">
+					<view class="fbtns bgb" v-if="checkPermi(['system:hyperlink:list'])" @click="getMoreFn('wb')">外部工具平台</view>
+					<view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view>
+				</block>
+				
 				<!-- end -->
 				<!-- 上会管理员 start -->
-				<view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view>
-				<view class="fbtns bga" @click="getShFn('shsh')">审核</view>
+				<block v-if="stepval==6">
+					<view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view>
+					<view class="fbtns bga" @click="getShFn('shsh')">审核</view>
+				</block>
 				<!-- 上会管理员 end -->
 				<!-- 合同签约start -->
-				<view class="fbtns bgb" @click="getShFn('shhj')">上传附件</view>
-				<view class="fbtns bga" @click="getMoreFn('htqy')">出具合同</view>
-				<view class="fbtns bga" @click="getqmFn">签名</view>
+				<!-- 上传附件 是上传其他 和出具合同的附件-->
+				<block v-if="stepval==7">
+					<view class="fbtns bgb" @click="getMoreFn('htsc')">上传附件</view>
+					<view class="fbtns bga" @click="getMoreFn('htqy')">出具合同</view>
+				</block>
+				<!-- <view class="fbtns bga" @click="getqmFn">签名</view> -->
 				<!-- 合同签约end -->
 				<!-- 风险部放款 start-->
-				<!-- <view class="fbtns bgb" @click="getShFn('shhj')">上传附件</view>
-				<view class="fbtns bga" @click="">出具放款合规表</view> -->
+				<block v-if="stepval==8">
+					<view class="fbtns bgb" @click="getfjEdit('fkhgb')">上传附件</view>
+					<view class="fbtns bga" @click="">出具放款合规表</view>
+				</block>
 				<!-- end -->
-				<!-- <view class="fbtns bga" @click="">放款通知书</view> -->
-				<view class="fbtns bga" @click="getGdFn">一键归档</view>
+				<block v-if="stepval==9">
+					<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>
 		</block>
 		<!-- 更多操作 -->
@@ -147,10 +173,10 @@
 		<view v-if="mtype" class="morebox">
 			<view class="molists">
 				<!-- 审核详情后 -->
-				<block v-if="mtype=='more'">
-					<!-- <view class="mcoa" @click="getShFn('shhj')">上传附件</view> -->
+				<!-- <block v-if="mtype=='more'">
+					<view class="mcoa" @click="getShFn('shhj')">上传附件</view>
 					<view>撤回</view>
-				</block>
+				</block> -->
 				<!--风险部门 start 外部工具平台 -->
 				<block v-if="mtype=='wb'">
 					<view v-for="(ite,idx) in linkList" :key="idx" @click="getWebUel(ite.url)">{{ite.name}}</view>
@@ -158,22 +184,36 @@
 				<!-- 更多操作 -->
 				<block v-if="mtype=='fxmore'">
 					<view @click="getShFn('fxbmsh')" v-if="auditSchedule==6&&checkPermi(['system:application:sh'])">审核</view>
-					<view class="mcoa">出具材料合规表</view>
-					<view @click="getShFn('shhj')">上传附件</view>
-					<view>撤回</view>
+					<view>出具材料合规表</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>出具评审意见签批表</view>
-					<view class="mcoa">上会纪要</view>
-					<view @click="getShFn('shpsyj')">上传评审意见签批表</view>
-					<view @click="getShFn('shshjy')">上传上会纪要</view>
+					<view>上会纪要</view>
+					<view @click="getfjEdit('psyjqpb')">上传评审意见签批表</view>
+					<view @click="getfjEdit('gdhyjy')">上传上会纪要</view>
 				</block>
 				<!-- 上会管理员 end -->
 				<!-- 合同签约 start -->
+				<!-- 合同上传信息 -->
+				<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>
+					</block>
+					<block v-if="datainfo.guaranteeType=='1'">
+						<view @click="getfjEdit('dyfdbhtfr')">上传抵押反担保合同(法人)</view>
+						<view @click="getfjEdit('dyfdbhtzrr')">上传抵押反担保合同(自然人)</view>
+					</block>
+					<view @click="getQtfjEdit('qtfj')">其他附件</view>
+				</block>
 				<block v-if="mtype=='htqy'">
-					<view>委托保证合同</view>
+					<view @click="get">委托保证合同</view>
 					<block v-if="datainfo.guaranteeType=='2'">
 						<view>保证反担保合同(法人)</view>
 						<view>保证反担保合同(自然人)</view>
@@ -184,11 +224,12 @@
 					</block>
 				</block>
 				<!-- 合同签约 end -->
+				
 			</view>
 			<!-- <view class="surbtns" @click="getMoreSure">确认</view> -->
 		</view>
 		<pop-up :type="type" :shtg="shtg" :loanApplicationId="datainfo.loanApplicationId" :loanApplicationNumber="datainfo.loanApplicationNumber" :userList="userList" 
-		:stepList="stepList" :wjcjobj='wjcjobj' :stepval="stepval" :fjval="fjval"
+		:stepList="stepList" :wjcjobj='wjcjobj' :qtfjobj="qtfjobj" :stepval="stepval" :fjval="fjval"
 		 @getfjAdd="getfjAdd"
 		 @getClose="getClose" @getupSubmit="getupSubmit" @getSure="getSure"></pop-up>
 	</view>
@@ -208,7 +249,7 @@
 	import {uploadmore,selectValue} from '@/utils/common.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} from "@/api/mine/work.js"
+	import {getApplicationDet,getScheduleList,getHyperlinkList,getApplicationDel,getApplicationSh,getCommentsList,getApplicationSs,getApplicationCx,getapplicationGd,getapplicationXib} from "@/api/mine/work.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{aqyxx,bfrxx,cfdbrxx,dfjxx,ewjcj,fshxx,popUp},
@@ -315,6 +356,8 @@
 				shlist:[],//审核信息
 				shinfo:{},//审核信息
 				wjcjobj:{},//文件出具对象
+				qtfjobj:{'qtfj':"其他附件"},//其他附件
+				qtfjlist:[],//其他附件
 				fjval:'',//附件类型
 				userId:this.$store.state.user.userId,
 				contype:'',//二次确认弹窗
@@ -334,17 +377,21 @@
 			this.init()
 			this.getDetail();
 			this.getScheduleList();
-			this.getHyperlinkList();//外部链接
-			this.getUsernoPageList();//获取用户列表
+			// this.getHyperlinkList();//外部链接stepval==5
+			// this.getUsernoPageList();//获取用户列表stepval==2
 			this.getCommentsList()//审核意见
 		},
 		mounted() {
+			var that=this;
 			uni.getSystemInfo({
 				success: (e) => {
 					this.minheight = e.screenHeight- 50;
 				}
 			})
-			this.getHeightFn()
+			setTimeout(function(){
+				that.getHeightFn()
+			},200)
+			
 		},
 		onPageScroll(e) {
 			var scrollTop = Number(e.scrollTop);
@@ -392,10 +439,15 @@
 				});
 			},
 			getfjEdit(ite){
-				console.log(ite,23)
 				this.type='fjadd';
+				this.mtype='';
 				this.fjval=ite
 			},
+			getQtfjEdit(val){
+				this.type='qtfjadd';
+				this.mtype='';
+				this.fjval=val
+			},
 			// 业务进度
 			getScheduleList(){
 				var params={
@@ -543,6 +595,23 @@
 						this.wjcjobj=obj
 					}
 				})
+				// 其他附件
+				// getDictionaryFn('application_fj_other').then(res=>{
+				// 	if(res.code==200){
+				// 		var obj={}
+				// 		this.qtfjlist = res.data.map(v => {
+				// 			// var key=v.dictValue
+				// 			obj[v.dictValue]=v.dictLabel
+				// 			return {
+				// 				label: v.dictLabel,
+				// 				val: v.dictValue,
+				// 				fjlist:[]
+				// 			}
+				// 		})
+				// 		this.qtfjobj=obj
+				// 		console.log(obj,1)
+				// 	}
+				// })
 				//审核进度
 				getDictionaryFn('audit_schedule').then(res=>{
 					if(res.code==200){
@@ -639,6 +708,7 @@
 								if(res.code==200){
 									that.$toast("申诉成功")
 									setTimeout(function(){
+										that.getDetail();
 										uni.$emit('refreshdatalist')
 										// uni.navigateBack({
 										// 	delta:1
@@ -665,7 +735,8 @@
 								loanApplicationId:that.id,
 								auditSchedule:that.auditSchedule,
 								loanSchedule:that.datainfo.loanSchedule,
-								loanApplicationType:that.datainfo.loanApplicationType
+								loanApplicationType:that.datainfo.loanApplicationType,
+								auditType:that.datainfo.auditType
 							}
 							getApplicationCx(params).then(res=>{
 								if(res.code==200){
@@ -684,6 +755,35 @@
 					}
 				});
 			},
+			getXybFn(){
+				var that=this;
+				uni.showModal({
+					title: '确认推进',
+					content: "是否确认推进",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							var params={
+								loanApplicationId:that.id,
+								// auditSchedule:that.auditSchedule,
+								loanSchedule:that.datainfo.loanSchedule,
+								// loanApplicationType:that.datainfo.loanApplicationType
+							}
+							getapplicationXib(params).then(res=>{
+								if(res.code==200){
+									that.$toast("推进成功")
+									setTimeout(function(){
+										uni.$emit('refreshywlist')
+									},1200)
+									
+								}
+							})
+						} else if (res.cancel) {
+						}
+					}
+				});
+			},
 			getGdFn(){
 				var that=this;
 				uni.showModal({
@@ -698,7 +798,8 @@
 								auditSchedule:that.auditSchedule,
 								loanSchedule:that.datainfo.loanSchedule,
 								loanApplicationType:that.datainfo.loanApplicationType,
-								loanApplicationNumber:that.datainfo.loanApplicationNumber
+								loanApplicationNumber:that.datainfo.loanApplicationNumber,
+								auditType:that.datainfo.auditType
 							}
 							getapplicationGd(params).then(res=>{
 								if(res.code==200){
@@ -766,28 +867,17 @@
 						if(res.data.sysUserEnterprise){
 							this.qyinfo=res.data.sysUserEnterprise
 						}
-						this.stepval=res.data.loanSchedule||0;
+						
 						if(res.data.basicFj){
 							this.basicFj=res.data.basicFj;
 						}
-						// var data=res.data;
-						// if(data.shareholderFjList){
-						// 	var shFjList=[]
-						// 	var gdlist=data.shareholderFjList;
-						// 	Object.keys(gdlist).some((key) => {
-						// 		var fjurl={
-						// 			shareholderFrontUrl:gdlist[key].shareholderFrontUrl,
-						// 			shareholderBackUrl:gdlist[key].shareholderBackUrl,
-						// 			zxurl:gdlist[key].shareholderZxUrl.split(','),
-						// 		} 
-						// 		shFjList.push(fjurl)
-						// 	})
-						// 	this.gdlists=JSON.parse(JSON.stringify(shFjList))
-						// }
-						// this.declareFj=res.data.declareFj;
-						// 附件信息
-						
-						// this.otherFj=res.data.otherFj||[]
+						this.stepval=res.data.loanSchedule||0;
+						var auditSchedule=res.data.auditSchedule
+						if(auditSchedule==6){
+							this.getHyperlinkList();//外部链接stepval==5
+						}else if(auditSchedule==1||auditSchedule==7){
+							this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
+						}
 					}
 				})
 			},
@@ -820,9 +910,6 @@
 				this.filelist.push(newobj)
 				// this.datainfo.zsyzFjList=JSON.parse(JSON.stringify(this.filelist))
 			},
-			getEdit(){
-				this.type='shhj'
-			},
 			getXzFn(ite){
 				// 本地路径开头使用file://,跟上手机文件本地目录storage/emulated/0,
 				// 后缀是用于文件命名和格式修改,大家可以使用变量。
@@ -938,6 +1025,7 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 	.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;}
 		&.bgb{background: #FFFFFF;;color: $com-cd3;}
+		&.bgc{background: #DF0303;;color: #FFFFFF;}
 	}	
 }
 .morebox{

+ 246 - 0
work/pages/business/hszlist.vue

@@ -0,0 +1,246 @@
+<template>
+	<view class="listbox">
+		<!-- 列表 -->
+		<view class="plr18">
+			<bus-list :datalist="list" :wtdt="wtdt" :sdyhlist="sdyhlist" :dblxlist="dblxlist" :shjdlist="shjdlist" :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:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				// limit:''
+				type:'work',
+				tabval:'0',
+				tabList:[
+					{tit:'全部',val:'0',},{tit:'申报审核',val:'2',},{tit:'担保初审',val:'3',},
+					{tit:'尽职调查',val:'4',},{tit:'评审会',val:'6',},{tit:'签署合同',val:'7',},
+				],
+				sbsj:'',
+				shidx:[0],
+				shzt:'',
+				shztid:'',
+				sdyhidx:[0],
+				sdyh:'',
+				sdyhid:'',
+				dblxidx:[0],
+				dblx:'',
+				dblxid:'',
+				sdyhlist:[],//申贷银行
+				shlist:[],//审核状态
+				dblxlist:[],//担保类型
+				shjdlist:[],//审核进度
+			}
+		},
+		onUnload() {
+			uni.$off('refreshywlist')
+			uni.$off('refreshdatalist')
+		},
+		onLoad(e) {
+			if(e.type){
+				this.tabval=e.type;
+			}
+			uni.$on('refreshywlist',(e) => {
+				this.getrefreshData()
+			})
+			uni.$on('refreshdatalist',(e) => {
+				this.getrefreshData()
+			})
+			this.init()
+			this.getDataFn()
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				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('loan_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)
+			},
+			getTabFn(val){
+				this.tabval=val;
+				this.getrefreshData()
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.sbsj=val;
+				this.getrefreshData()
+			},
+			bindDateChangeb(e){
+				var val=e.detail.value;
+				this.shzt=this.shlist[val].label;
+				this.shztid=this.shlist[val].value;
+				this.getrefreshData()
+			},
+			bindDateChangec(e){
+				var val=e.detail.value;
+				this.sdyh=this.sdyhlist[val].label;
+				this.sdyhid=this.sdyhlist[val].value;
+				this.getrefreshData()
+			},
+			bindDateChanged(e){
+				var val=e.detail.value;
+				this.dblx=this.dblxlist[val].label;
+				this.dblxid=this.dblxlist[val].value;
+				this.getrefreshData()
+			},
+			getResetFn(){
+				// 重置
+				this.sbsj='';
+				this.shzt='';
+				this.sdyh='';
+				this.dblx='';
+				
+				this.shidx=[0];
+				this.sdyhidx=[0];
+				this.dblxidx=[0];
+				this.getrefreshData()
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getDataFn(){
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+					loanApplicationType:3
+				}
+				if(this.tabval!=0){
+					params.loanSchedule=this.tabval
+				}
+				if(this.sbsj){
+					params.applicationTime=this.sbsj
+				}
+				if(this.shzt){
+					params.auditType=this.shztid
+				}
+				if(this.sdyh){
+					params.applicationBank=this.sdyhid
+				}
+				if(this.dblx){
+					params.guaranteeType=this.dblxid
+				}
+				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: 24rpx;padding-bottom: 24rpx;}
+</style>

+ 10 - 1
work/pages/business/list.vue

@@ -85,6 +85,7 @@
 				shlist:[],//审核状态
 				dblxlist:[],//担保类型
 				shjdlist:[],//审核进度
+				from:'',//从哪来的
 			}
 		},
 		onUnload() {
@@ -95,6 +96,9 @@
 			if(e.type){
 				this.tabval=e.type;
 			}
+			if(e.from){
+				this.from=e.from;
+			}
 			uni.$on('refreshywlist',(e) => {
 				this.getrefreshData()
 			})
@@ -208,10 +212,15 @@
 				this.getDataFn()
 			},
 			getDataFn(){
+				// var str='2,3,4'
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
-					// loanApplicationType:2
+				}
+				if(this.from&&this.from=='my'){
+					
+				}else{
+					params.loanApplicationType=2
 				}
 				if(this.tabval!=0){
 					params.loanSchedule=this.tabval

+ 21 - 59
work/pages/business/zclist.vue

@@ -1,43 +1,5 @@
 <template>
 	<view class="listbox">
-		<view class="fixedt">
-			<!-- tab -->
-			<view class="tablists flexc">
-				<block v-for="(ite,idx) in tabList" >
-					<view  v-if="!ite.limit||ite.limit&&checkPermi([ite.limit])" @click="getTabFn(ite.val)" :class="{act:tabval==ite.val}" :key="idx">{{ite.tit}}</view>
-				</block>
-			</view>
-			<!-- 选择器 -->
-			<view class="flexc checkbox">
-				<picker mode="date"   @change='bindDateChangea'>
-					<view class="chekt">
-						<view>{{sbsj|| "申报时间"}}</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>
-				<picker range-key='label' :value="sdyhidx" :range="sdyhlist"  @change='bindDateChangec'>
-					<view class="chekt">
-						<view>{{sdyh || "申贷银行"}}</view>
-						<image :src="upimg"></image>
-					</view>
-				</picker>
-				<picker range-key='label' :value="dblxidx" :range="dblxlist"  @change='bindDateChanged'>
-					<view class="chekt">
-						<view>{{dblx || "担保类型"}}</view>
-						<image :src="upimg"></image>
-					</view>
-				</picker>
-				<view class="reset" @click="getResetFn">
-					<image :src="resetimg"></image>
-				</view>
-			</view>
-		</view>
 		<!-- 列表 -->
 		<view class="plr18">
 			<bus-list :datalist="list" :wtdt="wtdt" :sdyhlist="sdyhlist" :dblxlist="dblxlist" :shjdlist="shjdlist" :type="type" @getDetail="getDetail"></bus-list>
@@ -126,16 +88,16 @@
 					}
 				})
 				//审核状态
-				getDictionaryFn('sh_status').then(res=>{
-					if(res.code==200){
-						this.shlist = 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){
@@ -148,16 +110,16 @@
 					}
 				})
 				//审核进度
-				getDictionaryFn('loan_schedule').then(res=>{
-					if(res.code==200){
-						this.shjdlist = res.data.map(v => {
-							return {
-								label: v.dictLabel,
-								value: v.dictValue
-							}
-						})
-					}
-				})
+				// getDictionaryFn('loan_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)
@@ -280,5 +242,5 @@
 .reset{width:56rpx; height: 88rpx;display: flex;align-items: center;justify-content: center;
 	image{width: 26rpx;height: 30rpx;}
 }
-.listbox{padding-top: 192rpx;padding-bottom: 24rpx;}
+.listbox{padding-top: 24rpx;padding-bottom: 24rpx;}
 </style>