10.11 优化计算最高贷款金额

pages/acceptor/acceptor.vue

@@ -3,7 +3,8 @@
 		<view class="headbgbox flex2">
 			<view class="searchbox">
 				<u-icon name="search" bold="true" size="25" color="rgb(246,185,78)"></u-icon>
-				<input type="text" v-model="keywords" placeholder="请输入承兑人名称" placeholder-style="color:#BBBCBE" @blur="changeSeach"/>
+				<input type="text" v-model="keywords" placeholder="请输入承兑人名称" placeholder-style="color:#BBBCBE"
+					@blur="changeSeach" />
 			</view>
 			<view class="screen" @click="show = true">
 				<text>筛选</text>
@@ -31,6 +32,7 @@
 								<text class="pt">账号：{{item.bankAccount}}</text>
 								<text class="pt">服务费率：{{item.serviceRate}}%</text>
 								<text class="pt">利率：{{item.interest}}%</text>
+								<text class="pt" @click.stop="addpdf(item.templateServiceContract)">点击获取服务合同信息</text>
 							</view>
 
 						</view>
@@ -69,7 +71,8 @@
 				<view class="aszs flex6">
 					<view class="againbtn" @click="restoreALL"><text>重置</text></view>
 					<view class="againbtn" style="color: #D8AB5A;border: 1rpx solid #D8AB5A;" @click="makeSureSelect">
-						<text>确认</text></view>
+						<text>确认</text>
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -104,17 +107,17 @@
 		},
 		data() {
 			return {
-				isPull:false,
-				keywords:'',
-				name:'',//承兑人名称
-				Status:'',//承兑人筛选
+				isPull: false,
+				keywords: '',
+				name: '', //承兑人名称
+				Status: 5, //承兑人筛选
 				editall: false,
 				quan: false,
 				show: false,
 				contract_status: 0,
 				listall: [],
 				pageIndex: 1,
-				pages:0,
+				pages: 0,
 				total: '',
 				nomore: false,
 				statusall: 0,
@@ -157,7 +160,7 @@
 		// 		this.nomore = true
 		// 	}
 		// },
-		
+
 		//触底加载数据
 		// onPullDownRefresh(){
 		// 	this.pageIndex = 1 ;
@@ -170,7 +173,7 @@
 		// 		this.init()
 		// 	}
 		// },
-		
+
 		methods: {
 			init() {
 				uni.showLoading()
@@ -182,7 +185,7 @@
 					uni.hideLoading()
 					console.log(res);
 					this.total = res.total
-					this.listall=res.result
+					this.listall = res.result
 					// let list = res.result
 					// if (list.length > 0) {
 					// 	list.forEach(item => {
@@ -206,14 +209,14 @@
 
 			},
 			//搜索功能
-			changeSeach(){
-				this.name=this.keywords
+			changeSeach() {
+				this.name = this.keywords
 				that.pageIndex = 1
 				that.nomore = false
 				that.listall = []
 				this.init()
 			},
-			
+
 			//承兑人状态查询
 			makeSureSelect() {
 				that.pageIndex = 1
@@ -225,7 +228,7 @@
 			restoreALL() {
 				this.contract_status = 0
 				this.Status = 0
-				
+
 			},
 			choose(title, k) {
 				if (title == "承兑人状态") {
@@ -287,9 +290,15 @@
 				})
 			},
 			addAcceptor() {
-				uni.navigateTo({
-					url: '/pages/alldeatil/addnewacpt'
-				})
+				console.log(111);
+				uni.showToast({
+					icon: 'none',
+					title: '请到PC端做新增承兑人操作',
+					duration: 2000
+				});
+				// uni.navigateTo({
+				// 	url: '/pages/alldeatil/addnewacpt'
+				// })
 			},
 			deleteAcceptor() {
 				let ids = []
@@ -384,7 +393,29 @@
 						}
 					}
 				})
-			}
+			},
+			addpdf(msg) {
+				uni.showModal({
+					title: '提示',
+					content: "是否获取服务合同信息？",
+					success: function(res) {
+						msg.forEach(item=>{
+							if(res.confirm){
+								uni.setClipboardData({
+									data: item,
+									success: function() {
+										that.$toast("复制成功，请到浏览器下载")
+									}
+								});
+							}else if(res.cancel){
+								console.log('取消');
+							}
+							
+							
+						})
+					}
+				})
+			},
 		}
 
 	}
@@ -432,7 +463,7 @@
 		.acpcard {
 			flex: 1;
 			// width: 690rpx;
-			height: 333rpx;
+			height: 420rpx;
 			margin: 0 30rpx;
 			// margin-top: 20rpx;
 			background-color: #fff;
@@ -498,6 +529,7 @@
 				}
 
 				.acpinfo {
+					// height: 100%;
 					border-top: 1rpx solid #E8E8E8;
 					display: flex;
 					flex: 1;

pages/alldeatil/acceptorbind.vue

@@ -19,7 +19,7 @@
 					<radio :value="index" :checked="item.checked" color="#D8AB5A" @click="checkBox(item.id)" />
 				</view>
 			
-				<view class="acpcard" v-if="state==1" >
+				<view class="acpcard" v-if="state==1" style="height: 330rpx;" >
 					<view class="allmsg">
 						<view class="acpcont">
 							<view class="acpname">
@@ -38,6 +38,7 @@
 								<!-- <text class="pt">账号：{{item.bankAccount}}</text> -->
 								<text class="pt">服务费率：{{item.serviceRate}}%</text>
 								<text class="pt">利率：{{item.interest}}%</text>
+								<text class="pt" @click.stop="addpdf(item.templateServiceContractList)">点击获取服务合同信息</text>
 							</view>
 							<view class="acpinfo " v-if="item.statusText=='待审核'">
 								<!-- <text class="pt">账号：{{item.bankAccount}}</text> -->
@@ -60,6 +61,7 @@
 								<text class="pt">供应商名称：{{item.supplierName}}</text>
 								<text class="pt">服务费率：{{item.serviceRate}}%</text>
 								<text class="pt">利率：{{item.interest}}%</text>
+								<text class="pt" @click.stop="addpdf(item.templateServiceContractList)">点击获取服务合同信息</text>
 							</view>
 						
 						</view>
@@ -488,6 +490,28 @@
 					}
 				});
 			},
