流程修改

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "zheng_xie_ui",
+  "name": "rongzidanbao-ui",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

pages/index/index.vue

@@ -52,7 +52,7 @@
 						<view class="img"><image :src="topcimg" class="imgc"></image></view>
 						<view>外部工具</view>
 					</view>
-					<view class="grid-item-box" @click="getBusListFn(4)" v-if="checkPermi(['system:application:list'])">
+					<view class="grid-item-box" @click="getBusListFn(5)" v-if="checkPermi(['system:application:list'])">
 						<view class="img"><image :src="topdimg" class="imgd"></image></view>
 						<view>尽职调查</view>
 					</view>

store/modules/user.js

@@ -89,7 +89,7 @@ const user = {
     // 登录
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()
-      const password =userInfo.type==1 ? userInfo.password:''
+      const password =userInfo.password
       const code = userInfo.code
 	  const type = userInfo.type
       const uuid = userInfo.uuid

utils/request.js

@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
-let timeout = 10000
+let timeout = 60000
 const baseUrl = config.baseUrl
 // const Clientid = config.Clientid
 var confirmflag = config.confirmflag
@@ -67,6 +67,7 @@ const request = config => {
 					var loginForm={
 						username:username,
 						password:password,
+						type:1,
 						strfrom:'request'
 					}
 					store.dispatch('Login', loginForm).then((res) => {

work/components/popup/popup.vue

@@ -108,6 +108,10 @@
 				<view class="ttxt mb18">是否通过</view>
 				<uni-data-checkbox :selectedColor="actcolor" v-model="isty" :localdata="tgList" />
 			</view>
+			<view class="mb16">
+				<view class="ttxt mb18">审核意见</view>
+				<textarea class="textar" style="min-height: 156rpx;" maxlength="-1" autoHeight="true" v-model="shtext" placeholder="若资料不予通过，请填写理由…"></textarea>
+			</view>
 			<view class="mb16">
 				<!-- 担保项目合法合规表 -->
 				<view class="ttxt mb18 flexcj">附件信息
@@ -628,6 +632,14 @@
 						auditType:this.isty,
 						fjUrl:this.filelist,
 					}
+					if(this.isty==3&&!this.shtext){
+						this.$toast("请输入审核意见")
+						return
+					}
+					if(this.isty!=3&&(!this.filelist||this.filelist.length<1)){
+						this.$toast("请上传附件")
+						return
+					}
 				}else if(type=='jztcsh'){
 					data={
 						// auditType:this.isty,
@@ -636,6 +648,14 @@
 						fjUrl:this.filelist,
 						imageUrl:this.phofile.join(',')
 					}
+					if(!this.phofile||this.phofile.length<1){
+						this.$toast("请上传图片")
+						return
+					}
+					if(!this.filelist||this.filelist.length<1){
+						this.$toast("请上传附件")
+						return
+					}
 				}else if(type=='shsh'){
 					data={
 						auditType:this.isty,

work/pages/business/details.vue

@@ -92,8 +92,8 @@
 				<!-- (业务进度表查询进度列表)：1：申报提交 stepval 4,7,8,9,没有通过不通过
 				2：业务审核/分配 
 				3：担保初审 
-				4：尽职调查 
-				5：初审风险合规 
+				4：初审风险合规 
+				5：尽职调查 
 				6：评审会 
 				7：合同签约 
 				8：放款合规风险审核 
@@ -105,8 +105,8 @@
 				2：A角色审核 
 				3：B角色审核 
 				4：风险审核 
-				5：尽职调查 
-				6：初审风险合规 
+				5：初审风险合规 
+				6：尽职调查 
 				7：上会评审 -->
 				<!-- 申请审核 start-->
 				<block v-if="datainfo.loanApplicationType!=3">
@@ -117,7 +117,7 @@
 				<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&checkPermi(['system:application:sh'])&&checkRole(['auditing_risk'])" @click="getShFn('fxsh')">风险审核</view>
 				<!-- end -->
 				<!-- a,b角按钮 start-->
-				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==5" @click="getShFn('jztcsh')">尽职调查反馈</view>
+				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==6" @click="getShFn('jztcsh')">尽职调查反馈</view>
 				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.aUserId&&auditSchedule==2&&datainfo.auditType==1" @click="getShFn('ajssh')">审核</view>
 				<view class="fbtns bga" v-if="checkPermi(['system:application:sh'])&&userId==datainfo.bUserId&&auditSchedule==3" @click="getShFn('bjssh')">审核</view>
 				<!-- 审核后 -->
@@ -134,15 +134,16 @@
 				<!-- 管理员业务初审审核后出具担保意向函-->
 				<!-- 管理员 可以让a角 提前开放款通知书，意向函， a角色和管理员给 -->
 				<!-- <block v-if="auditSchedule>1&&stepval<4"> -->
-				<block v-if="auditSchedule>1&&stepval<4">
-					<!-- <view class="fbtns bgb" @click="getfjEdit('dbyxh')">上传文件</view> -->
+				<!-- <block v-if="auditSchedule>1&&stepval<4">
 					<view class="fbtns bga" v-if="checkRole(['manager'])||userId==datainfo.aUserId" @click="getIssureFn(3,'dbyxh')">出具担保意向函</view>
 					<view class="fbtns bgb" v-if="checkRole(['manager'])&&checkPermi(['system:application:cx'])&&auditSchedule<3&&datainfo.auditType<2" @click="getCxFn">撤销</view>
-				</block>
-				<!-- 风险部门 start-->
-				<block v-if="stepval==5&&checkRole(['auditing_risk'])">
+				</block> -->
+				<!-- 风险部门  start-->
+				<block v-if="stepval==4&&checkRole(['auditing_risk'])">
 					<view class="fbtns bgb" v-if="checkPermi(['system:hyperlink:list'])" @click="getMoreFn('wb')">外部工具平台</view>
-					<view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view>
+					<!-- 初审风险审核 -->
+					<view class="fbtns bga" @click="getShFn('fxbmsh')" v-if="checkPermi(['system:application:sh'])">审核</view>
+					<!-- <view class="fbtns bga" @click="getMoreFn('fxmore')">更多操作</view> -->
 				</block>
 				
 				<!-- end -->
@@ -156,16 +157,11 @@
 				<block v-if="stepval==7">
 					<!-- <view class="fbtns bgb" @click="getMoreFn('htsc')">上传附件</view> -->
 					<view class="fbtns bga" @click="getMoreFn('htqy')">出具合同</view>
-					<view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view>
+					<!-- <view class="fbtns bgb" @click="getMoreFn('shmore')">更多操作</view> -->
 				</block>
 				<!-- 合同签约end -->
 				<!-- 风险部放款 start-->
-				<block v-if="checkRole(['auditing_risk','manager'])">
-					<view class="fbtns bga" v-if="stepval==8||stepval==9&&datainfo.aAuthorize=='Y'" @click="getIssureFn(14,'fkhgb')">出具放款合规表</view>
-					<!-- 暂缓出具  备注原因推给管理员-->
-					<view class="fbtns bgb" v-if="stepval==8&&checkPermi(['system:application:zanHuan'])" @click="getShFn('zhfkhgb')">暂缓出具放款合规表</view>
-					<!-- <view class="fbtns bgb" @click="getfjEdit('fkhgb')">上传附件</view> -->
-				</block>
+				
 				<!-- 管理员授权判断是否提前了,步骤7之后，并且暂缓了 -->
 				<view class="fbtns bgb" v-if="checkPermi(['system:application:authorize'])&&stepval==8&&datainfo.aAuthorize!='Y'" @click="getAuthorize">授权放款通知书</view>
 				<!-- end -->
@@ -176,15 +172,16 @@
 				</block>
 				<view class="fbtns bga" v-if="checkPermi(['system:application:gd'])&&stepval==9&&datainfo.loanApplicationType!=4" @click="getGdFn">一键归档</view>
 				<view class="fbtns bga" v-if="checkPermi(['system:application:schedule'])&&stepval<9&&stepval>6" @click="getXybFn">项目推进</view>
+				<!-- 所有出具 -->
+				<view class="fbtns bgd" v-if="stepval>1" @click="getMoreFn('chuju')">出具</view>
 				<!-- 申诉的时候不能撤销 -->
-				<!-- <view class="fbtns" :class="auditSchedule==5?'bga':'bgb'" v-if="checkPermi(['system:application:cx'])&&(stepval!=1&&stepval!=10&&(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>2))" @click="getCxFn">撤销</view> -->
+				<!-- <view class="fbtns" :class="auditSchedule==6?'bga':'bgb'" v-if="checkPermi(['system:application:cx'])&&(stepval!=1&&stepval!=10&&(datainfo.auditType!=1||auditSchedule<6&&auditSchedule>2))" @click="getCxFn">撤销</view> -->
 				<block v-if="checkPermi(['system:application:cx'])&&stepval!=1&&stepval!=10">
-					<view class="fbtns bgb" v-if="userId==datainfo.aUserId&&auditSchedule==3" @click="getCxFn">撤销</view>
+					<view class="fbtns bgb" @click="getCxFn">撤销</view>
+					<!-- <view class="fbtns bgb" v-if="userId==datainfo.aUserId&&auditSchedule==3" @click="getCxFn">撤销</view>
 					<view class="fbtns bgb" v-if="userId==datainfo.bUserId&&auditSchedule==4" @click="getCxFn">撤销</view>
-					<!-- auditSchedule<7&& -->
-					<view class="fbtns bgb" v-if="(datainfo.auditType!=1||auditSchedule>4)" @click="getCxFn">撤销</view>
+					<view class="fbtns bgb" v-if="(datainfo.auditType!=1||auditSchedule>4)" @click="getCxFn">撤销</view> -->
 				</block>
-				
 			</view>
 		</block>
 		<!-- 更多操作 -->
@@ -196,13 +193,32 @@
 					<view class="mcoa" @click="getShFn('shhj')">上传附件</view>
 					<view>撤回</view>
 				</block> -->
+				<!-- 出具信息 -->
+				<block v-if="mtype=='chuju'">
+					<view v-if="checkRole(['manager'])||userId==datainfo.aUserId"  @click="getIssureFn(3,'dbyxh')">出具担保意向函</view>
+					<!-- 材料合规 风险部上传 &&checkRole(['auditing_risk']) -->
+					<view v-if="stepval==4&&checkRole(['auditing_risk'])" @click="getIssureFn(13,'clhgb')">出具材料合规表</view>
+					<block v-if="stepval==7">
+						<view  @click="getIssureFn(12,'psyjqpb')">出具评审意见签批表</view>
+						<view  @click="getIssureFn(11,'gdhyjy')">出具股东会决议</view>
+						
+					</block>
+					<!-- 放款合规表 -->
+					<block v-if="checkRole(['auditing_risk','manager'])">
+						<view class="fbtns bga" v-if="stepval==8||stepval==9&&datainfo.aAuthorize=='Y'" @click="getIssureFn(14,'fkhgb')">出具放款合规表</view>
+						<!-- 暂缓出具  备注原因推给管理员-->
+						<view class="fbtns bgb" v-if="stepval==8&&checkPermi(['system:application:zanHuan'])" @click="getShFn('zhfkhgb')">暂缓出具放款合规表</view>
+						<!-- <view class="fbtns bgb" @click="getfjEdit('fkhgb')">上传附件</view> -->
+					</block>
+					<view @click="getQtfjEdit('qtfj')">上传其他附件</view>
+				</block>
 				<!--风险部门 start 外部工具平台 -->
 				<block v-if="mtype=='wb'">
 					<view v-for="(ite,idx) in linkList" :key="idx" @click="getWebUel(ite.url)">{{ite.name}}</view>
 				</block>
 				<!-- 更多操作 -->
 				<block v-if="mtype=='fxmore'">
-					<!-- auditSchedule==6&& -->
+					<!-- auditSchedule==5&& -->
 					<view @click="getShFn('fxbmsh')" v-if="checkPermi(['system:application:sh'])">审核</view>
 					<view @click="getIssureFn(13,'clhgb')">出具材料合规表</view>
 					<!-- <view @click="getfjEdit('clhgb')">上传附件</view> -->
@@ -236,15 +252,15 @@
 				</block>
 				<block v-if="mtype=='htqy'">
 					<view @click="getIssureFn(2,'wtdbht')">委托保证合同</view>
-					<block v-if="datainfo.guaranteeType=='2'">
+					<block v-if="datainfo.guaranteeType.indexOf('2')!=-1">
 						<view @click="getIssureFn(5,'bzfdbhtfr')">保证反担保合同(法人)</view>
 						<view @click="getIssureFn(6,'bzfdbhtzrr')">保证反担保合同(自然人)</view>
 					</block>
-					<block v-if="datainfo.guaranteeType=='1'">
+					<block v-if="datainfo.guaranteeType.indexOf('1')!=-1">
 						<view @click="getIssureFn(7,'dyfdbhtfr')">抵押反担保合同(法人)</view>
 						<view @click="getIssureFn(8,'dyfdbhtzrr')">抵押反担保合同(自然人)</view>
 					</block>
-					<block v-if="datainfo.guaranteeType=='3'">
+					<block v-if="datainfo.guaranteeType.indexOf('3')!=-1">
 						<view @click="getIssureFn(9,'qlzqfdbhtfr')">权利质权反担保合同（适用于法人）</view>
 						<view @click="getIssureFn(10,'qlzqfdbhtzrr')">权利质权反担保合同（适用于自然人）</view>
 					</block>
@@ -422,7 +438,7 @@
 				this.getScheduleList();;//贷款进度
 			}
 			if(checkPermi(['system:hyperlink:list'])){
-				this.getHyperlinkList();//外部链接stepval==5	
+				this.getHyperlinkList();//外部链接stepval==4
 			}
 			if(checkPermi(['system:user:noPageList'])){
 				this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
@@ -1119,6 +1135,7 @@
 							// 数据处理
 							var basicFj=res.data.basicFj;
 							Object.keys(basicFj).some((key) => {
+								// a,b里面的全部都转pdf了
 								// 公司章程,企业征信,企业法人，实际控股人，配偶征信,个人征信,反担保企业征信
 								if(key=='gszc'||key=='sqqyzxbg'||key=='glqyzxbg'||key=='qyfrzxbg'||key=='sjkgrzxbg'||key=='sjkgrpozxbg'||key=='fdbrgrzxbg'||key=='fdbqyzx'){
 									basicFj[key]=basicFj[key].filter((ite) => {
@@ -1130,8 +1147,8 @@
 						}
 						this.stepval=res.data.loanSchedule||0;
 						// var auditSchedule=res.data.auditSchedule
-						// if(checkPermi(['system:hyperlink:list'])&&auditSchedule==6){
-						// 	this.getHyperlinkList();//外部链接stepval==5
+						// if(checkPermi(['system:hyperlink:list'])&&auditSchedule==5){
+						// 	this.getHyperlinkList();//外部链接stepval==4
 						// }else if(auditSchedule==1||auditSchedule==7){
 						// 	if(checkPermi(['system:user:noPageList'])){
 						// 		this.getUsernoPageList();//获取用户列表stepval==2||stepval==6
@@ -1274,8 +1291,9 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 .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;}
+		&.bgb{background: #FFFFFF;color: $com-cd3;}
+		&.bgc{background: #DF0303;color: #FFFFFF;}
+		&.bgd{background: #45cb99;color: #FFFFFF;}
 	}	
 }
 .morebox{

work/pages/business/list.vue

@@ -68,8 +68,8 @@
 				type:'work',
 				tabval:'0',
 				tabList:[
-					{tit:'全部',val:'0',},{tit:'申报审核',val:'2',},{tit:'担保初审',val:'3',},
-					{tit:'尽职调查',val:'4',},{tit:'初审风险合规',val:'5',},{tit:'评审会',val:'6',},{tit:'签署合同',val:'7',},
+					{tit:'全部',val:'0',},{tit:'申报审核',val:'2',},{tit:'担保初审',val:'3',},{tit:'初审风险合规',val:'4',},
+					{tit:'尽职调查',val:'5',},{tit:'评审会',val:'6',},{tit:'签署合同',val:'7',},
 				],
 				sbsj:'',
 				shidx:[0],