chuan

pages/alldeatil/addbill.vue

@@ -77,6 +77,7 @@
 						:showas="false" :plname="'搜索兑换人名称'"  @search="searchAcceptor"></uni-data-select>
 				</view>
 			</view>
+			
 			<view class="listitem">
 				<text class="lys">出票人</text>
 				<view class="chosbox" @click="checkldrwIndex(index)">
@@ -139,7 +140,7 @@
 				<view class="listitem">
 					<text class="lys">服务费率</text>
 					<view class="inbox">
-						<input type="digit" v-model="item.serviceRate" placeholder="显示对于费率"
+						<input type="digit" v-model="item.serviceRate+'%'" placeholder="显示对于费率"
 							placeholder-style="color:#BEBDBB" @blur="getserviceRate"
 							@input="getserviceRateIndex(index)" disabled="true"/>
 					</view>
@@ -157,7 +158,7 @@
 				<view class="listitem">
 					<text class="lys">利率</text>
 					<view class="inbox">
-						<input type="digit" v-model="item.interestRate" placeholder="显示对于利率"
+						<input type="digit" v-model="item.interestRate+'%'" placeholder="显示对于利率"
 							placeholder-style="color:#BEBDBB" @blur="getinterestRate"
 							@input="getinterestRateIndex(index)" disabled="true"/>
 					</view>