+			addpdf(msg) {
+				uni.showModal({
+					title: '提示',
+					content: "是否获取服务合同信息？",
+					success: function(res) {
+						msg.forEach(item=>{
+							if(res.confirm){
+								uni.setClipboardData({
+									data: item,
+									success: function() {
+										that.$toast("复制成功，请到浏览器下载")
+									}
+								});
+							}else if(res.cancel){
+								console.log('取消');
+							}
+							
+							
+						})
+					}
+				})
+			},
 			
 		}
 
@@ -536,7 +560,7 @@
 		.acpcard {
 			flex: 1;
 			// width: 690rpx;
-			height: 333rpx;
+			height: 400rpx;
 			margin: 0 30rpx;
 			// margin-top: 20rpx;
 			background-color: #fff;

pages/alldeatil/acptdetail.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">账号</text>
-				<input type="text" v-model="form.bankAccount" class="checkword" placeholder="请输入账号"
+				<input type="text" v-model="form.bankAccount" class="checkword" placeholder="请输入账号(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
 			<view class="inacount">
@@ -23,14 +23,18 @@
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">开户行名称</text>
-				<input type="text" v-model="form.bankName"  class="checkword" placeholder="请输入开户行名称"
+				<input type="text" v-model="form.bankName"  class="checkword" placeholder="请输入开户行名称(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">开户行行号</text>
-				<input type="text" v-model="form.bankNo"  class="checkword" placeholder="请输入开户行行号"
+				<input type="text" v-model="form.bankNo"  class="checkword" placeholder="请输入开户行行号(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
+			<view class="inacount">
+				<text class="acoutitle">合同服务信息</text>
+				<text style="margin-left: 20rpx;" class="pt" @click="addpdf(form.templateServiceContract)">获取服务合同信息</text>
+			</view>
 		</view>
 		<view class="logininbtn" @click="MakeSure">
 			<text>确认修改</text>
@@ -49,7 +53,8 @@
 					bankAccount:'',
 					serviceRate:'',
 					interest:'',
-					bankName:''
+					bankName:'',
+					templateServiceContract:''
 				},
 				
 			}
@@ -80,16 +85,17 @@
 			MakeSure() {
 				let form=this.form
 				form.id=this.id
-				if (form.name.length == 0) {
-					that.$toast("请输入出票人的姓名")
+				if(that.form.name.length==0){
+					that.$toast("请输入承兑人名称")
 					return
 				}
-				if (form.bankAccount.length == 0) {
-					that.$toast("请输入出票人的账户")
+				
+				if(that.form.serviceRate.length==0){
+					that.$toast("请输入服务费率")
 					return
 				}
-				if (form.bankName.length == 0) {
-					that.$toast("请输入开户行名称")
+				if(that.form.interest.length==0){
+					that.$toast("请输入利率")
 					return
 				}
 				uni.showModal({
@@ -104,7 +110,14 @@
 								}
 							}).then((res) => {
 								uni.hideLoading()
-								that.$toast("修改成功")
+								// that.$toast("修改成功,请到PC端上传最新的服务合同信息")
+								uni.showToast({
+									icon:'none',
+									title: '修改成功!请到PC端上传最新的服务合同信息',
+									duration: 2000
+								});
+								
+								
 								// that.form = res
 							}).catch((err) => {
 								uni.hideLoading()
@@ -115,7 +128,29 @@
 					}
 				});
 			
-			}
+			},
+			addpdf(msg) {
+				uni.showModal({
+					title: '提示',
+					content: "是否获取服务合同信息？",
+					success: function(res) {
+						msg.forEach(item=>{
+							if(res.confirm){
+								uni.setClipboardData({
+									data: item,
+									success: function() {
+										that.$toast("复制成功，请到浏览器下载")
+									}
+								});
+							}else if(res.cancel){
+								console.log('取消');
+							}
+							
+							
+						})
+					}
+				})
+			},
 			
 		}
 	}

pages/alldeatil/addbill.vue

