Selaa lähdekoodia

测试问题修改

zouling 10 kuukautta sitten
vanhempi
commit
0e992dbfa3

+ 1 - 1
components/wait/list.vue

@@ -3,7 +3,7 @@
 	<view v-if="datalist.length>0">
 	<!-- 代办提醒 -->
 		<block v-if="type=='dbtx'">
-			<view class="watlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.loanApplicationId)">
+			<view class="watlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite)">
 				<view class="tit flex1 over">{{ite.remindTitle}}</view>
 				<view class="txt flex0">{{ite.remindTime}}</view>
 			</view>

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖源融资担保",
     "appid" : "__UNI__FA20DEF",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.4",
+    "versionCode" : 114,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

+ 1 - 1
pages.json

@@ -261,7 +261,7 @@
 			{
 				"path": "pages/business/zclist",
 				"style": {
-					"navigationBarTitleText": "我的暂存",
+					"navigationBarTitleText": "暂存申报",
 					"navigationBarBackgroundColor": "#00A9F0",
 					"navigationBarTextStyle": "white",
 					"h5":{"titleNView":false}

+ 9 - 2
pages/index/index.vue

@@ -508,9 +508,16 @@
 		getNoticeDet(e){
 			this.$tab.navigateTo("/pages/index/noticedetail?type=xttz&id="+e)
 		},
-		getDetail(e){
+		getDetail(ite){
+			var id=ite.loanApplicationId;
+			var remindType=ite.remindType;
+			if(remindType==11){
+				this.$tab.navigateTo("/work/pages/business/details?id="+id+'&from=vote')
+			}else{
+				this.$tab.navigateTo("/work/pages/business/details?id="+id)
+			}
 			// this.$tab.navigateTo("/pages/index/noticedetail?type=dbtz&id="+e)
-			this.$tab.navigateTo("/work/pages/business/details?id="+e)
+			
 		},
 		getTab(idx){
 			this.tabval=idx;

+ 1 - 1
pages/index/notice.vue

@@ -38,7 +38,7 @@
 		components:{tabList,waitList},
 		data(){
 			return{
-				tablist:[{tit:'系统通知',val:'xttz'},{tit:'待办通知',val:'dbtz'}],
+				tablist:[{tit:'系统通知',val:'xttz'},{tit:'待办通知',val:'dbtz',limt:'system:remind:list'}],
 				resetimg:require('@/work/static/images/reset.png'),
 				wresetimg:require('@/work/static/images/wreset.png'),
 				upimg:require('@/work/static/images/sup.png'),

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

@@ -4,6 +4,7 @@
 		<!-- 申报业务 v-if="listtype=='case'"-->
 		<block v-if="type=='work'||type=='vote'">
 			<view class="lists" v-for="(ite,idx) in datalist" @click="getDetail(ite.loanApplicationId)">
+				<!-- <image :src="votef" class="votef"></image> -->
 				<view class="listtop">
 					<view class="toptit over">{{ite.enterpriseName}}</view>
 					<view class="statbox" v-if="ite.isNew=='Y'">专精特新<image :src="start"></image></view>
@@ -288,6 +289,7 @@
 			votec:require('@/work/static/images/votec.png'),
 			voted:require('@/work/static/images/voted.png'),
 			votee:require('@/work/static/images/votee.png'),
+			votef:require('@/work/static/images/votef.png'),
 			sha:require('@/work/static/images/sha.png'),
 			shb:require('@/work/static/images/shb.png'),
 			zlist:[]
@@ -408,7 +410,7 @@
 </script>
 
 <style lang="scss" scoped>
-.lists{background: #FFFFFF;box-shadow: 0px 0px 10rpx 0px rgba(216,216,216,0.4);border-radius: 20rpx;padding: 0 20rpx;margin-bottom: 24rpx;
+.lists{background: #FFFFFF;box-shadow: 0px 0px 10rpx 0px rgba(216,216,216,0.4);border-radius: 20rpx;padding: 0 20rpx;margin-bottom: 24rpx;position: relative;
 	&.qy{padding: 0 24rpx;
 		.listtop{display: block;
 			padding: 40rpx 14rpx 42rpx;
@@ -480,6 +482,7 @@ font-size: 40rpx;display: flex;align-items: center;justify-content: center;color
 	// 	}
 	// }
 }
+.votef{width: 166rpx;height: 110rpx;position: absolute;bottom: 80rpx;right: 40rpx;z-index: 1;}
 .votea{width: 98rpx;height: 98rpx;position: absolute;right: 10rpx;top: 10rpx;}
 .fdzbox{width: 100%;padding: 24rpx 30rpx;box-sizing: border-box;display: flex;align-items: center;background: #E1F3FA;border-radius: 20rpx;
 		image{width: 62rpx;height: 74rpx;margin-right: 32rpx;flex: 0 0 auto;}

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

@@ -1241,7 +1241,7 @@
 		</uni-forms>
 		<!-- btnd -->
 		<view class="addbtns" v-if="ftype">
-			<view class="addlbtn" @click="getZanFn" v-if="!datainfo.loanSchedule||datainfo.loanSchedule<2">
+			<view class="addlbtn" @click="getZanFn" v-if="!datainfo.loanSchedule||datainfo.loanSchedule<3">
 				<image :src="zancio" class="addlbtna"></image>
 				<view class="addlbtnb">暂存</view>
 			</view>
@@ -1250,7 +1250,7 @@
 			<view class="addrbtn bgb" @click="getSubmit" v-if="stepval==4">提交</view>
 		</view>
 		<cover-view class="addbtns" v-else>
-			<cover-view class="addlbtn" @click="getZanFn" v-if="!datainfo.loanSchedule||datainfo.loanSchedule<2">
+			<cover-view class="addlbtn" @click="getZanFn" v-if="!datainfo.loanSchedule||datainfo.loanSchedule<3">
 				<cover-image :src="zancio" class="addlbtna" @click.stop="getZanFn"></cover-image>
 				<cover-view class="addlbtnb" @click.stop="getZanFn">暂存</cover-view>
 			</cover-view>
@@ -1532,7 +1532,8 @@
 		},
 		onBackPress(e) {
 			var that=this;
-			if(this.ischange){
+			var datainfo=that.datainfo;
+			if(this.ischange&&(!datainfo.loanSchedule||datainfo.loanSchedule<3)){
 				var a=0;
 				showConfirm('内容已做修改,是否暂存').then(res => {
 				  if (res.confirm) {  

+ 11 - 4
work/pages/business/details.vue

@@ -122,12 +122,12 @@
 				</block>
 				<block v-else>
 					<!-- a角色,管理员和可以全程修改 -->
-					<view class="fbtns bga" v-if="checkPermi(['system:application:edit'])&&(stepval<3||userId==datainfo.aUserId&&stepval>2||checkPermi(['*:*:*']))" @click="getedit">修改</view>
+					<view class="fbtns bge" v-if="checkPermi(['system:application:edit'])&&(stepval<3||userId==datainfo.aUserId&&stepval>2||checkPermi(['*:*:*']))" @click="getedit">修改</view>
 					<view class="fbtns bgc" v-if="checkPermi(['system:application:remove'])&&stepval<3" @click="getDel">删除</view>
 					<!-- 申诉状态除了修改,都不给 -->
 					<block v-if="datainfo.auditType!=4&&checkPermi(['system:application:sh'])&&datainfo.loanApplicationType==2">
 						<!-- checkRole(['auditing_risk']) 风险角色 -->
-						<view class="fbtns bga" v-if="auditSchedule==1" @click="getShFn('sh')">审核</view>
+						<view class="fbtns bga" v-if="auditSchedule==1&&checkRole(['manager'])" @click="getShFn('sh')">审核</view>
 						<view class="fbtns bga" v-if="auditSchedule==4&&datainfo.auditType!=4&&userId==datainfo.fUserId" @click="getShFn('fxsh')">风险审核</view>
 						<!-- end -->
 						<!-- a,b角按钮 start-->
@@ -234,7 +234,7 @@
 					<block  v-if="stepval==9||stepval==8&&datainfo.aAuthorize=='Y'">
 						<view class="fbtns bgb" v-if="checkRole(['manager'])||userId==datainfo.aUserId" @click="getIssureFn(4,'fktzhsh')">放款通知书</view>
 					</block>
-					<view @click="getQtfjEdit('qtfj')">上传其他附件</view>
+					<view @click="getQtfjEdit('qtfj')" v-if="checkPermi(['system:fj:add'])">上传其他附件</view>
 				</block>
 				<!--风险部门 start 外部工具平台 -->
 				<block v-if="mtype=='wb'">
@@ -939,6 +939,7 @@
 				params.loanApplicationId=this.id;
 				params.loanApplicationNumber=this.datainfo.loanApplicationNumber;
 				params.auditSchedule=this.auditSchedule;
+				params.enterpriseName=this.datainfo.enterpriseName;
 				getApplicationSh(params).then(res=>{
 					if(res.code==200){
 						that.$toast('审核成功')
@@ -960,6 +961,7 @@
 				params.aUserId=this.datainfo.aUserId;
 				params.loanSchedule=this.datainfo.loanSchedule;
 				params.auditType=this.datainfo.auditType;
+				params.enterpriseName=this.datainfo.enterpriseName;
 				getReview(params).then(res=>{
 					if(res.code==200){
 						that.$toast('审核成功')
@@ -1253,7 +1255,11 @@
 								loanSchedule:that.datainfo.loanSchedule,
 								loanApplicationType:that.datainfo.loanApplicationType,
 								loanApplicationNumber:that.datainfo.loanApplicationNumber,
-								auditType:that.datainfo.auditType
+								enterpriseName:that.datainfo.enterpriseName,
+								auditType:that.datainfo.auditType,
+								aUserId:that.datainfo.aUserId,
+								bUserId:that.datainfo.bUserId,
+								fUserId:that.datainfo.fUserId,
 							}
 							getapplicationGd(params).then(res=>{
 								if(res.code==200){
@@ -1530,6 +1536,7 @@ border-radius: 2rpx;height: 4rpx;content: '';}
 		&.bgb{background: #FFFFFF;color: $com-cd3;}
 		&.bgc{background: #DF0303;color: #FFFFFF;}
 		&.bgd{background: #45cb99;color: #FFFFFF;}
+		&.bge{background: #ffac41;color: #FFFFFF;}
 	}	
 }
 .morebox{

BIN
work/static/images/votef.png