@@ -227,15 +228,11 @@
 				seacept:'',
 				seadra:'',
 				form: {
-					name: '',
-					supplierId: '',
-					invoicePics: [],
-					pics: [],
-					tradePics: [],
+					id:'',
 					contractDrafts: [{
 						name: '',
 						draftNo: '',
-						acceptor: '',
+						acceptor:'',
 						acceptorId: '',
 						drawersId: '',
 						drawers: '',
@@ -263,20 +260,54 @@
 				sindex: 0,
 				rindex: 0,
 				acptIndex:0,
-				drwIndex:0
+				drwIndex:0,
+				again:false
 			}
 		},
-		onLoad() {
+		onLoad(o) {
 			that = this
 			
 			this.form.supplierId = uni.getStorageSync('supplierId')
-			// console.log(this.form.supplierId,778)
 			this.loadTime()
-
+			if(o.obj){
+				this.again=true
+				let obj=JSON.parse((o.obj))
+				let form=obj.contractDrafts
+				console.log(obj,9996)
+				this.form.id=obj.id
+				console.log(form,778)
+				let inform=this.form.contractDrafts[0]
+				inform.name=form[0].name
+				inform.id=form[0].id
+				inform.acceptorId=form[0].acceptorId
+				inform.drawersId=form[0].drawersId
+				inform.money=form[0].money
+				inform.draftNo=form[0].draftNo
+				inform.loanLimit=form[0].loanLimit
+				inform.serviceRate=form[0].serviceRate
+				inform.interestRate=form[0].interestRate
+				inform.interest=form[0].interest
+				inform.serviceMoney=form[0].serviceMoney
+				inform.expectDiscountDate=form[0].expectDiscountDate
+				inform.acceptDate=form[0].acceptDate
+				inform.issueDate=form[0].issueDate
+				inform.expireDate=form[0].expireDate
+				form.forEach(item=>{
+					item.picList.forEach(i=>{
+						item.picUrling=[]
+						item.picUrling.push({"url":i})
+					})
+				})
+				inform.picUrling=form[0].picUrling
+			}
+			// this.initAcceptor()
+			// this.initDrawers()
 		},
 		onShow(){
 			this.initAcceptor()
 			this.initDrawers()
+			
+			
 		},
 		methods: {
 			loadTime() {
@@ -298,11 +329,10 @@
 					item.limitTime = Math.floor(nTime / 86400000);
 				})
 			},
-			
-			
-			initAcceptor(){
+					
+		  initAcceptor(){
 				// 承兑人列表
-				uni.$u.http.post('/api/Acceptor/search',{
+			 uni.$u.http.post('/api/Acceptor/search',{
 					name:this.seacept
 				},{
 				
@@ -313,13 +343,22 @@
 				}).then((res) => {
 					uni.hideLoading()
 					this.range1 = res.result
-					// for(let i in this.range1){
-				
-					// }
 					this.range1.forEach((item, index) => {
 						this.range1[index].value = index
 						this.range1[index].text = item.name
 					})
+					if(this.again){
+						
+						that.range1.forEach((item,index)=>{
+							console.log(that.form.contractDrafts[0],item)
+							if(item.id==that.form.contractDrafts[0].acceptorId){
+								console.log(555555555555555555555555)
+								that.form.contractDrafts[0].acceptor=index
+								console.log(that.form.contractDrafts[0].acceptor)
+							}
+						})
+					}
+					
 				}).catch((err) => {})
 			},
 			initDrawers(){
@@ -337,6 +376,14 @@
 						this.range2[index].value = index
 						this.range2[index].text = item.name
 					})
+					if(this.again){
+						
+						that.range2.forEach((item,index)=>{
+							if(item.id==that.form.contractDrafts[0].drawersId){
+								that.form.contractDrafts[0].drawers=index
+							}
+						})
+					}
 				}).catch((err) => {})
 			},
 			searchAcceptor(e){
@@ -425,7 +472,7 @@
 			upAll() {
 				uni.showModal({
 					title: '提示',
-					content: '是否上传合同？',
+					content: '是否上传汇票？',
 					success: function(res) {
 						if (res.confirm) {
 							let form = that.form
@@ -471,6 +518,7 @@
 									that.$toast('请输入服务费率')
 									return
 								}
+								
 								if (i.interestRate.length == 0) {
 									that.$toast('请输入利率')
 									return
@@ -510,7 +558,7 @@
 								})
 							})
 							uni.showLoading()
-							uni.$u.http.post('/api/Contract/addContractDraft', form.contractDrafts, {
+							uni.$u.http.post('/api/Contract/addContractDraft', form, {
 								custom: {
 									auth: true
 								}
@@ -523,6 +571,11 @@
 								that.form.contractDrafts.forEach(item => {
 									item.picUrls = []
 								})
+								setTimeout(()=>{
+									uni.navigateBack({
+										delta:1
+									})
+								},500)
 							}).catch((err) => {
 								uni.hideLoading()
 								that.$toast(err.msg)
@@ -566,7 +619,6 @@
 				let myDate = new Date()
 				// let wk = Date.parse(new Date());
 				let wk = Date.parse(new Date())
-				console.log(wk)
 				let yy = String(myDate.getFullYear())
 				// let mm = myDate.getMonth() + 1
 				let mm = String(myDate.getMonth() + 1 < 10 ? '0' + (myDate.getMonth() + 1) : myDate.getMonth() + 1)
@@ -585,7 +637,6 @@
 				this.form.contractDrafts.push(form[0])
 			},
 			changeacPerson(e) {
-				console.log(e,88)
 				this.acceptor = e
 				for(let i in this.range1){
 					if(i==e){
@@ -702,7 +753,6 @@
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 
 				if (event.name >= 4) {
-					console.log(2222222222999)
 					let lists = [].concat(event.file)
 					let icurls= this.form.contractDrafts[this.allindex].picUrling
 					let fileListLen = icurls.length

pages/alldeatil/addnewacpt.vue

@@ -82,7 +82,11 @@
 				}).then((res) => {
 					uni.hideLoading()
 					that.$toast("提交成功")
-					
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta:1
+						})
+					},500)
 				}).catch((err) => {
 					uni.hideLoading()
 					that.$toast(err.msg)

pages/alldeatil/addnewdrawer.vue

@@ -69,6 +69,11 @@
 						bankName: ''
 					}
 					that.$toast("提交成功")
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta:1
+						})
+					},500)
 				}).catch((err) => {
 					uni.hideLoading()
 					that.$toast(err.msg)

pages/alldeatil/billdetail.vue

@@ -104,10 +104,17 @@
 		</view>
 		
 		</view>
-		<view class="newbill flex1" @click="tryAgain" v-if="msg.statusText=='未通过'&&state==1">
+		<!-- <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="choosebtn">
+				<view class="delbtn flex1" @click="tryAgain()">重新提交</view>
+				<view class="succbtn flex1" @click="addBill()">新增汇票</view>
+			</view>
+		
 		</view>
 	</view>
 </template>
@@ -128,7 +135,8 @@
 				feedback:'',
 				disabled:false,
 				delablepic:true,
-				placehodertitle:'请输入审核反馈'
+				placehodertitle:'请输入审核反馈',
+				contractid:''
 			}
 		},
 		onLoad(o) {
@@ -142,6 +150,7 @@
 				let obj=JSON.parse(o.obj)
 				this.id=obj.id
 				this.index=obj.index
+				this.contractid=obj.contractid
 			}
 			this.init()
 		},