@@ -430,7 +430,7 @@
 			// },
 			//模糊查询
 			searchAcceptor(e) {
-				uni.$u.http.get(`/api/SupplierAcceptor?pageSize=-1&supplierId=${this.form.supplierId}`, {
+				uni.$u.http.get(`/api/SupplierAcceptor?pageSize=-1&supplierId=${this.form.supplierId}&acceptorStatus=0`, {
 					pageIndex: 1,
 					name: this.seacept
 				}, {

pages/alldeatil/addnewacpt.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">账号</text>
-				<input type="text" v-model="form.bankAccount" class="checkword" placeholder="请输入承兑账号"
+				<input type="text" v-model="form.bankAccount" class="checkword" placeholder="请输入账号(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
 			<view class="inacount">
@@ -23,12 +23,12 @@
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">开户行名称</text>
-				<input type="text" v-model="form.bankName"  class="checkword" placeholder="请输入承兑人开户行名称"
+				<input type="text" v-model="form.bankName"  class="checkword" placeholder="请输入开户行名称(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
 			<view class="inacount">
 				<text class="acoutitle">开户行行号</text>
-				<input type="text" v-model="form.bankNo"  class="checkword" placeholder="请输入承兑人开户行行号"
+				<input type="text" v-model="form.bankNo"  class="checkword" placeholder="请输入开户行行号(选填)"
 					placeholder-style="font-size:30rpx;color:#68625B" />
 			</view>
 		</view>
@@ -64,10 +64,7 @@
 					that.$toast("请输入承兑人名称")
 					return
 				}
-				if(that.form.bankAccount.length==0){
-					that.$toast("请输入账号")
-					return
-				}
+
 				if(that.form.serviceRate.length==0){
 					that.$toast("请输入服务费率")
 					return
@@ -76,14 +73,7 @@
 					that.$toast("请输入利率")
 					return
 				}
-				if(that.form.bankName.length==0){
-					that.$toast("请输入开户行名称")
-					return
-				}
-				if(that.form.bankName.length==0){
-					that.$toast("请输入开户行行号")
-					return
-				}
+			
 				uni.showLoading()
 				uni.$u.http.post('/api/Acceptor',that.form,{
 					custom: {
@@ -217,7 +207,7 @@
 			color: #1F242A;
 
 			input {
-				width: 360rpx;
+				width:480rpx;
 			}
 		}
 

pages/alldeatil/billdetail.vue

@@ -47,7 +47,7 @@
 					<text class="pl">服务费率</text>
 					<text class="pr">{{msg.serviceRate?msg.serviceRate:''}}%</text>
 				</view>
-				<view class="titleall" >
+				<view class="titleall">
 					<text class="pl">服务费</text>
 					<text class="pr">{{msg.serviceMoney}}</text>
 				</view>
@@ -62,7 +62,7 @@
 				<view class="titleall bod">
 					<text class="pl">发票附件</text>
 					<view class="uppic">
-						<view class="picbox"  v-for="item in msg.picList">
+						<view class="picbox" v-for="item in msg.picList">
 							<image :src="item" mode="aspectFill" @click="prviewPic(item)"></image>
 						</view>
 					</view>
@@ -71,9 +71,11 @@
 					<text class="pl">汇票状态</text>
 					<text class="pr cls">{{msg.statusText}}</text>
 				</view>
-				<view class="titleall "    style="display: flex;flex-direction: column;">
+				<view class="titleall " style="display: flex;flex-direction: column;">
 					<text class="pl">审核反馈</text>
-					<textarea :placeholder="placehodertitle" style="background-color: #F6F6F6;width: 675rpx;height: 200rpx;border-radius: 20rpx;padding: 20rpx;box-sizing: border-box;margin:20rpx 0;margin-bottom: 30rpx;" v-model="feedback" :disabled="disabled"></textarea>
+					<textarea :placeholder="placehodertitle"
+						style="background-color: #F6F6F6;width: 675rpx;height: 200rpx;border-radius: 20rpx;padding: 20rpx;box-sizing: border-box;margin:20rpx 0;margin-bottom: 30rpx;"
+						v-model="feedback" :disabled="disabled"></textarea>
 				</view>
 				<!-- <view class="titleall " v-else>
 					<text class="pl">审核反馈</text>
@@ -83,15 +85,15 @@
 							v-model="feedback" disabled></textarea>
 					</view>
 				</view> -->
-				
+
 				<view class="titleall " style="justify-content: flex-start;">
 					<text class="pl psa ">反馈截图</text>
 					<view class="fanuppic">
-						<view class="picbox"  v-if="state==0">
+						<view class="picbox" v-if="state==0">
 							<u-upload :fileList="fileList4" @afterRead="afterRead" @delete="deletePic" name="4" multiple
 								:maxCount="6" :disabled="disabled" :deletable="delablepic"></u-upload>
 						</view>
-						<view class="picbox"  v-if="state==1">
+						<view class="picbox" v-if="state==1">
 							<u-upload :fileList="fileList4" @afterRead="afterRead" @delete="deletePic" name="4" multiple
 								:maxCount="fileList4.length" :disabled="disabled" :deletable="delablepic"></u-upload>
 						</view>
@@ -100,24 +102,24 @@
 			</view>
 		</view>
 		<view style="width: 100%;height: 140rpx;"></view>
-		<view class="newbill flex1"  v-if="state==0&&statusText!='待审核'">
-		<view class="choosebtn">
-			<view class="delbtn flex1" @click="examineFail()">审核失败</view>
-			<view class="succbtn flex1" @click="examineSuccess()">审核成功</view>
-		</view>
-		
+		<view class="newbill flex1" v-if="state==0&&statusText!='待审核'">
+			<view class="choosebtn" v-if="msg.statusText === '成功'? isShow ==1 : isShow == 0  ">
+				<view class="delbtn flex1" @click="examineFail()">审核失败</view>
+				<view class="succbtn flex1" @click="examineSuccess()">审核成功</view>
+			</view>
+
 		</view>
 		<!-- <view class="newbill flex1" @click="tryAgain" v-if="msg.statusText=='未通过'&&state==1">
 			<view class="newbillbtn">
 				<text>重新提交</text>
 			</view>
 		</view> -->
-		<view class="newbill flex1" v-if="msg.statusText=='未通过'&&state==1">
+		<view class="newbill flex1" v-if="msg.statusText=='失败'&&state==1">
 			<view class="choosebtn">
 				<view class="delbtn flex1" @click="tryAgain()">重新提交</view>
 				<view class="succbtn flex1" @click="addBill()">新增汇票</view>
 			</view>
-		
+
 		</view>
 	</view>
 </template>
@@ -130,97 +132,98 @@
 	export default {
 		data() {
 			return {
-				id:'',
-				msg:'',
-				index:'',
-				state:0,
-				fileList4:[],
-				feedback:'',
-				disabled:false,
-				delablepic:true,
-				placehodertitle:'请输入审核反馈',
-				contractId:'',
-				statusText:''
+				//审核成功后隐藏按钮
+				isShow:0,
+				id: '',
+				msg: '',
+				index: '',
+				state: 0,
+				fileList4: [],
+				feedback: '',
+				disabled: false,
+				delablepic: true,
+				placehodertitle: '请输入审核反馈',
+				contractId: '',
+				statusText: ''
 			}
 		},
 		onLoad(o) {
-			that=this
+			that = this
 			this.state = this.$store.state.admin
-			if(this.state==1){
-				this.disabled=true
-				this.delablepic=false
+			if (this.state == 1) {
+				this.disabled = true
+				this.delablepic = false
 			}
-			
-			if(o.obj){
-				let obj=JSON.parse(o.obj)
-				this.id=obj.id
-				console.log(obj,6464654)
-				this.index=obj.index
-				this.contractId=obj.contractId
-				this.statusText=obj.statusText
-				console.log(this.statusText,9999)
+
+			if (o.obj) {
+				let obj = JSON.parse(o.obj)
+				this.id = obj.id
+				console.log(obj, 6464654)
+				this.index = obj.index
+				this.contractId = obj.contractId
+				this.statusText = obj.statusText
+				console.log(this.statusText, 9999)
 			}
 			this.init()
 		},
 		methods: {
-			init(){
-				let id=this.id
+			init() {
+				let id = this.id
 				uni.showLoading()
-				uni.$u.http.get(`/api/Contract/contractDraft/${id}`,
-					{
-						custom: {
-							auth: true
-						}
-					}).then((res) => {
+				uni.$u.http.get(`/api/Contract/contractDraft/${id}`, {
+					custom: {
+						auth: true
+					}
+				}).then((res) => {
 					uni.hideLoading()
-					this.msg=res
-					if(res.feedbackPicList){
+					this.msg = res
+					if (res.feedbackPicList) {
 						const newData4 = res.feedbackPicList.map((item) => {
 							return {
 								url: item,
 							}
 						})
-						
+
 						this.fileList4 = newData4
 					}
-					if(this.state==1){
-						if(res.feedback.length>0){
-							this.feedback=res.feedback
-						}else{
-							this.feedback="无"
+					if (this.state == 1) {
+						if (res.feedback.length > 0) {
+							this.feedback = res.feedback
+						} else {
+							this.feedback = "无"
 						}
-					}else{
-						if(res.feedback.length>0){
-							this.feedback=res.feedback
-						}else{
-							this.placehodertitle="请输入审核反馈"
+					} else {
+						if (res.feedback.length > 0) {
+							this.feedback = res.feedback
+						} else {
+							this.placehodertitle = "请输入审核反馈"
 						}
 					}
-					
-					
-					
+
+
+
 				}).catch((err) => {
 					uni.hideLoading()
 					this.$toast(err.msg)
 				})
 			},
 			prviewPic(item) {
-				let pics=[]
+				let pics = []
 				pics.push(item)
 				uni.previewImage({
 					urls: pics,
 				});
 			},
-			tryAgain(){
-				let obj={
-					contractId:this.contractId,
-					id:this.id,
-					contractDrafts:[this.msg]
-					
+			tryAgain() {
+				let obj = {
+					contractId: this.contractId,
+					id: this.id,
+					contractDrafts: [this.msg]
+
 				}
 
 				uni.navigateTo({
-					url:"/pages/alldeatil/addbill?obj="+JSON.stringify(obj)
+					url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj)
 				})
 			},
 			addBill() {
@@ -231,35 +234,35 @@
 			examineSuccess() {
 				// let ids = []
 				// ids.push(this.id)
-			
-				
+				console.log(111);
+
 				uni.showModal({
 					title: '提示',
 					content: "是否审核成功？",
 					success: function(res) {
 						if (res.confirm) {
-							
-							let form={
-								id:Number(that.id),
+
+							let form = {
+								id: Number(that.id),
 								approveStatus: 1
 							}
-							if(that.fileList4.length>0){
-								let feedbackPicList=[]
-								that.fileList4.forEach(item=>{
+							if (that.fileList4.length > 0) {
+								let feedbackPicList = []
+								that.fileList4.forEach(item => {
 									feedbackPicList.push(item.url)
 								})
-								form.feedbackPicList=feedbackPicList
+								form.feedbackPicList = feedbackPicList
 							}
-							let feedback=that.feedback
-							if(feedback.length>0){
-								form.feedback=feedback
+							let feedback = that.feedback
+							if (feedback.length > 0) {
+								form.feedback = feedback
 							}
 							// ={
 							// 	feedback:feedback,
 							// 	feedbackPicList:feedbackPicList
 							// }
 							uni.showLoading()
-							uni.$u.http.post('api/Contract/approveContractDraft',form, {
+							uni.$u.http.post('api/Contract/approveContractDraft', form, {
 								custom: {
 									auth: true
 								}
@@ -268,21 +271,22 @@
 								that.editall = false
 								that.quan = false
 								that.$toast("操作成功")
+								that.isShow = 1
 								setTimeout(() => {
 									that.init()
 								}, 500)
-			
+
 							}).catch((err) => {
 								uni.hideLoading()
 								that.$toast(err.msg)
 							})
-			
+
 						} else if (res.cancel) {
-			
+
 						}
 					}
 				})
-			
+
 			},
 			examineFail() {
 				uni.showModal({
@@ -290,25 +294,25 @@
 					content: "是否审核失败？",
 					success: function(res) {
 						if (res.confirm) {
-							
-							let form={
-								id:Number(that.id),
+
+							let form = {
+								id: Number(that.id),
 								approveStatus: 2
 							}
-							if(that.fileList4.length>0){
-								let feedbackPicList=[]
-								that.fileList4.forEach(item=>{
+							if (that.fileList4.length > 0) {
+								let feedbackPicList = []
+								that.fileList4.forEach(item => {
 									feedbackPicList.push(item.url)
 								})
-								form.feedbackPicList=feedbackPicList
+								form.feedbackPicList = feedbackPicList
 							}
-							let feedback=that.feedback
-							if(feedback.length>0){
-								form.feedback=feedback
+							let feedback = that.feedback
+							if (feedback.length > 0) {
+								form.feedback = feedback
 							}
-							
+
 							uni.showLoading()
-							uni.$u.http.post('api/Contract/approveContractDraft',form, {
+							uni.$u.http.post('api/Contract/approveContractDraft', form, {
 								custom: {
 									auth: true
 								}
@@ -320,19 +324,19 @@
 								setTimeout(() => {
 									that.init()
 								}, 500)
-				
+
 							}).catch((err) => {
 								uni.hideLoading()
 								that.$toast(err.msg)
 							})
-				
+
 						} else if (res.cancel) {
-				
+
 						}
 					}
 				})
-				
-			
+
+
 			},
 			// 删除图片
 			deletePic(event) {
@@ -364,7 +368,7 @@
 			uploadFilePromise(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url:mainUrl + '/api/File', // 仅为示例，非真实的接口地址
+						url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
 						filePath: url,
 						name: 'File',
 						header: {
@@ -396,7 +400,7 @@
 		padding: 50rpx 20rpx;
 		border-radius: 20rpx;
 		background: #fff;
-	
+
 		.titlename {
 			font-size: 36rpx;
 			font-weight: 600;
@@ -425,12 +429,15 @@
 			.ds {
 				padding-top: 30rpx;
 			}
-			.psa{
+
+			.psa {
 				padding-right: 30rpx;
 			}
-			.cls{
+
+			.cls {
 				color: #68625B;
 			}
+
 			.titleall {
 				display: flex;
 				justify-content: space-between;
@@ -449,26 +456,29 @@
 					display: block;
 					display: -webkit-box;
 				}
-				
+
 				.uppic {
 					display: flex;
 					flex-wrap: wrap;
 					justify-content: flex-end;
 
-					
+
 				}
+
 				.picbox {
 					width: 150rpx;
 					height: 150rpx;
 					margin-left: 20rpx;
 					border-radius: 20rpx;
 					overflow: hidden;
+
 					image {
 						width: 100%;
 						height: 100%;
 					}
 				}
-				.fanuppic{
+
+				.fanuppic {
 					display: flex;
 					flex-wrap: wrap;
 				}

pages/alldeatil/contractdetail.vue

@@ -121,7 +121,7 @@
 
 		</view>
 		<view class="newbill flex1" v-if="state==0">
-			<view class="choosebtn">
+			<view class="choosebtn" v-if="msg.statusText === '成功'? isShow ==1 : isShow == 0  ">
 				<view class="delbtn flex1" @click="examineFail()">审核失败</view>
 				<view class="succbtn flex1" @click="examineSuccess()">审核成功</view>
 			</view>
@@ -188,6 +188,8 @@
 	export default {
 		data() {
 			return {
+				//审核成功后隐藏按钮
+				isShow:0,
 				editall: false,
 				quan: false,
 				state: 0,
@@ -359,11 +361,11 @@
 			examineSuccess() {
 				// let ids = []
 				// ids.push(this.id)
-
+				console.log(111);
 
 				uni.showModal({
 					title: '提示',
-					content: "是否审核成功？",
+					content: "是否审核成功？审核成功",
 					success: function(res) {
 						if (res.confirm) {
 
@@ -396,9 +398,12 @@
 								that.editall = false
 								that.quan = false
 								that.$toast("操作成功")
+								that.isShow = 1
 								setTimeout(() => {
 									that.init()
 								}, 500)
+								
+								
 
 							}).catch((err) => {
 								uni.hideLoading()

pages/alldeatil/upcontract.vue

@@ -417,7 +417,7 @@
 			
 			//模糊查询
 			searchAcceptor(e) {
-				uni.$u.http.get(`/api/SupplierAcceptor?pageSize=-1&supplierId=${this.form.supplierId}`, {
+				uni.$u.http.get(`/api/SupplierAcceptor?pageSize=-1&supplierId=${this.form.supplierId}&acceptorStatus=0`, {
 					pageIndex: 1,
 					name: this.seacept
 				}, {
@@ -507,35 +507,41 @@
 				this.getSerMoney(this.myindex)
 				this.getInterMoney(this.myindex)
 			},
+			//最高贷款额度
 			getloanLimt(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / ((this.form
-							.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
-						.contractDrafts[i].limitTime / 360 / 100 + 1)).toFixed(2)
+					// this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / ((this.form
+					// 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
+					// 	.contractDrafts[i].limitTime / 360 / 100 + 1)).toFixed(2)
+					this.form.contractDrafts[i].loanLimit = Math.floor(this.form.contractDrafts[i].money / (this.form.contractDrafts[i].interestRate * (this.form
+						.contractDrafts[i].limitTime + 15) / 365 / 100 + 1))
 				}
 
 			},
+			//服务费
 			getSerMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money / ((this.form
-							.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
-						.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
-						.serviceRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
-					// this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].serviceRate * this.form.contractDrafts[i].limitTime / 360).toFixed(2)
+					// this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money / ((this.form
+					// 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
+					// 	.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
+					// 	.serviceRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
+			this.form.contractDrafts[i].serviceMoney =(this.form.contractDrafts[i].money * 
+			this.form.contractDrafts[i].serviceRate * (this.form.contractDrafts[i].limitTime/ 365 / 100)).toFixed(2)
 				}
 
 			},
+			//利息
 			getInterMoney(i) {
 				if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form
 					.contractDrafts[i].interestRate) {
-					this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money / ((this.form
-							.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
-						.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
-						.interestRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
-					// this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].interestRate * this.form
-					// 	.contractDrafts[i].limitTime / 360).toFixed(2)
+					// this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money / ((this.form
+					// 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
+					// 	.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
+					// 	.interestRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
+					this.form.contractDrafts[i].interest = (Math.floor(this.form.contractDrafts[i].money / (this.form.contractDrafts[i].interestRate * (this.form
+						.contractDrafts[i].limitTime + 15) / 365 / 100 + 1)) * this.form.contractDrafts[i].interestRate * (this.form.contractDrafts[i].limitTime/ 365 / 100)).toFixed(2)
 				}
 
 			},

pages/supplier/supplier.vue

@@ -145,6 +145,7 @@
 				keywords: '',
 				name:'',//供应商名称
 				Status: '', //供应商状态
+				isDeleted:0,//供应商正常和删除
 				show: false,
 				dateshow: false,
 				creatTime: "请选择",
@@ -212,7 +213,7 @@
 		methods: {
 			init() {
 				uni.showLoading()
-				uni.$u.http.get(`/api/Supplier/search?pageSize=-1&Name=${this.name}&Status=${this.Status}`, {
+				uni.$u.http.get(`/api/Supplier/search?pageSize=-1&Name=${this.name}&Status=${this.Status}&isDeleted=${this.isDeleted}`, {
 					custom: {
 						auth: true
 					}
@@ -267,15 +268,25 @@
 				if (title == "供应商状态") {
 					this.contract_status = k
 					if (k == 2) {
+						//已禁用
 						this.Status = 4
+						this.isDeleted=1
 					} else if (k == 1) {
+						//待审核
 						this.Status = 1
+						this.isDeleted=0
 					} else if (k == 0) {
+						//全部
 						this.Status = 0
+						this.isDeleted=0
+						//
 					} else if (k == 3) {
+						//认证完成
 						this.Status = 2
+						this.isDeleted =0
 					} else if (k == 4) {
 						this.Status = 3
+						this.isDeleted =0
 					}
 
 				}

unpackage/dist/dev/mp-weixin/pages/acceptor/acceptor.js

@@ -264,6 +264,9 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
 
 var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure | componet/tabbar/tabbar */ "componet/tabbar/tabbar").then((function () {return resolve(__webpack_require__(/*! @/componet/tabbar/tabbar.vue */ 414));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
@@ -276,7 +279,7 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
       isPull: false,
       keywords: '',
       name: '', //承兑人名称
-      Status: '', //承兑人筛选
+      Status: 5, //承兑人筛选
       editall: false,
       quan: false,
       show: false,
@@ -456,9 +459,15 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
 
     },
     addAcceptor: function addAcceptor() {
-      uni.navigateTo({
-        url: '/pages/alldeatil/addnewacpt' });
-
+      console.log(111);
+      uni.showToast({
+        icon: 'none',
+        title: '请到PC端做新增承兑人操作',
+        duration: 2000 });
+
+      // uni.navigateTo({
+      // 	url: '/pages/alldeatil/addnewacpt'
+      // })
     },
     deleteAcceptor: function deleteAcceptor() {
       var ids = [];
@@ -553,6 +562,28 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
           }
         } });
 
+    },
+    addpdf: function addpdf(msg) {
+      uni.showModal({
+        title: '提示',
+        content: "是否获取服务合同信息？",
+        success: function success(res) {
+          msg.forEach(function (item) {
+            if (res.confirm) {
+              uni.setClipboardData({
+                data: item,
+                success: function success() {
+                  that.$toast("复制成功，请到浏览器下载");
+                } });
+
+            } else if (res.cancel) {
+              console.log('取消');
+            }
+
+
+          });
+        } });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/acceptor/acceptor.wxss

@@ -60,7 +60,7 @@ page {
 }
 .acpcardlist .acpcard {
   flex: 1;
-  height: 333rpx;
+  height: 420rpx;
   margin: 0 30rpx;
   background-color: #fff;
   border-radius: 20rpx;

unpackage/dist/dev/mp-weixin/pages/alldeatil/acceptorbind.js

@@ -298,6 +298,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 
 var that;var _default =
 {
@@ -656,6 +658,28 @@ var that;var _default =
           }
         } });
 
+    },
+    addpdf: function addpdf(msg) {
+      uni.showModal({
+        title: '提示',
+        content: "是否获取服务合同信息？",
+        success: function success(res) {
+          msg.forEach(function (item) {
+            if (res.confirm) {
+              uni.setClipboardData({
+                data: item,
+                success: function success() {
+                  that.$toast("复制成功，请到浏览器下载");
+                } });
+
+            } else if (res.cancel) {
+              console.log('取消');
+            }
+
+
+          });
+        } });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/alldeatil/acceptorbind.wxss

@@ -60,7 +60,7 @@ page {
 }
 .acpcardlist .acpcard {
   flex: 1;
-  height: 333rpx;
+  height: 400rpx;
   margin: 0 30rpx;
   background-color: #fff;
   border-radius: 20rpx;

unpackage/dist/dev/mp-weixin/pages/alldeatil/acptdetail.js

@@ -172,6 +172,10 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
 
 var that;var _default =
 {
@@ -183,7 +187,8 @@ var that;var _default =
         bankAccount: '',
         serviceRate: '',
         interest: '',
-        bankName: '' } };
+        bankName: '',
+        templateServiceContract: '' } };
 
 
 
@@ -214,16 +219,17 @@ var that;var _default =
     MakeSure: function MakeSure() {
       var form = this.form;
       form.id = this.id;
-      if (form.name.length == 0) {
-        that.$toast("请输入出票人的姓名");
+      if (that.form.name.length == 0) {
+        that.$toast("请输入承兑人名称");
         return;
       }
-      if (form.bankAccount.length == 0) {
-        that.$toast("请输入出票人的账户");
+
+      if (that.form.serviceRate.length == 0) {
+        that.$toast("请输入服务费率");
         return;
       }
-      if (form.bankName.length == 0) {
-        that.$toast("请输入开户行名称");
+      if (that.form.interest.length == 0) {
+        that.$toast("请输入利率");
         return;
       }
       uni.showModal({
@@ -238,7 +244,14 @@ var that;var _default =
 
             then(function (res) {
               uni.hideLoading();
-              that.$toast("修改成功");
+              // that.$toast("修改成功,请到PC端上传最新的服务合同信息")
+              uni.showToast({
+                icon: 'none',
+                title: '修改成功!请到PC端上传最新的服务合同信息',
+                duration: 2000 });
+
+
+
               // that.form = res
             }).catch(function (err) {
               uni.hideLoading();
@@ -249,6 +262,28 @@ var that;var _default =
         } });
 
 
+    },
+    addpdf: function addpdf(msg) {
+      uni.showModal({
+        title: '提示',
+        content: "是否获取服务合同信息？",
+        success: function success(res) {
+          msg.forEach(function (item) {
+            if (res.confirm) {
+              uni.setClipboardData({
+                data: item,
+                success: function success() {
+                  that.$toast("复制成功，请到浏览器下载");
+                } });
+
+            } else if (res.cancel) {
+              console.log('取消');
+            }
+
+
+          });
+        } });
+
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/alldeatil/addbill.js

@@ -593,7 +593,7 @@ var that;var calllips = function calllips() {__webpack_require__.e(/*! require.e
     // },
     //模糊查询
     searchAcceptor: function searchAcceptor(e) {var _this3 = this;
-      uni.$u.http.get("/api/SupplierAcceptor?pageSize=-1&supplierId=".concat(this.form.supplierId), {
+      uni.$u.http.get("/api/SupplierAcceptor?pageSize=-1&supplierId=".concat(this.form.supplierId, "&acceptorStatus=0"), {
         pageIndex: 1,
         name: this.seacept },
       {},

unpackage/dist/dev/mp-weixin/pages/alldeatil/addnewacpt.js

@@ -198,10 +198,7 @@ var that;var _default =
         that.$toast("请输入承兑人名称");
         return;
       }
-      if (that.form.bankAccount.length == 0) {
-        that.$toast("请输入账号");
-        return;
-      }
+
       if (that.form.serviceRate.length == 0) {
         that.$toast("请输入服务费率");
         return;
@@ -210,14 +207,7 @@ var that;var _default =
         that.$toast("请输入利率");
         return;
       }
-      if (that.form.bankName.length == 0) {
-        that.$toast("请输入开户行名称");
-        return;
-      }
-      if (that.form.bankName.length == 0) {
-        that.$toast("请输入开户行行号");
-        return;
-      }
+
       uni.showLoading();
       uni.$u.http.post('/api/Acceptor', that.form, {
         custom: {

unpackage/dist/dev/mp-weixin/pages/alldeatil/addnewacpt.wxss

@@ -110,7 +110,7 @@
   color: #1F242A;
 }
 .acountbox .inacount input.data-v-d5789316 {
-  width: 360rpx;
+  width: 480rpx;
 }
 .acountbox .acoutitle.data-v-d5789316 {
   font-weight: 600;

unpackage/dist/dev/mp-weixin/pages/alldeatil/billdetail.js

@@ -278,6 +278,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 
 
 
@@ -405,11 +407,12 @@ var _baseUrl = __webpack_require__(/*! @/http/baseUrl.js */ 16);function _intero
 //
 //
 //
-var that;var _default = { data: function data() {return { id: '', msg: '', index: '', state: 0, fileList4: [], feedback: '', disabled: false, delablepic: true, placehodertitle: '请输入审核反馈', contractId: '', statusText: '' };}, onLoad: function onLoad(o) {that = this;this.state = this.$store.state.admin;if (this.state == 1) {this.disabled = true;this.delablepic = false;}if (o.obj) {var obj = JSON.parse(o.obj);this.id = obj.id;console.log(obj, 6464654);this.index = obj.index;this.contractId = obj.contractId;this.statusText = obj.statusText;console.log(this.statusText, 9999);}this.init();}, methods: { init: function init() {var _this = this;var id = this.id;uni.showLoading();uni.$u.http.get("/api/Contract/contractDraft/".concat(id), { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.msg = res;if (res.feedbackPicList) {var newData4 = res.feedbackPicList.map(function (item) {return { url: item };});_this.fileList4 = newData4;}if (_this.state == 1) {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.feedback = "无";}} else {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.placehodertitle = "请输入审核反馈";}}}).catch(function (err) {uni.hideLoading();_this.$toast(err.msg);});}, prviewPic: function prviewPic(item) {var pics = [];pics.push(item);uni.previewImage({ urls: pics });}, tryAgain: function tryAgain() {var obj = { contractId: this.contractId, id: this.id, contractDrafts: [this.msg] };uni.navigateTo({ url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj) });}, addBill: function addBill() {uni.navigateTo({ url: "/pages/alldeatil/addbill" });}, examineSuccess: function examineSuccess() {// let ids = []
+//
+//
+var that;var _default = { data: function data() {return { //审核成功后隐藏按钮
+      isShow: 0, id: '', msg: '', index: '', state: 0, fileList4: [], feedback: '', disabled: false, delablepic: true, placehodertitle: '请输入审核反馈', contractId: '', statusText: '' };}, onLoad: function onLoad(o) {that = this;this.state = this.$store.state.admin;if (this.state == 1) {this.disabled = true;this.delablepic = false;}if (o.obj) {var obj = JSON.parse(o.obj);this.id = obj.id;console.log(obj, 6464654);this.index = obj.index;this.contractId = obj.contractId;this.statusText = obj.statusText;console.log(this.statusText, 9999);}this.init();}, methods: { init: function init() {var _this = this;var id = this.id;uni.showLoading();uni.$u.http.get("/api/Contract/contractDraft/".concat(id), { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this.msg = res;if (res.feedbackPicList) {var newData4 = res.feedbackPicList.map(function (item) {return { url: item };});_this.fileList4 = newData4;}if (_this.state == 1) {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.feedback = "无";}} else {if (res.feedback.length > 0) {_this.feedback = res.feedback;} else {_this.placehodertitle = "请输入审核反馈";}}}).catch(function (err) {uni.hideLoading();_this.$toast(err.msg);});}, prviewPic: function prviewPic(item) {var pics = [];pics.push(item);uni.previewImage({ urls: pics });}, tryAgain: function tryAgain() {var obj = { contractId: this.contractId, id: this.id, contractDrafts: [this.msg] };uni.navigateTo({ url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj) });}, addBill: function addBill() {uni.navigateTo({ url: "/pages/alldeatil/addbill" });}, examineSuccess: function examineSuccess() {// let ids = []
       // ids.push(this.id)
-      uni.showModal({ title: '提示', content: "是否审核成功？", success: function success(res) {if (res.confirm) {var form = { id: Number(that.id), approveStatus: 1 };if (that.fileList4.length > 0) {var feedbackPicList = [];that.fileList4.forEach(function (item) {feedbackPicList.push(item.url);});form.feedbackPicList = feedbackPicList;}var feedback = that.feedback;
-            if (feedback.length > 0) {
-              form.feedback = feedback;
+      console.log(111);uni.showModal({ title: '提示', content: "是否审核成功？", success: function success(res) {if (res.confirm) {var form = { id: Number(that.id), approveStatus: 1 };if (that.fileList4.length > 0) {var feedbackPicList = [];that.fileList4.forEach(function (item) {feedbackPicList.push(item.url);});form.feedbackPicList = feedbackPicList;}var feedback = that.feedback;if (feedback.length > 0) {form.feedback = feedback;
             }
             // ={
             // 	feedback:feedback,
@@ -425,6 +428,7 @@ var that;var _default = { data: function data() {return { id: '', msg: '', index
               that.editall = false;
               that.quan = false;
               that.$toast("操作成功");
+              that.isShow = 1;
               setTimeout(function () {
                 that.init();
               }, 500);

unpackage/dist/dev/mp-weixin/pages/alldeatil/upcontract.js

@@ -596,7 +596,7 @@ var that;var wUpload = function wUpload() {Promise.all(/*! require.ensure | comp
     fileSuccess: function fileSuccess(val) {console.log(val);}, initAcceptor: function initAcceptor() {var _this = this;uni.$u.http.get("/api/SupplierAcceptor?pageSize=-1&supplierId=".concat(this.form.supplierId, "&acceptorStatus=0"), { pageIndex: 1, name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading(); // this.range1 = res.result
         _this.range1 = res.result.filter(function (item) {return item.statusText == '成功';});_this.range1.forEach(function (item, index) {_this.range1[index].value = index;_this.range1[index].text = item.acceptorName;});console.log(_this.range1);}).catch(function (err) {});}, initDrawers: function initDrawers() {var _this2 = this; // 出票人列表
       uni.$u.http.get('/api/Drawer/search?PageSize=-1', { pageIndex: 1, pageSize: 9999, name: this.seadra }, { custom: { auth: true } }).then(function (res) {uni.hideLoading();_this2.range2 = res.result.filter(function (item) {return item.statusText == '正常';});_this2.range2.forEach(function (item, index) {_this2.range2[index].value = index;_this2.range2[index].text = item.name;});}).catch(function (err) {});}, //模糊查询
-    searchAcceptor: function searchAcceptor(e) {var _this3 = this;uni.$u.http.get("/api/SupplierAcceptor?pageSize=-1&supplierId=".concat(this.form.supplierId), { pageIndex: 1, name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading(); // this.range1 = res.result
+    searchAcceptor: function searchAcceptor(e) {var _this3 = this;uni.$u.http.get("/api/SupplierAcceptor?pageSize=-1&supplierId=".concat(this.form.supplierId, "&acceptorStatus=0"), { pageIndex: 1, name: this.seacept }, {}, { custom: { auth: true } }).then(function (res) {uni.hideLoading(); // this.range1 = res.result
         _this3.range1 = res.result.filter(function (item) {return item.statusText == '成功' && item.acceptorName.includes(e);});_this3.range1.forEach(function (item, index) {_this3.range1[index].value = index;_this3.range1[index].text = item.acceptorName;
         });
         console.log(_this3.range1);
@@ -670,35 +670,41 @@ var that;var wUpload = function wUpload() {Promise.all(/*! require.ensure | comp
       this.getSerMoney(this.myindex);
       this.getInterMoney(this.myindex);
     },
+    //最高贷款额度
     getloanLimt: function getloanLimt(i) {
       if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form.
       contractDrafts[i].interestRate) {
-        this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / ((this.form.
-        contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.
-        contractDrafts[i].limitTime / 360 / 100 + 1)).toFixed(2);
+        // this.form.contractDrafts[i].loanLimit = (this.form.contractDrafts[i].money / ((this.form
+        // 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form
+        // 	.contractDrafts[i].limitTime / 360 / 100 + 1)).toFixed(2)
+        this.form.contractDrafts[i].loanLimit = Math.floor(this.form.contractDrafts[i].money / (this.form.contractDrafts[i].interestRate * (this.form.
+        contractDrafts[i].limitTime + 15) / 365 / 100 + 1));
       }
 
     },
+    //服务费
     getSerMoney: function getSerMoney(i) {
       if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form.
       contractDrafts[i].interestRate) {
-        this.form.contractDrafts[i].serviceMoney = (this.form.contractDrafts[i].money / ((this.form.
-        contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.
-        form.contractDrafts[i].limitTime / 360 / 100 + 1) * (this.form.contractDrafts[i].
-        serviceRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2);
-        // this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].serviceRate * this.form.contractDrafts[i].limitTime / 360).toFixed(2)
+        // this.form.contractDrafts[i].serviceMoney = ((this.form.contractDrafts[i].money / ((this.form
+        // 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
+        // 	.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
+        // 	.serviceRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
+        this.form.contractDrafts[i].serviceMoney = (this.form.contractDrafts[i].money *
+        this.form.contractDrafts[i].serviceRate * (this.form.contractDrafts[i].limitTime / 365 / 100)).toFixed(2);
       }
 
     },
+    //利息
     getInterMoney: function getInterMoney(i) {
       if (this.form.contractDrafts[i].money && this.form.contractDrafts[i].serviceRate && this.form.
       contractDrafts[i].interestRate) {
-        this.form.contractDrafts[i].interest = (this.form.contractDrafts[i].money / ((this.form.
-        contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.
-        form.contractDrafts[i].limitTime / 360 / 100 + 1) * (this.form.contractDrafts[i].
-        interestRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2);
-        // this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money/((this.form.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this.form.contractDrafts[i].limitTime / 360 /100+1)) * this.form.contractDrafts[i].interestRate * this.form
-        // 	.contractDrafts[i].limitTime / 360).toFixed(2)
+        // this.form.contractDrafts[i].interest = ((this.form.contractDrafts[i].money / ((this.form
+        // 		.contractDrafts[i].serviceRate + this.form.contractDrafts[i].interestRate) * this
+        // 	.form.contractDrafts[i].limitTime / 360 / 100 + 1)) * (this.form.contractDrafts[i]
+        // 	.interestRate / 100 * this.form.contractDrafts[i].limitTime / 360)).toFixed(2)
+        this.form.contractDrafts[i].interest = (Math.floor(this.form.contractDrafts[i].money / (this.form.contractDrafts[i].interestRate * (this.form.
+        contractDrafts[i].limitTime + 15) / 365 / 100 + 1)) * this.form.contractDrafts[i].interestRate * (this.form.contractDrafts[i].limitTime / 365 / 100)).toFixed(2);
       }
 
     },

unpackage/dist/dev/mp-weixin/pages/supplier/supplier.js

@@ -316,7 +316,8 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
       quan: false }, _defineProperty(_ref, "keywords",
     ''), _defineProperty(_ref, "name",
     ''), _defineProperty(_ref, "Status",
-    ''), _defineProperty(_ref, "show",
+    ''), _defineProperty(_ref, "isDeleted",
+    0), _defineProperty(_ref, "show",
     false), _defineProperty(_ref, "dateshow",
     false), _defineProperty(_ref, "creatTime",
     "请选择"), _defineProperty(_ref, "endTime",
@@ -384,7 +385,7 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
   methods: (_methods = {
     init: function init() {var _this = this;
       uni.showLoading();
-      uni.$u.http.get("/api/Supplier/search?pageSize=-1&Name=".concat(this.name, "&Status=").concat(this.Status), {
+      uni.$u.http.get("/api/Supplier/search?pageSize=-1&Name=".concat(this.name, "&Status=").concat(this.Status, "&isDeleted=").concat(this.isDeleted), {
         custom: {
           auth: true } }).
 
@@ -439,15 +440,25 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
       if (title == "供应商状态") {
         this.contract_status = k;
         if (k == 2) {
+          //已禁用
           this.Status = 4;
+          this.isDeleted = 1;
         } else if (k == 1) {
+          //待审核
           this.Status = 1;
+          this.isDeleted = 0;
         } else if (k == 0) {
+          //全部
           this.Status = 0;
+          this.isDeleted = 0;
+          //
         } else if (k == 3) {
+          //认证完成
           this.Status = 2;
+          this.isDeleted = 0;
         } else if (k == 4) {
           this.Status = 3;
+          this.isDeleted = 0;
         }
 
       }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -6,8 +6,11 @@
   },
   "setting": {
     "urlCheck": false,
-    "minified": true,
     "es6": false,
+    "postcss": false,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],