zouling 11 сар өмнө
parent
commit
016cf7b9de

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖源融资担保",
     "appid" : "__UNI__FA20DEF",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

+ 1 - 1
pages/custom/index.vue

@@ -211,7 +211,7 @@ page{background-color: #f6f6f6;}
 		view{font-weight: bold;font-size: 30rpx;color: #FFFFFF;}	
 	}
 	.topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 32rpx 0 32rpx ;position: relative;flex:1;background-color: #FFFFFF;margin-right: 20rpx;
-	 input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	 input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	 image{width: 30rpx;height: 30rpx;margin-right: 24rpx;}
 	 }
 	.topr{width: 48rpx;height: 38rpx;position: relative;margin-right: 10rpx;

+ 1 - 1
pages/index/index.vue

@@ -624,7 +624,7 @@
 }
 .serbox{
 	.topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 32rpx 0 32rpx ;position: relative;flex:1;background-color: #FFFFFF;margin-right: 20rpx;
-	 input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	 input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	 image{width: 30rpx;height: 30rpx;margin-right: 24rpx;flex: 0 0 auto;}
 	 }
 	.topr{width: 48rpx;height: 38rpx;position: relative;

+ 1 - 1
pages/work/index.vue

@@ -320,7 +320,7 @@ page{background-color: #f6f6f6;}
 		view{font-weight: bold;font-size: 30rpx;color: #FFFFFF;}	
 	}
 	.topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 32rpx 0 32rpx ;position: relative;flex:1;background-color: #FFFFFF;margin-right: 20rpx;
-	 input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	 input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	 image{width: 30rpx;height: 30rpx;margin-right: 24rpx;}
 	 }
 	.topr{width: 48rpx;height: 38rpx;position: relative;margin-right: 10rpx;

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

@@ -13,6 +13,10 @@
 							<view class="listrt">
 							{{kaType(ite.auditSchedule,shjdlist)}}
 							</view>
+							<view class="listrx flext">
+								<view class="ltit">审核人:</view>
+								<view class="ltxt">{{ite.createBy}}</view>
+							</view>
 							<view class="listrx flext">
 								<view class="ltit">审核状态:</view>
 								<view class="ltxt">{{ite.auditType=='3'?'未通过':'通过'}}</view>

+ 15 - 2
work/components/business/list.vue

@@ -18,7 +18,7 @@
 						<view class="txt"><text class="tit">申请额度</text><text class="line">|</text><text>{{ite.applicationAmount}}万元</text></view>
 						<view class="txt"><text class="tit">使用期限</text><text class="line">|</text><text>{{ite.usagePeriod}}月</text></view>
 						<view class="txt"><text class="tit">申贷银行</text><text class="line">|</text><text>{{kaType(ite.applicationBank,sdyhlist)}}</text></view>
-						<view class="txt"><text class="tit">担保类型</text><text class="line">|</text><text>{{kaType(ite.guaranteeType,dblxlist)}}</text></view>
+						<view class="txt"><text class="tit">担保类型</text><text class="line">|</text><text>{{statusFormats(ite.guaranteeType,dblxlist)}}</text></view>
 						<view class="txt"><text class="tit">资金用途</text><text class="line">|</text><text>{{ite.purposeFunds}}</text></view>
 						<view class="txt"><text class="tit">还款来源</text><text class="line">|</text><text>{{ite.repaymentSource}}</text></view>
 					</view>
@@ -115,7 +115,7 @@
 					</view>
 					<view class="flexcw">
 						<view class="txt"><text class="tit">申贷银行:</text><text>{{kaType(ite.applicationBank,sdyhlist)}}</text></view>
-						<view class="txt"><text class="tit">担保类型:</text><text>{{kaType(ite.guaranteeType,dblxlist)}}</text></view>
+						<view class="txt"><text class="tit">担保类型:</text><text>{{statusFormats(ite.guaranteeType,dblxlist)}}</text></view>
 					</view>
 					<view class="flexcw">
 						<view class="txt"><text class="tit">资金用途:</text><text>{{ite.purposeFunds}}</text></view>
@@ -295,6 +295,19 @@
 		getEdit(e){
 			this.$emit('getEdit',e)
 		},
+		statusFormats(ite,list,type){//多选匹配
+			if(ite){
+				var actions = [];
+				list.forEach(s => {
+					if(ite.indexOf(s.value)>-1){
+						actions.push(s.label);
+					}
+				})
+				return actions.join(',')
+			}else{
+				return ''
+			}	
+		},
 		getZhan(id){
 			var num=this.zlist.indexOf(id);
 			if(num!=-1){

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

@@ -636,10 +636,10 @@
 						this.$toast("请输入审核意见")
 						return
 					}
-					if(this.isty!=3&&(!this.filelist||this.filelist.length<1)){
-						this.$toast("请上传附件")
-						return
-					}
+					// if(this.isty!=3&&(!this.filelist||this.filelist.length<1)){
+					// 	this.$toast("请上传附件")
+					// 	return
+					// }
 				}else if(type=='jztcsh'){
 					data={
 						// auditType:this.isty,

+ 1 - 1
work/pages/file/ledgertable.vue

@@ -136,7 +136,7 @@
 }
 .topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 28rpx;position: relative;flex:1;background-color:rgba(90, 135, 186, 0.2);width: 260rpx;
 	flex:1;margin-left: 20rpx;
-	input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	image{width: 30rpx;height: 30rpx;margin-right: 16rpx;flex: 0 0 auto;}
 }
 .listbox{padding-top: 120rpx;padding-bottom: 100rpx;}

+ 1 - 1
work/pages/file/list.vue

@@ -313,7 +313,7 @@
 }
 .topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 28rpx;position: relative;flex:1;background-color:rgba(90, 135, 186, 0.2);width: 260rpx;
 	margin-left: 20rpx;
-	input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	image{width: 30rpx;height: 30rpx;margin-right: 16rpx;flex: 0 0 auto;}
 }
 // .listbox{padding-top: 120rpx;padding-bottom: 100rpx;}

+ 1 - 1
work/pages/prove/qylist.vue

@@ -160,7 +160,7 @@
 }
 .topc{border-radius: 34rpx;height:68rpx;box-sizing: border-box;padding:0 28rpx;position: relative;flex:1;background-color:rgba(90, 135, 186, 0.2);width: 260rpx;
 	flex:1;margin-left: 20rpx;
-	input{font-weight: 500;font-size: 26rpx;color: #222327;}
+	input{font-weight: 500;font-size: 26rpx;color: #222327;flex: 1;}
 	image{width: 30rpx;height: 30rpx;margin-right: 16rpx;flex: 0 0 auto;}
 }
 .listbox{padding-top: 24rpx;padding-bottom: 100rpx;}