@@ -195,13 +204,21 @@
 				});
 			},
 			tryAgain(){
-				let obj=[
-					this.msg
-				]
+				let obj={
+					id:this.contractid,
+					contractDrafts:[this.msg]
+					
+				}
+
 				uni.navigateTo({
 					url:"/pages/alldeatil/addbill?obj="+JSON.stringify(obj)
 				})
 			},
+			addBill() {
+				uni.navigateTo({
+					url: "/pages/alldeatil/addbill"
+				})
+			},
 			examineSuccess() {
 				// let ids = []
 				// ids.push(this.id)
@@ -261,7 +278,7 @@
 			examineFail() {
 				uni.showModal({
 					title: '提示',
-					content: "是否审核成功？",
+					content: "是否审核失败？",
 					success: function(res) {
 						if (res.confirm) {
 							
@@ -280,10 +297,7 @@
 							if(feedback.length>0){
 								form.feedback=feedback
 							}
-							// ={
-							// 	feedback:feedback,
-							// 	feedbackPicList:feedbackPicList
-							// }
+							
 							uni.showLoading()
 							uni.$u.http.post('api/Contract/approveContractDraft',form, {
 								custom: {

pages/alldeatil/contractdetail.vue

@@ -104,11 +104,17 @@
 		<view style="padding-bottom:150rpx;"></view>
 		<view class="safebt"></view>
 
-		<view class="newbill flex1" v-if="state==1&&!msg.statusText=='失败'" >
+		<!-- <view class="newbill flex1" v-if="state==1&&msg.statusText=='失败'" >
 			<view class="newbillbtn"  @click="addBill">
 				<text>新增汇票</text>
 			</view>
 
+		</view> -->
+		<view class="newbill flex1" v-if="state==1&&msg.statusText=='成功'" >
+			<view class="newbillbtn"  @click="addBill">
+				<text>新增汇票</text>
+			</view>
+		
 		</view>
 		<view class="newbill flex1" v-if="state==0">
 			<view class="choosebtn">
@@ -117,10 +123,17 @@
 			</view>
 
 		</view>
-		<view class="newbill flex1"  v-if="msg.statusText=='失败'&&state==1">
+		<!-- <view class="newbill flex1"  >
 			<view class="newbillbtn" @click="tryAgain">
 				<text>重新提交</text>
 			</view>
+		</view> -->
+		<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>
 		<!-- 底部删除 -->
 		<u-popup :show="editall&&state==1" @close="closeEidt" @open="openEidt" :overlay="false">
@@ -302,7 +315,8 @@
 			billDetail(id, index) {
 				let obj = {
 					id: id,
-					index: index
+					index: index,
+					contractid:this.id
 				}
 				uni.navigateTo({
 					url: "/pages/alldeatil/billdetail?obj=" + JSON.stringify(obj)
@@ -797,13 +811,13 @@
 
 		.upbox {
 			margin-left: 30rpx;
-			width: 490rpx;
+			// width: 490rpx;
 		}
 
 		.yu {
 
 			display: block;
-			width: 120rpx;
+			// width: 120rpx;
 			color: #BEBDBB;
 		}
 

pages/alldeatil/upcontract.vue

@@ -52,7 +52,7 @@
 					:maxCount="10" width="100" height="100"></u-upload>
 			</view>
 		</view>
-		<view v-for="(item,index) in form.contractDrafts" :key="index" v-if="openhe">
+		<view v-for="(item,index) in form.contractDrafts" :key="index" v-if="!openhe">
 			<view class="addtitle flex6">
 				<text class="ty">汇票{{index+1}}</text>
 				<text class="tde" @click="deleBill" v-if="index>0">删除</text>
@@ -139,7 +139,7 @@
 				<view class="listitem">
 					<text class="lys">服务费率</text>
 					<view class="inbox">
-						<input type="digit" v-model="item.serviceRate" placeholder="显示对于费率"
+						<input type="digit" v-model="item.serviceRate+'%'" placeholder="显示对于费率"
 							placeholder-style="color:#BEBDBB" @blur="getserviceRate" @input="getserviceRateIndex(index)"
 							disabled="true" />
 					</view>
@@ -157,7 +157,7 @@
 				<view class="listitem">
 					<text class="lys">利率</text>
 					<view class="inbox">
-						<input type="digit" v-model="item.interestRate" placeholder="显示对于利率"
+						<input type="digit" v-model="item.interestRate+'%'" placeholder="显示对于利率"
 							placeholder-style="color:#BEBDBB" @blur="getinterestRate"
 							@input="getinterestRateIndex(index)" disabled="true" />
 					</view>
@@ -294,9 +294,9 @@
 					}
 				})
 				this.fileList3=newData3
-				this.$delete(form,'contractDraft')
-				console.log(form)
-				this.form = form			
+				this.form.name = form.name
+				this.form.id = form.id
+				this.$delete(this.form,'contractDrafts')
 			}
 		},
 		onShow() {
@@ -470,9 +470,16 @@
 									that.$toast('请上传贸易合同')
 									return
 								}
-								
+								that.fileList1.forEach(item => {
+									form.invoicePics.push(item.url)
+								})
+								that.fileList2.forEach(item => {
+									form.pics.push(item.url)
+								})
+								that.fileList3.forEach(item => {
+									form.tradePics.push(item.url)
+								})
 								if(!that.openhe){
-									console.log(89798)
 									form.contractDrafts.forEach(i => {
 										if (i.name.length == 0) {
 											that.$toast('请输入汇票名称')
@@ -509,15 +516,7 @@
 										}
 										
 									})
-									that.fileList1.forEach(item => {
-										form.invoicePics.push(item.url)
-									})
-									that.fileList2.forEach(item => {
-										form.pics.push(item.url)
-									})
-									that.fileList3.forEach(item => {
-										form.tradePics.push(item.url)
-									})
+									
 									form.contractDrafts.forEach(item => {
 										item.picUrling.forEach(i => {
 											item.picUrls.push(i.url)
@@ -557,7 +556,11 @@
 											item.picUrls = []
 										})
 									}
-									
+									setTimeout(()=>{
+										uni.navigateBack({
+											delta:1
+										})
+									},500)
 								}).catch((err) => {
 									uni.hideLoading()
 									that.$toast(err.msg)

pages/bsinessadmin/register.vue

@@ -190,7 +190,7 @@
 			},
 			loginIn() {
 				uni.navigateTo({
-					url: "/pages/bsinessadmin/login"
+					url: "/pages/login/login"
 				})
 			}
 		}

pages/bsinessadmin/setpassword.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="headbox">
-			<view class="numbercat">账号 CD45555</view>
+			<view class="numbercat">账号 {{account}}</view>
 		</view>
 		<view class="acountbox" >
 			<view class="inacount">
@@ -48,6 +48,7 @@
 		data() {
 			return {
 				show: false,
+				account:'',
 				form: {
 					oldPassword:'',
 					newPassword:'',
@@ -56,8 +57,8 @@
 			}
 		},
 		onLoad(o) {
-			if (o.checked) {
-				this.checked = o.checked
+			if (o.account) {
+				this.account = o.account
 			}
 		},
 		methods: {

pages/bsinessadmin/supplierges.vue

@@ -9,7 +9,7 @@
 		<view class="acountbox">
 			<view class="inacount">
 				<text class="acoutitle">供货商</text>
-				<input type="text" v-model="form.name" class="checkword" placeholder="输入供货商名称"
+				<input type="text" v-model="form.name" class="checkword" placeholder="请输入供货商名称"
 					placeholder-style="font-size:30rpx;color:#BEBDBB" />
 			</view>
 			<view class="inacount">
@@ -101,7 +101,7 @@
 				
 				let form=this.form
 				if(form.name.length==0){
-					this.$toast("输入供货商名称")
+					this.$toast("请输入供货商名称")
 					return
 				}
 				if(form.socialCode.length==0){

pages/index/index.vue

@@ -12,7 +12,6 @@
 				<view style="padding-left: 10rpx;">
 					<u-icon name="arrow-down" color="#1F242A" size="14" bold="true"></u-icon>
 				</view>
-
 			</view>
 		</view>
 		<view class="cardlist">

pages/login/login.vue

@@ -29,7 +29,7 @@
 			<text @click="show = true">忘记密码？</text>
 		</view>
 		<view class="logininbtn" @click="loginIn">
-			<text>登录</text>
+			<text>登陆</text>
 		</view>
 		<view class="flex1 checkag">
 			<u-checkbox-group @change="checkboxChange">

pages/mine/mine.vue

@@ -80,6 +80,7 @@
 		<view class="logininbtn" @click="loginOut">
 			<text>退出登录</text>
 		</view>
+		<view style="padding-bottom: 220rpx;"></view>
 		<tabar checked="my"></tabar>
 	</view>
 </template>
@@ -176,7 +177,7 @@
 			},
 			checkPwd() {
 				uni.navigateTo({
-					url: "/pages/bsinessadmin/setpassword"
+					url: "/pages/bsinessadmin/setpassword?account="+this.msg.account
 				})
 			}
 		}
@@ -284,11 +285,12 @@
 
 	.logininbtn {
 		margin: 0 auto;
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 180rpx;
-		// margin-top: 550rpx;
+		// position: fixed;
+		// left: 0;
+		// right: 0;
+		// bottom: 180rpx;
+		margin-top:250rpx;
+		// : 220rpx;
 		width: 690rpx;
 		border-radius: 20rpx;
 		border: 1rpx solid #BEBDBB;

pages/supplier/supplier.vue

@@ -24,10 +24,10 @@
 					<view class="passreview" v-if="item.status==1&&item.isDeleted==0">
 						<image src="../../static/img/Cercomplete.png" mode="aspectFill"></image>
 					</view>
-					<view class="passreview" v-if="item.status==0">
+					<view class="passreview" v-if="item.status==0&&item.isDeleted==0">
 						<image src="../../static/img/toreviewe.png" mode="aspectFill"></image>
 					</view>
-					<view class="passreview" v-if="item.status==3">
+					<view class="passreview" v-if="item.status==3&&item.isDeleted==0">
 						<image src="../../static/img/fail.png" mode="aspectFill"></image>
 					</view>
 					<view class="passreview" v-if="item.isDeleted==1">

project.config.json

@@ -0,0 +1,43 @@
+{
+  "appid": "wx55637849acebb7e7",
+  "compileType": "miniprogram",
+  "libVersion": "2.25.1",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "lazyloadPlaceholderEnable": false,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "autoAudits": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "useStaticServer": true,
+    "showES6CompileOption": false,
+    "checkInvalidKey": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "projectname": "alhj",
+  "setting": {
+    "compileHotReLoad": true
+  },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+}

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

@@ -48,11 +48,9 @@ page {
 }
 .headboxcon .upbox {
   margin-left: 30rpx;
-  width: 490rpx;
 }
 .headboxcon .yu {
   display: block;
-  width: 120rpx;
   color: #BEBDBB;
 }
 .headboxcon .tip {