修改

pages/acceptor/acceptor.vue

@@ -20,7 +20,7 @@
 				<view class="acpcard" @click="acpDetail(item.id)">
 					<view class="allmsg">
 						<view class="cicle"  v-if="item.isDeleted==0"></view>
-						<view class="cicle" v-if="item.isDeleted==1" style="background-colr:#D05C39"></view>
+						<view class="cicle" v-if="item.isDeleted==1" style="background-color:#D05C39"></view>
 						<view class="acpcont">
 							<view class="acpname">
 								<text>{{item.name}}</text>
@@ -85,8 +85,8 @@
 					</view>
 				</view>
 				<view class="choosebtn">
-					<view class="delbtn flex1">删除</view>
-					<view class="restorebtn flex1">复原</view>
+					<view class="delbtn flex1" @click="deleteAcceptor">删除</view>
+					<view class="restorebtn flex1" @click="backAcceptor">复原</view>
 				</view>
 			</view>
 		</u-popup>
@@ -95,6 +95,7 @@
 </template>
 
 <script>
+	let that
 	import tabar from "@/componet/tabbar/tabbar.vue"
 	export default {
 		components:{
@@ -107,7 +108,9 @@
 				show:false,
 				contract_status:0,
 				listall:[],
+				pageIndex:1,
 				total:'',
+				nomore:false,
 				ctrstatus: [{
 					title: "承兑人状态",
 					list: [{
@@ -128,13 +131,28 @@
 			}
 		},
 		onLoad() {
+			that=this
 			this.init()
 		},
+		onshow(){
+			this.init()
+		},
+		// 下拉到底部后加载新数据
+		    onReachBottom() {
+		      //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+		      if (this.listall.length >= this.pageIndex * 10) {
+		        this.pageIndex++;//页数加一
+				this.init();//回调接口
+		      }else{
+				  this.nomore=true
+			  }
+		      
+		    },
 		methods: {
 			init() {
 				uni.showLoading()
 				uni.$u.http.post('/api/Acceptor/search',{
-					pageIndex:1,
+					pageIndex:this.pageIndex,
 					pageSize:10,
 					// startTime:'',
 					// endTime:'',
@@ -147,11 +165,18 @@
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.listall=res.result
 					this.total=res.total
-					this.listall.forEach(item=>{
-						item.checked=false
-					})
+					
+					let list=res.result
+					if(list.length>0){
+						list.forEach(item=>{
+							item.checked=false
+							this.listall.push(item)
+						})
+						if(list.length<10){
+							that.nomore=true
+						}
+					}
 				}).catch((err) => {
 					uni.hideLoading()
 					console.log(err)
@@ -199,7 +224,6 @@
 					})
 				}
 				this.listall = JSON.parse(JSON.stringify(list))
-				console.log(this.listall)
 			},
 			makeSureAll(){
 				this.quan=!this.quan
@@ -220,8 +244,101 @@
 				uni.navigateTo({
 					url:'/pages/alldeatil/addnewacpt'
 				})
+			},
+			deleteAcceptor(){
+					let ids=[]
+					that.listall.forEach(item=>{
+						if(item.checked){
+							ids.push(item.id)
+						}
+					})
+					if(ids.length==0){
+						that.$toast("请选择合同")
+						return
+					}
+					uni.showModal({
+						title: '提示',
+						content:"是否批量删除？",
+						success: function (res) {
+								if (res.confirm) {
+									uni.showLoading()
+									uni.$u.http.post('/api/Acceptor/manager',
+									{
+										ids:ids,
+										operateType:1
+									},
+									{
+										custom: {
+											auth: true
+										}
+									}).then((res) => {
+										uni.hideLoading()
+										that.editall=false
+										that.quan=false
+										that.$toast("操作成功")
+										setTimeout(()=>{
+											that.init()
+										},500)
+										
+									}).catch((err) => {
+										uni.hideLoading()
+										that.$toast(err.msg)
+									})
+								
+								} else if (res.cancel) {
+								
+								}
+							}
+					})
+				},
+				backAcceptor(){
+					let ids=[]
+					that.listall.forEach(item=>{
+						if(item.checked){
+							ids.push(item.id)
+						}
+					})
+					if(ids.length==0){
+						that.$toast("请选择合同")
+						return
+					}
+					uni.showModal({
+						title: '提示',
+						content:"是否批量复原？",
+						success: function (res) {
+								if (res.confirm) {
+									uni.showLoading()
+									uni.$u.http.post('/api/Acceptor/manager',
+									{
+										ids:ids,
+										operateType:2
+									},
+									{
+										custom: {
+											auth: true
+										}
+									}).then((res) => {
+										uni.hideLoading()
+										that.editall=false
+										that.quan=false
+										that.$toast("操作成功")
+										setTimeout(()=>{
+											that.init()
+										},500)
+										
+									}).catch((err) => {
+										uni.hideLoading()
+										that.$toast(err.msg)
+									})
+								
+								} else if (res.cancel) {
+								
+								}
+							}
+					})
+				}
 			}
-		}
+		
 	}
 </script>
 

pages/alldeatil/addbill.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 
-		<view v-for="(item,index) in contractDrafts" :key="index">
+		<view v-for="(item,index) in form.contractDrafts" :key="index">
 			<view class="addtitle flex6">
 				<text class="ty">汇票{{index+1}}</text>
-				<!-- <text class="tde">删除</text> -->
+				<text class="tde" @click="deleBill(index)">删除</text>
 			</view>
 			<view class="listitem">
 				<text class="lys">汇票名称</text>
@@ -15,25 +15,29 @@
 			<view class="listitem">
 				<text class="lys">汇票号码</text>
 				<view class="inbox">
-					<input type="text" v-model="item.draftNo" placeholder="请输入汇票的号码" placeholder-style="color:#BEBDBB" />
+					<input type="text" v-model="item.draftNo" placeholder="请输入汇票的号码"
+						placeholder-style="color:#BEBDBB" />
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">兑换人</text>
 				<view class="chosbox">
-					<uni-data-select v-model="item.accepter" :localdata="range" @change="changeacPerson" :showas="false"></uni-data-select>
+					<uni-data-select v-model="item.acceptor" :localdata="range1" @change="changeacPerson"
+						:showas="false" :plname="'搜索兑换人名称'"></uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">出票人</text>
 				<view class="chosbox">
-					<uni-data-select v-model="item.drawersId" :localdata="range" @change="changedrPerson"></uni-data-select>
+					<uni-data-select v-model="item.drawers" :localdata="range2" @change="changedrPerson"
+						:plname="'搜索出票人名称'"></uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">金额</text>
 				<view class="inbox">
-					<input type="text" v-model="item.money" placeholder="请输入汇票的金额" placeholder-style="color:#BEBDBB" />
+					<input type="digit" v-model="item.money" placeholder="请输入汇票的金额" placeholder-style="color:#BEBDBB"
+						@blur="getMoney" @input="getMoneyIndex(index)" />
 				</view>
 			</view>
 			<view class="listitem">
@@ -74,12 +78,9 @@
 			</view>
 			<view class="listitem">
 				<text class="lys">最高贷款额度</text>
-				<view class="inbox" v-if="form.serviceRate&&form.interestRate">
-					<input type="text" v-model="form.loanLimit" placeholder="请输入最高贷款额度" placeholder-style="color:#BEBDBB"
-						disabled="true" />
-				</view>
-				<view class="inbox" v-else>
-					<input type="text" v-model="form.loanLimit" placeholder="请输入最高贷款额度" placeholder-style="color:#BEBDBB"
+				<view class="inbox">
+
+					<input type="text" v-model="item.loanLimit" placeholder="自动计算得出" placeholder-style="color:#1F242A"
 						disabled="true" />
 				</view>
 			</view>
@@ -87,31 +88,34 @@
 				<view class="listitem">
 					<text class="lys">服务费率</text>
 					<view class="inbox">
-						<input type="text" v-model="form.serviceRate" placeholder="输入费率" placeholder-style="color:#BEBDBB"
-							 />
+						<input type="digit" v-model="item.serviceRate" placeholder="显示对于费率"
+							placeholder-style="color:#BEBDBB" @blur="getserviceRate"
+							@input="getserviceRateIndex(index)" />
 					</view>
 				</view>
 				<view class="listitem">
 					<text class="lys">服务费</text>
 					<view class="inbox">
-						<input type="text" v-model="form.serviceMoney" placeholder="自动计算得出" placeholder-style="color:#BEBDBB"
-							disabled="true" />
+						<input type="text" v-model="item.serviceMoney" placeholder="自动计算得出"
+							placeholder-style="color:#BEBDBB" disabled="true" />
 					</view>
+
 				</view>
 			</view>
 			<view class="flex4">
 				<view class="listitem">
 					<text class="lys">利率</text>
 					<view class="inbox">
-						<input type="text" v-model="form.interestRate" placeholder="输入利率" placeholder-style="color:#BEBDBB"
-							 />
+						<input type="digit" v-model="item.interestRate" placeholder="显示对于利率"
+							placeholder-style="color:#BEBDBB" @blur="getinterestRate"
+							@input="getinterestRateIndex(index)" />
 					</view>
 				</view>
 				<view class="listitem">
 					<text class="lys">利息</text>
 					<view class="inbox">
-						<input type="text" v-model="form.interest" placeholder="自动计算得出" placeholder-style="color:#BEBDBB"
-							disabled="true" />
+						<input type="text" v-model="item.interest" placeholder="自动计算得出"
+							placeholder-style="color:#BEBDBB" disabled="true" />
 					</view>
 				</view>
 			</view>
@@ -121,14 +125,13 @@
 					<text
 						style="font-size: 24rpx; color:#D05C39;padding-top: 45rpx;padding-left: 20rpx;">*支持上传pdf、jpg/jpeg、png格式</text>
 				</view>
-			
-				<view class="inbox" style="border: none;padding-bottom: 0;">
-					<u-upload :fileList="fileList4" @afterRead="afterRead" @delete="deletePic" name="4" multiple
-						:maxCount="10" width="100" height="100" @click="checkIndex(index)"></u-upload>
+
+				<view class="inbox" style="border: none;padding-bottom: 0;" @click="checkIndex(index)">
+					<u-upload :fileList="item.picUrling" @afterRead="afterRead" @delete="deletePic" :name="index+4"
+						multiple :maxCount="10" width="100" height="100"></u-upload>
 				</view>
 			</view>
 		</view>
-		
 		<view class="addnewbill" @click="addNewBill">
 			+ 新增汇票
 		</view>
@@ -145,7 +148,10 @@
 </template>
 
 <script>
-	
+	let that
+	import {
+		mainUrl
+	} from '@/http/baseUrl.js';
 	import calllips from "@/componet/calllips/calllips.vue"
 	export default {
 		components: {
@@ -153,96 +159,97 @@
 		},
 		data() {
 			return {
-				
+
 				editall: false,
 				quan: false,
 				dateshow: false,
 				opdanum: '',
 				state: '',
-				index:0,
+				index: 0,
 				start: Number(new Date()),
-				allindex:'',
 				fileList1: [],
-				contractDrafts:[
-					{
+				fileList2: [],
+				fileList3: [],
+				fileList4: [],
+				allindex: 0,
+				form: {
+					name: '',
+					supplierId: '',
+					invoicePics: [],
+					pics: [],
+					tradePics: [],
+					contractDrafts: [{
 						name: '',
 						draftNo: '',
-						acceptorId:'',
-						drawersId:'',
+						acceptor: '',
+						acceptorId: '',
+						drawersId: '',
+						drawers: '',
 						money: '',
 						acceptDate: '',
 						issueDate: '',
 						expireDate: '',
-						loanLimit:'',
+						loanLimit: '',
 						expectDiscountDate: '',
 						picUrls: [],
-					},
-				],
-				range: [{
-						value: 0,
-						text: "篮球"
-					},
-					{
-						value: 1,
-						text: "足球"
-					},
-				 {
-						value: 2,
-						text: "游泳"
-					},
-				],	
+						picUrling: [],
+						serviceRate: '',
+						interestRate: '',
+						interest: '',
+						serviceMoney: '',
+						limitTime: 0,
+						expectDiscountDateTime: 0,
+						expectDiscountDate: 0
+					}, ],
+				},
+
+				range1: [],
+				range2: [],
+				myindex: 0,
+				sindex: 0,
+				rindex: 0
 			}
-		},
-		computed:{
-			
 		},
 		onLoad() {
-			that=this
+			that = this
+			if(o.obj){
+				this.form.contractDrafts=JSON.parse(o.obj)
+			}
 			this.init()
 			this.form.supplierId = uni.getStorageSync('supplierId')
+			// console.log(this.form.supplierId,778)
 			this.loadTime()
+
+		},
+		onshow(){
+			
 		},
 		methods: {
-			addNewBill(){
-				let form={
-						name: '',
-						draftNo: '',
-						acceptorId:'',
-						drawersId:'',
-						money: '',
-						acceptDate: '',
-						issueDate: '',
-						expireDate: '',
-						expectDiscountDate: '',
-						picUrls: [],
-					}
-				this.contractDrafts.push(form)
-			},
-			loadTime(){
+			loadTime() {
 				let myDate = new Date()
 				// let wk = Date.parse(new Date());
-				let wk=myDate.getTime()
+				let wk = myDate.getTime()
 				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)
 				let dd = String(myDate.getDate() < 10 ? '0' + myDate.getDate() : myDate.getDate())
 				let nowDate = yy + '-' + mm + '-' + dd
-				this.contractDrafts.forEach(item => {
+				this.form.contractDrafts.forEach(item => {
 					item.acceptDate = nowDate
 					item.issueDate = nowDate
 					item.expireDate = nowDate
 					item.expectDiscountDate = nowDate
-					item.expectDiscountDateTime=wk
-					item.issueDateTime=wk
+					item.expectDiscountDateTime = wk
+					item.issueDateTime = wk
 					let nTime = item.expectDiscountDateTime - item.issueDateTime
-					item.limitTime = Math.floor(nTime / 86400000)+1;
+					item.limitTime = Math.floor(nTime / 86400000) + 1;
 				})
 			},
 			init() {
 				// 承兑人列表
 				uni.$u.http.post('/api/Acceptor/search', {
-			
+
 				}, {
 					custom: {
 						auth: true
@@ -251,7 +258,7 @@
 					uni.hideLoading()
 					this.range1 = res.result
 					// for(let i in this.range1){
-			
+
 					// }
 					this.range1.forEach((item, index) => {
 						this.range1[index].value = index
@@ -260,7 +267,7 @@
 				}).catch((err) => {})
 				// 出票人列表
 				uni.$u.http.post('/api/Drawer/search', {
-			
+
 				}, {
 					custom: {
 						auth: true
@@ -274,156 +281,140 @@
 					})
 				}).catch((err) => {})
 			},
-			checkIndex(index){
-				this.allindex=index
-			},
-			changeacPerson(e){
-				this.accepter=e
-			},
-			changedrPerson(e){
-				this.drawer=e
+			deleBill(index){
+				uni.showModal({
+					title:"提示",
+					content:"是否确认删除?",
+					success:(res)=>{
+						if (res.confirm) {
+							that.form.contractDrafts.splice(index,1)
+						}
+						
+					}
+				})
+				
 			},
-			openTime(index,value) {
-				this.dateshow = true
-				this.index=index
-				this.opdanum = value
+			getinterestRateIndex(index) {
+				this.rindex = index
 			},
-			closeDate() {
-				this.dateshow = false
+			getinterestRate(event) {
+				this.form.contractDrafts[this.rindex].interestRate = Number(event.detail.value)
+				this.getloanLimt(this.rindex)
+				this.getInterMoney(this.rindex)
+				this.getSerMoney(this.rindex)
 			},
-			confirm(e) {
-				const timeFormat = uni.$u.timeFormat
-				if (this.opdanum == 1) {
-					this.contractDrafts[this.index].acceptDate = timeFormat(e.value, 'yyyy-mm-dd')
-				} else if (this.opdanum == 2) {
-					this.contractDrafts[this.index].issueDate = timeFormat(e.value, 'yyyy-mm-dd')
-				} else if (this.opdanum == 3) {
-					this.contractDrafts[this.index].expireDate = timeFormat(e.value, 'yyyy-mm-dd')
-				} else if (this.opdanum == 4) {
-					this.contractDrafts[this.index].expectDiscountDate = timeFormat(e.value, 'yyyy-mm-dd')
-				}
-				console.log(this.index,this.opdanum)
-				this.dateshow = false
+			getserviceRateIndex(index) {
+				this.sindex = index
 			},
-			 change(e) {
-			      console.log("e:", e);
-			    },
-			open(e) {
-				// console.log('open', e)
+			getserviceRate(event) {
+				this.form.contractDrafts[this.sindex].serviceRate = Number(event.detail.value)
+				this.getloanLimt(this.sindex)
+				this.getInterMoney(this.sindex)
+				this.getSerMoney(this.sindex)
 			},
-			close(e) {
-				// console.log('close', e)
+			getMoneyIndex(index) {
+				this.myindex = index
 			},
-			change(e) {
-				// console.log('change', e)
+			getMoney(event) {
+				this.form.contractDrafts[this.myindex].money = Number(event.detail.value)
+				this.getloanLimt(this.myindex)
+				this.getSerMoney(this.myindex)
+				this.getInterMoney(this.myindex)
 			},
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+			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 + 1).toFixed(2)
+				}
+
 			},
-			// 新增图片
-			async afterRead(event) {
-				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
-				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
-				lists.map((item) => {
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
-					})
-				})
-				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					}))
-					this[`fileList${event.name}`].forEach(item=>{
-						this.form[this.allindex].picUrls.push(item.url)
-					})
-					fileListLen++
+			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 + 1) * this.form.contractDrafts[i].serviceRate * this
+						.form.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
+
 			},
-			uploadFilePromise(url) {
-				return new Promise((resolve, reject) => {
-					let a = uni.uploadFile({
-						url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
-						filePath: url,
-						name: 'file',
-						formData: {
-							user: 'test'
-						},
-						success: (res) => {
-							setTimeout(() => {
-								resolve(res.data.data)
-							}, 1000)
-						}
-					});
-				})
+			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 + 1) * this.form.contractDrafts[i].interestRate * this.form
+						.contractDrafts[i].limitTime / 360).toFixed(2)
+				}
+
 			},
 			upAll() {
 				uni.showModal({
 					title: '提示',
-					content: '是否上传汇票？',
-					success: function (res) {
+					content: '是否上传合同？',
+					success: function(res) {
 						if (res.confirm) {
-							
-							form.forEach(i=>{
-								if(i.name.length==0){
+							let form = that.form
+			
+							form.contractDrafts.forEach(i => {
+								if (i.name.length == 0) {
 									that.$toast('请输入汇票名称')
 									return
 								}
-								if(form.draftNo.length==0){
+								if (i.draftNo.length == 0) {
 									that.$toast('请输入汇票号码')
 									return
 								}
-								if(form.acceptor.length==0){
+								if (i.acceptor.length == 0) {
 									that.$toast('请选择承兑人')
 									return
 								}
-								if(form.drawers.length==0){
+								if (i.drawers.length == 0) {
 									that.$toast('请选择出票人')
 									return
 								}
-								if(form.money.length==0){
+								if (i.money.length == 0) {
 									that.$toast('请输入金额')
 									return
 								}
 								
-								if(form.serviceRate.length==0){
+								if (i.serviceRate.length == 0) {
 									that.$toast('请输入服务费率')
 									return
 								}
-								if(form.interestRate.length==0){
+								if (i.interestRate.length == 0) {
 									that.$toast('请输入利率')
 									return
 								}
-								if(form.picUrls.length==0){
+								if (i.picUrls.length == 0) {
 									that.$toast('请上传附件')
 									return
 								}
-								
+
 							})
-							
-							that.range2.forEach(item=>{
-								form.contractDrafts.forEach(i=>{
-									if(that.range2[i.drawers].name==item.name){
-										i.drawersId=item.id
+							that.range2.forEach(item => {
+								form.contractDrafts.forEach(i => {
+									if (that.range2[i.drawers].name == item.name) {
+										i.drawersId = item.id
 									}
 								})
 							})
-							that.range1.forEach(item=>{
-								form.contractDrafts.forEach(i=>{
-									if(that.range1[i.acceptor].name==item.name){
-										i.acceptorId=item.id
+							that.range1.forEach(item => {
+								form.contractDrafts.forEach(i => {
+									if (that.range1[i.acceptor].name == item.name) {
+										i.acceptorId = item.id
 									}
 								})
 							})
+							form.contractDrafts.forEach(item=>{
+								item.picUrling.forEach(i=>{
+									item.picUrls.push(i.url)
+								})
+							})
 							uni.showLoading()
-							uni.$u.http.post('/api/Contract',that.form, {
+							uni.$u.http.post('/api/Contract/addContractDraft', form.contractDrafts, {
 								custom: {
 									auth: true
 								}
@@ -435,16 +426,197 @@
 								that.$toast(err.msg)
 								console.log(err)
 							})
-						} else if (res.cancel) {
-						}
+						} else if (res.cancel) {}
 					}
 				});
-			
+
+			},
+			addNewBill() {
+				let form = [{
+					name: '',
+					draftNo: '',
+					acceptor: '',
+					acceptorId: '',
+					drawersId: '',
+					drawers: '',
+					money: '',
+					acceptDate: '',
+					issueDate: '',
+					expireDate: '',
+					loanLimit: '',
+					expectDiscountDate: '',
+					picUrls: [],
+					picUrling: [],
+					serviceRate: '',
+					interestRate: '',
+					interest: '',
+					serviceMoney: '',
+					limitTime: 0,
+					expectDiscountDateTime: 0,
+					expectDiscountDate: 0
+				}]
+				let myDate = new Date()
+				// let wk = Date.parse(new Date());
+				let wk = myDate.getTime()
+				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)
+				let dd = String(myDate.getDate() < 10 ? '0' + myDate.getDate() : myDate.getDate())
+				let nowDate = yy + '-' + mm + '-' + dd
+				form.forEach(item => {
+					item.acceptDate = nowDate
+					item.issueDate = nowDate
+					item.expireDate = nowDate
+					item.expectDiscountDate = nowDate
+					item.expectDiscountDateTime = wk
+					item.issueDateTime = wk
+					let nTime = item.expectDiscountDateTime - item.issueDateTime
+					item.limitTime = Math.floor(nTime / 86400000) + 1;
+				})
+				this.form.contractDrafts.push(form[0])
+			},
+			changeacPerson(e) {
+				this.acceptor = e
+			},
+			changedrPerson(e) {
+				this.drawers = e
+			},
+			openTime(index, value) {
+				this.dateshow = true
+				this.index = index
+				this.opdanum = value
+			},
+			closeDate() {
+				this.dateshow = false
+			},
+			confirm(e) {
+				const timeFormat = uni.$u.timeFormat
+				let form = this.form.contractDrafts
+				if (this.opdanum == 1) {
+					form[this.index].acceptDate = timeFormat(e.value, 'yyyy-mm-dd')
+				} else if (this.opdanum == 2) {
+					form[this.index].issueDateTime = e.value
+					form[this.index].issueDate = timeFormat(e.value, 'yyyy-mm-dd')
+				} else if (this.opdanum == 3) {
+					form[this.index].expireDate = timeFormat(e.value, 'yyyy-mm-dd')
+				} else if (this.opdanum == 4) {
+					form[this.index].expectDiscountDateTime = e.value
+					let nTime = form[this.index].expectDiscountDateTime - form[this.index].issueDateTime
+					form[this.index].limitTime = Math.floor(nTime / 86400000) + 1;
+					form[this.index].expectDiscountDate = timeFormat(e.value, 'yyyy-mm-dd')
+				}
+				// console.log(this.index, this.opdanum)
+				this.dateshow = false
+			},
+			change(e) {
+				console.log("e:", e);
+			},
+			open(e) {
+				// console.log('open', e)
+			},
+			close(e) {
+				// console.log('close', e)
+			},
+			change(e) {
+				// console.log('change', e)
+			},
+			checkIndex(index) {
+				this.allindex = index
+				console.log(index)
+			},
+			// 删除图片
+			deletePic(event) {
+				if (event.name == 4) {
+					this.form.contractDrafts[this.allindex].picUrling.splice(event.index, 1)
+				} else {
+					this[`fileList${event.name}`].splice(event.index, 1)
+				}
+
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+
+				if (event.name >= 4) {
+					let lists = [].concat(event.file)
+					let icurls = this.form.contractDrafts[this.allindex].picUrling
+					let fileListLen = icurls.length
+					lists.map((item) => {
+						icurls.push({
+							...item,
+							status: 'uploading',
+							message: '上传中'
+						})
+					})
+					for (let i = 0; i < lists.length; i++) {
+						const result = await this.uploadFilePromise(lists[i].url)
+						let obj = {
+
+						}
+						console.log(result)
+						let item = icurls[fileListLen]
+						icurls.splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+
+						fileListLen++
+					}
+
+
+				} else {
+					let lists = [].concat(event.file)
+					let fileListLen = this[`fileList${event.name}`].length
+					lists.map((item) => {
+						this[`fileList${event.name}`].push({
+							...item,
+							status: 'uploading',
+							message: '上传中'
+						})
+					})
+					for (let i = 0; i < lists.length; i++) {
+						const result = await this.uploadFilePromise(lists[i].url)
+						let item = this[`fileList${event.name}`][fileListLen]
+						this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+						fileListLen++
+					}
+
+
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'File',
+						header: {
+							"User-Agent": "apifox/1.0.0 (https://www.apifox.cn)"
+						},
+						formData: {
+							File: JSON.stringify(url),
+						},
+						success: (res) => {
+							console.log(res)
+							let request = JSON.parse(res.data)
+							setTimeout(() => {
+								resolve(request.data.file)
+							}, 1000)
+						}
+					});
+				})
 			},
 		}
 	}
 </script>
 
+
 <style lang="scss">
 	.content {
 		padding: 0 30rpx;

pages/alldeatil/billdetail.vue

@@ -96,7 +96,7 @@
 		</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>
@@ -141,8 +141,11 @@
 				})
 			},
 			tryAgain(){
+				let obj=[
+					this.msg
+				]
 				uni.navigateTo({
-					url:"/pages/alldeatil/addbill"
+					url:"/pages/alldeatil/addbill?obj="+JSON.stringify(obj)
 				})
 			}
 			

pages/alldeatil/contractdetail.vue

@@ -34,35 +34,37 @@
 				</view>
 				<view class="tip" style="border-top: 1rpx solid #E8E8E8;margin-top: 20rpx;padding-top: 30rpx;">
 					<text class="yu">合同状态</text>
-					<text   v-if="msg.statusText=='待审核'" :style="{'color':'#D05C39;'}">{{msg.statusText}}</text>
-					<text   v-if="msg.statusText=='失败'" :style="{'color':'#1F242A'}">{{msg.statusText}}</text>
-					<text  v-if="msg.statusText=='已删除'" :style="{'color':'#1F242A'}">{{msg.statusText}}</text>
-					<text   v-if="msg.statusText=='成功'" :style="{'color':'#D8AB5A'}">{{msg.statusText}}</text>
+					<text v-if="msg.statusText=='待审核'" :style="{'color':'#D05C39;'}">{{msg.statusText}}</text>
+					<text v-if="msg.statusText=='失败'" :style="{'color':'#1F242A'}">{{msg.statusText}}</text>
+					<text v-if="msg.statusText=='已删除'" :style="{'color':'#1F242A'}">{{msg.statusText}}</text>
+					<text v-if="msg.statusText=='成功'" :style="{'color':'#D8AB5A'}">{{msg.statusText}}</text>
 				</view>
 				<view class="">
-					<view class="tipup " style="display: flex;flex-direction: column;" >
+					<view class="tipup " style="display: flex;flex-direction: column;">
 						<text class="yu">审核反馈</text>
-						<view >
-							<textarea placeholder="请输入审核反馈" style="background-color: #F6F6F6;width: 640rpx;height: 200rpx;border-radius: 20rpx;padding: 20rpx;box-sizing: border-box;margin:20rpx 0;margin-bottom: 30rpx;" v-model="fankui"></textarea>
+						<view>
+							<textarea placeholder="请输入审核反馈"
+								style="background-color: #F6F6F6;width: 640rpx;height: 200rpx;border-radius: 20rpx;padding: 20rpx;box-sizing: border-box;margin:20rpx 0;margin-bottom: 30rpx;"
+								v-model="fankui"></textarea>
 						</view>
 					</view>
-					<view class="tipup" >
+					<view class="tipup">
 						<text class="yu">反馈截图</text>
 						<view class="upbox" style="margin-bottom: 30rpx;">
 							<u-upload :fileList="fileList4" @afterRead="afterRead" @delete="deletePic" name="4" multiple
-								:maxCount="6" ></u-upload>
+								:maxCount="6"></u-upload>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 		<view class="acpcardlist">
 			<view class="lable " v-for="(item,index) in msg.contractDraft.result" :key="index">
 				<view class="radiobox" v-if="editall">
-					<radio :value="index" :checked="item.checked" color="#D8AB5A"  @click="checkBox(item.id)"/>
+					<radio :value="index" :checked="item.checked" color="#D8AB5A" @click="checkBox(item.id)" />
 				</view>
-				<view class="acpcard"  @click="billDetail(item.id,index)">
+				<view class="acpcard" @click="billDetail(item.id,index)">
 					<view class="allmsg">
 						<view class="acpcont">
 							<view class="acpname">
@@ -95,19 +97,19 @@
 		</view>
 		<view style="padding-bottom:150rpx;"></view>
 		<view class="safebt"></view>
-		
+
 		<view class="newbill flex1" @click="addBill" v-if="state==1">
 			<view class="newbillbtn">
 				<text>新增汇票</text>
 			</view>
 
 		</view>
-		<view class="newbill flex1"  v-if="state==0&&msg.statusText=='待审核'">
-		<view class="choosebtn">
-			<view class="delbtn flex1">审核失败</view>
-			<view class="succbtn flex1">审核成功</view>
-		</view>
-		
+		<view class="newbill flex1" v-if="state==0&&msg.statusText=='待审核'">
+			<view class="choosebtn">
+				<view class="delbtn flex1" @click="examineFail()">审核失败</view>
+				<view class="succbtn flex1" @click="examineSuccess">审核成功</view>
+			</view>
+
 		</view>
 		<!-- 底部删除 -->
 		<u-popup :show="editall&&state==1" @close="closeEidt" @open="openEidt" :overlay="false">
@@ -122,8 +124,8 @@
 					</view>
 				</view>
 				<view class="choosebtn">
-					<view class="delbtn flex1">刪除</view>
-					<view class="restorebtn flex1">复原</view>
+					<view class="delbtn flex1" @click="dele()">刪除</view>
+					<view class="restorebtn flex1" @click="restore()">复原</view>
 				</view>
 			</view>
 		</u-popup>
@@ -136,14 +138,14 @@
 						<text>全选</text>
 					</view>
 					<view class="anniu">
-						<text class="usa">删除</text>
-						<text  class="usa">复原</text>
-						<text  @click="selectDown"  class="usa">完成</text>
+						<text class="usa" @click="dele()">删除</text>
+						<text class="usa" @click="restore()">复原</text>
+						<text @click="selectDown" class="usa">完成</text>
 					</view>
 				</view>
 				<view class="choosebtn">
-					<view class="delbtn flex1">审核失败</view>
-					<view class="restorebtn flex1">审核成功</view>
+					<view class="delbtn flex1" @click="examineBillFail()">审核失败</view>
+					<view class="restorebtn flex1" @click="examineBillSuccess()">审核成功</view>
 				</view>
 			</view>
 		</u-popup>
@@ -160,82 +162,82 @@
 				state: 0,
 				fileList1: [],
 				fileList2: [],
-				fileList3:[],
-				fileList4:[],
-				msg:'',
-				id:'',
-				fankui:''
+				fileList3: [],
+				fileList4: [],
+				msg: '',
+				id: '',
+				fankui: ''
 			}
 		},
 		onLoad(o) {
-			that=this
-			if(o.id){
-				this.id=o.id
+			that = this
+			if (o.id) {
+				this.id = o.id
 			}
 			this.state = this.$store.state.admin
 			this.init()
 		},
 		methods: {
-			init(){
+			init() {
 				uni.showLoading()
-				uni.$u.http.get(`/api/Contract/${this.id}`,{
+				uni.$u.http.get(`/api/Contract/${this.id}`, {
 					custom: {
 						auth: true
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.msg=res
-					this.msg.contractDraft.result.forEach(item=>{
-						item.checked=false
+					this.msg = res
+					this.msg.contractDraft.result.forEach(item => {
+						item.checked = false
+					})
+					const newData1 = res.picList.map((item) => {
+						return {
+							url: item,
+						}
 					})
-					const newData1 = res.picList.map((item)=>{
-					   return {
-					     url: item,
-					   }
-					 })
-					 console.log(newData2)
-					this.fileList1=newData1
 					console.log(newData2)
-					const newData2 = res.invoicePicList.map((item)=>{
-					   return {
-					     url: item,
-					   }
-					 })
-					 
-					this.fileList2=newData2
-					const newData3 = res.tradePicList.map((item)=>{
-					   return {
-					     url: item,
-					   }
-					 })
-					this.fileList3=newData3
+					this.fileList1 = newData1
+					console.log(newData2)
+					const newData2 = res.invoicePicList.map((item) => {
+						return {
+							url: item,
+						}
+					})
+
+					this.fileList2 = newData2
+					const newData3 = res.tradePicList.map((item) => {
+						return {
+							url: item,
+						}
+					})
+					this.fileList3 = newData3
 				}).catch((err) => {
 					uni.hideLoading()
 					console.log(err)
 				})
 			},
-			openEidt(){
-				this.editall=true
+			openEidt() {
+				this.editall = true
 			},
-			checkBox(id){
-				let list=this.msg.contractDraft.result
-				list.forEach(item=>{
-					if(item.id==id){
-						item.checked=!item.checked
+			checkBox(id) {
+				let list = this.msg.contractDraft.result
+				list.forEach(item => {
+					if (item.id == id) {
+						item.checked = !item.checked
 					}
 				})
 				this.msg.contractDraft.result = JSON.parse(JSON.stringify(list))
-				
+
 			},
-			allSelect(){
-				let list=this.msg.contractDraft.result
-				if(this.quan){
+			allSelect() {
+				let list = this.msg.contractDraft.result
+				if (this.quan) {
 					list.forEach(item => {
-						item.checked =true
+						item.checked = true
 					})
-				}else{
+				} else {
 					list.forEach(item => {
-						item.checked =false
+						item.checked = false
 					})
 				}
 				this.msg.contractDraft.result = JSON.parse(JSON.stringify(list))
@@ -245,31 +247,306 @@
 					url: "/pages/alldeatil/acptdetail"
 				})
 			},
-			addBill(){
+			addBill() {
 				uni.navigateTo({
 					url: "/pages/alldeatil/addbill"
 				})
 			},
-			billDetail(id,index){
-				let obj={
-					id:id,
-					index:index
+			billDetail(id, index) {
+				let obj = {
+					id: id,
+					index: index
 				}
 				uni.navigateTo({
-					url: "/pages/alldeatil/billdetail?obj="+JSON.stringify(obj)
+					url: "/pages/alldeatil/billdetail?obj=" + JSON.stringify(obj)
 				})
 			},
 			makeSureAll() {
-				this.quan = true
+				this.quan = !this.quan
 				this.allSelect()
 			},
-			selectDown(){
-				this.editall=false
-				that.quan=true
-				let list=this.msg.contractDraft.result
-				list.forEach(item=>{
-						item.checked=false
+			selectDown() {
+				this.editall = false
+				this.quan = true
+				let list = this.msg.contractDraft.result
+				list.forEach(item => {
+					item.checked = false
+				})
+			},
+			examineSuccess() {
+				let ids = []
+
+				ids.push(this.id)
+
+
+				if (ids.length == 0) {
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: "是否审核成功？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/manage', {
+								ids: ids,
+								operateType: 3
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
+			},
+			examineFail() {
+				let ids = []
+
+				ids.push(this.id)
+
+				if (ids.length == 0) {
+					this.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否审核失败？',
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/manage', {
+								ids: ids,
+								operateType: 4
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+
+									that.init()
+								}, 500)
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+			},
+			examineBillSuccess() {
+				let ids = []
+				this.msg.contractDraft.result.forEach(item => {
+					if (item.checked) {
+						ids.push(item.id)
+					}
+				})
+
+				if (ids.length == 0) {
+					that.$toast("请选择汇票")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: "是否批量审核成功？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/contractDraft/manager', {
+								ids: ids,
+								operateType: 3
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
+			},
+			
+			examineBillFail() {
+				let ids = []
+				this.msg.contractDraft.result.forEach(item => {
+					if (item.checked) {
+						ids.push(item.id)
+					}
 				})
+				if (ids.length == 0) {
+					this.$toast("请选择汇票")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否审核失败？',
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/contractDraft/manager', {
+								ids: ids,
+								operateType: 4
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+
+									that.init()
+								}, 500)
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+			},
+			dele() {
+
+				let ids = []
+				this.msg.contractDraft.result.forEach(item => {
+					if (item.checked) {
+						ids.push(item.id)
+					}
+				})
+				if (ids.length == 0) {
+					that.$toast("请选择汇票")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: "是否删除合同？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/contractDraft/manager', {
+								ids: ids,
+								operateType: 1
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
+			},
+			restore() {
+				let ids = []
+				this.msg.contractDraft.result.forEach(item => {
+					if (item.checked) {
+						ids.push(item.id)
+					}
+				})
+
+				if (ids.length == 0) {
+					that.$toast("请选择汇票")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: "是否复原汇票？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/contractDraft/manager', {
+								ids: ids,
+								operateType: 2
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall = false
+								that.quan = false
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
 			},
 			// 删除图片
 			deletePic(event) {
@@ -338,26 +615,30 @@
 			padding: 30rpx 0;
 			padding-top: 50rpx;
 		}
-		.tipup{
+
+		.tipup {
 			display: flex;
 		}
-		.upbox{
+
+		.upbox {
 			margin-left: 30rpx;
 			width: 490rpx;
 		}
+
 		.yu {
-		
+
 			display: block;
 			width: 120rpx;
 			color: #BEBDBB;
 		}
+
 		.tip {
 			padding-bottom: 30rpx;
 			font-size: 28rpx;
 			display: flex;
 			justify-content: space-between;
 
-			
+
 
 			.yuna {}
 		}

pages/alldeatil/supplierdetail.vue

@@ -38,7 +38,7 @@
 				<text class="pr" v-if="!form.identifyPicList">暂无</text>
 				<view class="fanuppic" v-if="form.identifyPicList.length>0">
 					<view class="picbox" v-for="item in form.identifyPicList">
-						<image :src="item" mode="aspectFill"></image>
+						<image :src="item" mode="aspectFill" @click="prviewPic(item)"></image>
 					</view>
 				</view>
 			</view>
@@ -47,7 +47,7 @@
 				<text class="pr" v-if="!form.proxyFileList">暂无</text>
 				<view class="fanuppic" v-if="form.proxyFileList.length>0">
 					<view class="picbox" v-for="item in form.proxyFileList">
-						<image src="/static/img/upuer.png" mode="aspectFill"></image>
+						<image :src="item" mode="aspectFill" @click="prviewPic(item)"></image>
 					</view>
 				</view>
 			</view>
@@ -57,10 +57,25 @@
 			</view>
 		</view>
 		<view style="width: 100%;height: 80rpx;"></view>
-		<view class="newbill flex1" @click="tryAgain">
+
+		<view class="newbill flex1" v-if="form.isDeleted==0&&form.statusText=='未认证'">
+			<view class="choosebtn">
+				<view class="delbtn flex1" @click="examineFail">认证失败</view>
+				<view class="succbtn flex1" @click="examineSuccess">认证成功</view>
+			</view>
+
+		</view>
+		<view class="newbill flex1" v-if="form.isDeleted==0&&form.statusText=='已认证'" @click="forbidden">
+			<view class="newbillbtn">
+				<text>禁用</text>
+			</view>
+
+		</view>
+		<view class="newbill flex1" @click="resert()" v-if="form.isDeleted==1">
 			<view class="newbillbtn">
 				<text>复原</text>
 			</view>
+
 		</view>
 		<!-- 弹出层 -->
 		<u-popup :show="show" @close="close" @open="open" mode="center">
@@ -72,12 +87,12 @@
 					<image src="../../static/img/foricon.png" mode="aspectFill"></image>
 				</view> -->
 				<text class="keytitle">重置密码</text>
-				<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="50">
-					<u-form-item label="旧密码" prop="pwd.oldPassword" borderBottom ref="item1">
+				<u--form labelPosition="left" :model="model1"  ref="form1" labelWidth="50">
+				<!-- 	<u-form-item label="旧密码" prop="pwd.oldPassword" borderBottom ref="item1">
 						<u--input v-model="pwd.oldPassword" border="none" password></u--input>
-					</u-form-item>
+					</u-form-item> -->
 					<u-form-item label="新密码" prop="pwd.newPassword" borderBottom ref="item1">
-						<u--input v-model="pwd.newPassword" border="none" password></u--input>
+						<u--input v-model="pwd.password" border="none" password></u--input>
 					</u-form-item>
 				</u--form>
 				<!-- <text class="remindtitle">请电联系管理员，进行密码确定</text> -->
@@ -89,6 +104,7 @@
 </template>
 
 <script>
+	let that
 	export default {
 		data() {
 			return {
@@ -96,28 +112,28 @@
 
 				},
 				pwd: {
-					oldPassword: '',
-					newPassword: ''
+					password: '',
 				},
 				show: false,
-				rules: {
-					'pwd.oldPassword': {
-						type: 'string',
-						required: true,
-						message: '请填写旧密码',
-						trigger: ['blur', 'change']
-					},
-					'pwd.newPassword': {
-						type: 'string',
-						required: true,
-						message: '请填写新密码',
-						trigger: ['blur', 'change']
-					},
-				},
+				// rules: {
+				// 	'pwd.oldPassword': {
+				// 		type: 'string',
+				// 		required: true,
+				// 		message: '请填写旧密码',
+				// 		trigger: ['blur', 'change']
+				// 	},
+				// 	'pwd.newPassword': {
+				// 		type: 'string',
+				// 		required: true,
+				// 		message: '请填写新密码',
+				// 		trigger: ['blur', 'change']
+				// 	},
+				// },
 
 			}
 		},
 		onLoad(o) {
+			that = this
 			if (o.id) {
 				this.id = o.id
 			}
@@ -148,21 +164,177 @@
 					console.log(err)
 				})
 			},
-			makeSurePwd(){
+			prviewPic(item) {
+				let pics=[]
+				pics.push(item)
+				uni.previewImage({
+					urls: pics,
+				});
+			},
+			makeSurePwd() {
 				uni.showLoading()
-				uni.$u.http.post('/api/Supplier/password',this.pwd, {
+				let pwd={
+					password:this.pwd.password,
+					supplierId:this.form.id
+				}
+				uni.$u.http.post('/api/Account/password/resetSupplier', pwd, {
 					custom: {
 						auth: true
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.$toast("申请成功")
+					this.$toast("重置成功")
 					this.show = false
 				}).catch((err) => {
 					console.log(err)
 					uni.hideLoading()
 					this.$toast(err.msg)
 				})
+			},
+			resert() {
+				let ids = []
+				ids.push(this.id)
+				uni.showModal({
+					title: '提示',
+					content: "是否认复原？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Supplier/manage', {
+								ids: ids,
+								operateType: 2
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+			},
+			forbidden() {
+				let ids = []
+				ids.push(this.id)
+				uni.showModal({
+					title: '提示',
+					content: "是否认禁用？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Supplier/manage', {
+								ids: ids,
+								operateType: 1
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+			},
+			examineSuccess() {
+				let ids = []
+				ids.push(this.id)
+				uni.showModal({
+					title: '提示',
+					content: "是否认证成功？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Supplier/manage', {
+								ids: ids,
+								operateType: 3
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
+			},
+			examineFail() {
+				let ids = []
+				ids.push(this.id)
+				uni.showModal({
+					title: '提示',
+					content: "是否认证失败？",
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading()
+							uni.$u.http.post('/api/Supplier/manage', {
+								ids: ids,
+								operateType: 4
+							}, {
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+
+								that.$toast("操作成功")
+								setTimeout(() => {
+									that.init()
+								}, 500)
+
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+
+						} else if (res.cancel) {
+
+						}
+					}
+				})
+
 			}
 
 		}
@@ -267,7 +439,7 @@
 
 	.forgetbox {
 		width: 600rpx;
-		height: 600rpx;
+		height: 500rpx;
 		background-color: #fff;
 		display: flex;
 		flex-direction: column;

pages/alldeatil/upcontract.vue

@@ -55,7 +55,7 @@
 		<view v-for="(item,index) in form.contractDrafts" :key="index">
 			<view class="addtitle flex6">
 				<text class="ty">汇票{{index+1}}</text>
-				<!-- <text class="tde">删除</text> -->
+				<text class="tde" @click="deleBill">删除</text>
 			</view>
 			<view class="listitem">
 				<text class="lys">汇票名称</text>
@@ -81,13 +81,14 @@
 				<text class="lys">出票人</text>
 				<view class="chosbox">
 					<uni-data-select v-model="item.drawers" :localdata="range2" @change="changedrPerson"
-						:plname="'搜索出票人名称'" ></uni-data-select>
+						:plname="'搜索出票人名称'"></uni-data-select>
 				</view>
 			</view>
 			<view class="listitem">
 				<text class="lys">金额</text>
 				<view class="inbox">
-					<input type="digit" v-model="item.money" placeholder="请输入汇票的金额" placeholder-style="color:#BEBDBB" @blur="getMoney" @input="getMoneyIndex(index)"/>
+					<input type="digit" v-model="item.money" placeholder="请输入汇票的金额" placeholder-style="color:#BEBDBB"
+						@blur="getMoney" @input="getMoneyIndex(index)" />
 				</view>
 			</view>
 			<view class="listitem">
@@ -129,7 +130,7 @@
 			<view class="listitem">
 				<text class="lys">最高贷款额度</text>
 				<view class="inbox">
-					
+
 					<input type="text" v-model="item.loanLimit" placeholder="自动计算得出" placeholder-style="color:#1F242A"
 						disabled="true" />
 				</view>
@@ -139,14 +140,15 @@
 					<text class="lys">服务费率</text>
 					<view class="inbox">
 						<input type="digit" v-model="item.serviceRate" placeholder="显示对于费率"
-							placeholder-style="color:#BEBDBB" @blur="getserviceRate" @input="getserviceRateIndex(index)"/>
+							placeholder-style="color:#BEBDBB" @blur="getserviceRate"
+							@input="getserviceRateIndex(index)" />
 					</view>
 				</view>
 				<view class="listitem">
 					<text class="lys">服务费</text>
 					<view class="inbox">
-						<input type="text" v-model="item.serviceMoney"
-							placeholder="自动计算得出" placeholder-style="color:#BEBDBB" disabled="true" />
+						<input type="text" v-model="item.serviceMoney" placeholder="自动计算得出"
+							placeholder-style="color:#BEBDBB" disabled="true" />
 					</view>
 
 				</view>
@@ -156,7 +158,8 @@
 					<text class="lys">利率</text>
 					<view class="inbox">
 						<input type="digit" v-model="item.interestRate" placeholder="显示对于利率"
-							placeholder-style="color:#BEBDBB" @blur="getinterestRate"  @input="getinterestRateIndex(index)"/>
+							placeholder-style="color:#BEBDBB" @blur="getinterestRate"
+							@input="getinterestRateIndex(index)" />
 					</view>
 				</view>
 				<view class="listitem">
@@ -174,9 +177,9 @@
 						style="font-size: 24rpx; color:#D05C39;padding-top: 45rpx;padding-left: 20rpx;">*支持上传pdf、jpg/jpeg、png格式</text>
 				</view>
 
-				<view class="inbox" style="border: none;padding-bottom: 0;" @click="checkIndex(index)">
-					<u-upload :fileList="item.picUrls" @afterRead="afterRead" @delete="deletePic" name="4" multiple
-						:maxCount="10" width="100" height="100" ></u-upload>
+				<view class="inbox" style="border: none;padding-bottom: 0;"  @click="checkIndex(index)">
+					<u-upload :fileList="item.picUrling" @afterRead="afterRead" @delete="deletePic" :name="index+4"
+				:checkedindex=index		multiple :maxCount="10" width="100" height="100"></u-upload>
 				</view>
 			</view>
 		</view>
@@ -220,7 +223,7 @@
 				fileList2: [],
 				fileList3: [],
 				fileList4: [],
-				allindex:0,
+				allindex: 0,
 				form: {
 					name: '',
 					supplierId: '',
@@ -230,10 +233,10 @@
 					contractDrafts: [{
 						name: '',
 						draftNo: '',
-						acceptor:'',
+						acceptor: '',
 						acceptorId: '',
 						drawersId: '',
-						drawers:'',
+						drawers: '',
 						money: '',
 						acceptDate: '',
 						issueDate: '',
@@ -241,25 +244,26 @@
 						loanLimit: '',
 						expectDiscountDate: '',
 						picUrls: [],
+						picUrling:[],
 						serviceRate: '',
-						interestRate:'',
+						interestRate: '',
 						interest: '',
 						serviceMoney: '',
-						limitTime:0,
-						expectDiscountDateTime:0,
-						expectDiscountDate:0
+						limitTime: 0,
+						expectDiscountDateTime: 0,
+						expectDiscountDate: 0
 					}, ],
 				},
-				
+
 				range1: [],
 				range2: [],
-				myindex:0,
-				sindex:0,
-				rindex:0
+				myindex: 0,
+				sindex: 0,
+				rindex: 0
 			}
 		},
 		onLoad() {
-			that=this
+			that = this
 			this.init()
 			this.form.supplierId = uni.getStorageSync('supplierId')
 			// console.log(this.form.supplierId,778)
@@ -267,10 +271,10 @@
 
 		},
 		methods: {
-			loadTime(){
+			loadTime() {
 				let myDate = new Date()
 				// let wk = Date.parse(new Date());
-				let wk=myDate.getTime()
+				let wk = myDate.getTime()
 				console.log(wk)
 				let yy = String(myDate.getFullYear())
 				// let mm = myDate.getMonth() + 1
@@ -282,10 +286,10 @@
 					item.issueDate = nowDate
 					item.expireDate = nowDate
 					item.expectDiscountDate = nowDate
-					item.expectDiscountDateTime=wk
-					item.issueDateTime=wk
+					item.expectDiscountDateTime = wk
+					item.issueDateTime = wk
 					let nTime = item.expectDiscountDateTime - item.issueDateTime
-					item.limitTime = Math.floor(nTime / 86400000)+1;
+					item.limitTime = Math.floor(nTime / 86400000) + 1;
 				})
 			},
 			init() {
@@ -309,7 +313,7 @@
 				}).catch((err) => {})
 				// 出票人列表
 				uni.$u.http.post('/api/Drawer/search', {
-			
+
 				}, {
 					custom: {
 						auth: true
@@ -323,136 +327,165 @@
 					})
 				}).catch((err) => {})
 			},
-			getinterestRateIndex(index){
-				this.rindex=index
+			deleBill(index){
+				uni.showModal({
+					title:"提示",
+					content:"是否确认删除?",
+					success:(res)=>{
+						if(res.confirm){
+							that.form.contractDrafts.splice(index,1)
+						}
+						
+					}
+				})
+				
+			},
+			getinterestRateIndex(index) {
+				this.rindex = index
 			},
-			getinterestRate(event){
-				this.form.contractDrafts[this.rindex].interestRate=Number(event.detail.value)
+			getinterestRate(event) {
+				this.form.contractDrafts[this.rindex].interestRate = Number(event.detail.value)
 				this.getloanLimt(this.rindex)
-					this.getInterMoney(this.rindex)
-					this.getSerMoney(this.rindex)
+				this.getInterMoney(this.rindex)
+				this.getSerMoney(this.rindex)
 			},
-			getserviceRateIndex(index){
-				this.sindex=index
+			getserviceRateIndex(index) {
+				this.sindex = index
 			},
-			getserviceRate(event){
-				this.form.contractDrafts[this.sindex].serviceRate=Number(event.detail.value)
+			getserviceRate(event) {
+				this.form.contractDrafts[this.sindex].serviceRate = Number(event.detail.value)
 				this.getloanLimt(this.sindex)
 				this.getInterMoney(this.sindex)
 				this.getSerMoney(this.sindex)
 			},
-			getMoneyIndex(index){
-				this.myindex=index
+			getMoneyIndex(index) {
+				this.myindex = index
 			},
-			getMoney(event){
-				this.form.contractDrafts[this.myindex].money=Number(event.detail.value)
+			getMoney(event) {
+				this.form.contractDrafts[this.myindex].money = Number(event.detail.value)
 				this.getloanLimt(this.myindex)
 				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+1).toFixed(2)
+			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 + 1).toFixed(2)
 				}
-	
+
 			},
-			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+1)*this.form.contractDrafts[i].serviceRate*this.form.contractDrafts[i].limitTime/360).toFixed(2)
+			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 + 1) * this.form.contractDrafts[i].serviceRate * this
+						.form.contractDrafts[i].limitTime / 360).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+1)*this.form.contractDrafts[i].interestRate*this.form.contractDrafts[i].limitTime/360).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 + 1) * this.form.contractDrafts[i].interestRate * this.form
+						.contractDrafts[i].limitTime / 360).toFixed(2)
 				}
-				
+
 			},
 			upAll() {
 				uni.showModal({
 					title: '提示',
 					content: '是否上传合同？',
-					success: function (res) {
+					success: function(res) {
 						if (res.confirm) {
-							let form=that.form
-							if(form.name.length==0){
+							let form = that.form
+							if (form.name.length == 0) {
 								that.$toast('请输入合同名称')
 								return
 							}
-							if(that.fileList1.length==0){
+							if (that.fileList1.length == 0) {
 								that.$toast('请上传合同附件')
 								return
 							}
-							if(form.fileList2.length==0){
+							if (that.fileList2.length == 0) {
 								that.$toast('请上传发票附件')
 								return
 							}
-							if(form.fileList3.length==0){
+							if (that.fileList3.length == 0) {
 								that.$toast('请上贸易合同')
 								return
 							}
-							form.contractDrafts.forEach(i=>{
-								if(i.name.length==0){
+							form.contractDrafts.forEach(i => {
+								if (i.name.length == 0) {
 									that.$toast('请输入汇票名称')
 									return
 								}
-								if(form.draftNo.length==0){
+								if (i.draftNo.length == 0) {
 									that.$toast('请输入汇票号码')
 									return
 								}
-								if(form.acceptor.length==0){
+								if (i.acceptor.length == 0) {
 									that.$toast('请选择承兑人')
 									return
 								}
-								if(form.drawers.length==0){
+								if (i.drawers.length == 0) {
 									that.$toast('请选择出票人')
 									return
 								}
-								if(form.money.length==0){
+								if (i.money.length == 0) {
 									that.$toast('请输入金额')
 									return
 								}
-								
-								if(form.serviceRate.length==0){
+
+								if (i.serviceRate.length == 0) {
 									that.$toast('请输入服务费率')
 									return
 								}
-								if(form.interestRate.length==0){
+								if (i.interestRate.length == 0) {
 									that.$toast('请输入利率')
 									return
 								}
-								if(form.picUrls.length==0){
+								if (i.picUrls.length == 0) {
 									that.$toast('请上传附件')
 									return
 								}
-								
+
 							})
-							
-							that.range2.forEach(item=>{
-								form.contractDrafts.forEach(i=>{
-									if(that.range2[i.drawers].name==item.name){
-										i.drawersId=item.id
+							that.range2.forEach(item => {
+								form.contractDrafts.forEach(i => {
+									if (that.range2[i.drawers].name == item.name) {
+										i.drawersId = item.id
 									}
 								})
 							})
-							that.range1.forEach(item=>{
-								form.contractDrafts.forEach(i=>{
-									if(that.range1[i.acceptor].name==item.name){
-										i.acceptorId=item.id
+							that.range1.forEach(item => {
+								form.contractDrafts.forEach(i => {
+									if (that.range1[i.acceptor].name == item.name) {
+										i.acceptorId = item.id
 									}
 								})
 							})
-							that.fileList1.forEach(item=>{
+						
+							that.fileList1.forEach(item => {
 								form.invoicePics.push(item.url)
 							})
-							that.fileList2.forEach(item=>{
+							that.fileList2.forEach(item => {
 								form.pics.push(item.url)
 							})
-							that.fileList3.forEach(item=>{
+							that.fileList3.forEach(item => {
 								form.tradePics.push(item.url)
 							})
+							form.contractDrafts.forEach(item=>{
+								item.picUrling.forEach(i=>{
+									item.picUrls.push(i.url)
+								})
+							})
 							uni.showLoading()
-							uni.$u.http.post('/api/Contract',that.form, {
+							uni.$u.http.post('/api/Contract', form, {
 								custom: {
 									auth: true
 								}
@@ -464,20 +497,19 @@
 								that.$toast(err.msg)
 								console.log(err)
 							})
-						} else if (res.cancel) {
-						}
+						} else if (res.cancel) {}
 					}
 				});
-			
+
 			},
 			addNewBill() {
 				let form = [{
 					name: '',
 					draftNo: '',
-					acceptor:'',
+					acceptor: '',
 					acceptorId: '',
 					drawersId: '',
-					drawers:'',
+					drawers: '',
 					money: '',
 					acceptDate: '',
 					issueDate: '',
@@ -485,17 +517,18 @@
 					loanLimit: '',
 					expectDiscountDate: '',
 					picUrls: [],
+					picUrling:[],
 					serviceRate: '',
-					interestRate:'',
+					interestRate: '',
 					interest: '',
 					serviceMoney: '',
-					limitTime:0,
-					expectDiscountDateTime:0,
-					expectDiscountDate:0
+					limitTime: 0,
+					expectDiscountDateTime: 0,
+					expectDiscountDate: 0
 				}]
 				let myDate = new Date()
 				// let wk = Date.parse(new Date());
-				let wk=myDate.getTime()
+				let wk = myDate.getTime()
 				console.log(wk)
 				let yy = String(myDate.getFullYear())
 				// let mm = myDate.getMonth() + 1
@@ -507,10 +540,10 @@
 					item.issueDate = nowDate
 					item.expireDate = nowDate
 					item.expectDiscountDate = nowDate
-					item.expectDiscountDateTime=wk
-					item.issueDateTime=wk
+					item.expectDiscountDateTime = wk
+					item.issueDateTime = wk
 					let nTime = item.expectDiscountDateTime - item.issueDateTime
-					item.limitTime = Math.floor(nTime / 86400000)+1;
+					item.limitTime = Math.floor(nTime / 86400000) + 1;
 				})
 				this.form.contractDrafts.push(form[0])
 			},
@@ -541,7 +574,7 @@
 				} else if (this.opdanum == 4) {
 					form[this.index].expectDiscountDateTime = e.value
 					let nTime = form[this.index].expectDiscountDateTime - form[this.index].issueDateTime
-					form[this.index].limitTime = Math.floor(nTime / 86400000)+1;
+					form[this.index].limitTime = Math.floor(nTime / 86400000) + 1;
 					form[this.index].expectDiscountDate = timeFormat(e.value, 'yyyy-mm-dd')
 				}
 				// console.log(this.index, this.opdanum)
@@ -559,73 +592,102 @@
 			change(e) {
 				// console.log('change', e)
 			},
-			checkIndex(index){
-				this.allindex=index
+			checkIndex(index) {
+				this.allindex = index
 				console.log(index)
 			},
 			// 删除图片
-			deletePic(event) {
-				if(event.name==4){
-						this.form.contractDrafts[this.allindex].picUrls.splice(event.index, 1)
-					}else{
-						this[`fileList${event.name}`].splice(event.index, 1)
-					}
-				
+			async deletePic(event) {
+				// this.checkIndex(index) 
+				console.log(this.allindex,789)
+				if (event.name >= 4) {
+					 this.form.contractDrafts[this.allindex].picUrling.splice(event.index, 1)
+				} else {
+					this[`fileList${event.name}`].splice(event.index, 1)
+				}
+
 			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
-				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
-				lists.map((item) => {
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
+
+				if (event.name >= 4) {
+					let lists = [].concat(event.file)
+					let icurls= this.form.contractDrafts[this.allindex].picUrling
+					let fileListLen = icurls.length
+					lists.map((item) => {
+						icurls.push({
+							...item,
+							status: 'uploading',
+							message: '上传中'
+						})
 					})
-				})
-				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					}))
-					if(event.name==4){
-						console.log(this.allindex,9999)
-						this[`fileList${event.name}`].forEach(item=>{
-							this.form.contractDrafts[this.allindex].picUrls.push(item.url)
+					for (let i = 0; i < lists.length; i++) {
+						const result = await this.uploadFilePromise(lists[i].url)
+						let obj={
+							
+						}
+						console.log(result)
+						// this.form.contractDrafts[this.allindex].picUrls.push(result)
+						let item = icurls[fileListLen]
+						icurls.splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+						
+						fileListLen++
+					} 
+		
+				
+					}else {
+						let lists = [].concat(event.file)
+						let fileListLen = this[`fileList${event.name}`].length
+						lists.map((item) => {
+							this[`fileList${event.name}`].push({
+								...item,
+								status: 'uploading',
+								message: '上传中'
+							})
 						})
-					}
-					
-					fileListLen++
-				}
-			},
-			uploadFilePromise(url) {
-				return new Promise((resolve, reject) => {
-					let a = uni.uploadFile({
-						url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
-						filePath: url,
-						name: 'File',
-						header: {
-							"User-Agent": "apifox/1.0.0 (https://www.apifox.cn)"
-						},
-						formData: {
-							File: JSON.stringify(url),
-						},
-						success: (res) => {
-							console.log(res)
-							let request=JSON.parse(res.data)
-							setTimeout(() => {
-								resolve(request.data.file)
-							}, 1000)
+						for (let i = 0; i < lists.length; i++) {
+							const result = await this.uploadFilePromise(lists[i].url)
+							let item = this[`fileList${event.name}`][fileListLen]
+							this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+								status: 'success',
+								message: '',
+								url: result
+							}))
+							fileListLen++
 						}
-					});
-				})
-			},
+						
+
+					}
+				},
+				uploadFilePromise(url) {
+					return new Promise((resolve, reject) => {
+						let a = uni.uploadFile({
+							url: mainUrl + '/api/File', // 仅为示例，非真实的接口地址
+							filePath: url,
+							name: 'File',
+							header: {
+								"User-Agent": "apifox/1.0.0 (https://www.apifox.cn)"
+							},
+							formData: {
+								File: JSON.stringify(url),
+							},
+							success: (res) => {
+								console.log(res)
+								let request = JSON.parse(res.data)
+								setTimeout(() => {
+									resolve(request.data.file)
+								}, 1000)
+							}
+						});
+					})
+				},
+			}
 		}
-	}
 </script>
 
 <style lang="scss">

pages/bsinessadmin/register.vue

@@ -106,7 +106,7 @@
 					return
 				}
 				let form = this.form
-				if(thie.checked==1){
+				if(this.checked==1){
 					if(this.form.name.length==0){
 						this.$toast("请输入您的账号")
 						return

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,30 +101,30 @@
 				
 				let form=this.form
 				if(form.name.length==0){
-					this.$toast("输入供货商名陈")
+					this.$toast("输入供货商名称")
 					return
 				}
-				if(form.name.socialCode==0){
+				if(form.socialCode.length==0){
 					this.$toast("请输入统一社会信用代码")
 					return
 				}
-				if(form.name.legalPerson==0){
+				if(form.legalPerson.length==0){
 					this.$toast("请输入法人姓名")
 					return
 				}
-				if(form.name.contacts==0){
+				if(form.contacts.length==0){
 					this.$toast("请输入联系人")
 					return
 				}
-				if(form.name.contactsMobile==0){
+				if(form.contactsMobile.length==0){
 					this.$toast("请输入联系电话")
 					return
 				}
-				if(form.name.identifyPics==0){
+				if(form.identifyPics.length==0){
 					this.$toast("请上传认证照片")
 					return
 				}
-				if(form.name.proxyFile==0){
+				if(form.proxyFile.length==0){
 					this.$toast("请上传授权委托书")
 					return
 				}
@@ -160,8 +160,10 @@
 
 			},
 			upText(e, i) {
-				console.log(e, i)
 				var list = []
+				uni.showLoading({
+					
+				})
 				uni.uploadFile({
 					url: mainUrl + '/api/File',
 					filePath: e,
@@ -175,6 +177,7 @@
 						// file_name: fileName,
 					},
 					success(re) {
+						uni.hideLoading()
 						let res = JSON.parse(re.data)
 						if (res.code == 200) {
 							if (i == 1) {

pages/drawer/drawer.vue

@@ -15,12 +15,12 @@
 		<view class="acpcardlist">
 			<view class="lable " v-for="(item,index) in listall" :key="index">
 				<view class="radiobox" v-if="editall">
-					<radio :value="index" :checked="false" color="#D8AB5A" @click="checkBox(item.id)"/>
+					<radio :value="index" :checked="item.checked" color="#D8AB5A" @click="checkBox(item.id)"/>
 				</view>
 				<view class="acpcard" @click="acpDetail(item.id)">
 					<view class="allmsg">
-						<view class="cicle"  v-if="item.status==0"></view>
-						<view class="cicle" v-if="item.status==1" style="background-colr:#D05C39"></view>
+						<view class="cicle"  v-if="item.status==0" style="background-color: #D8AB5A;"></view>
+						<view class="cicle" v-else style="background-color: #D05C39"></view>
 						<view class="acpcont">
 							<view class="acpname">
 								<text>{{item.name}}</text>
@@ -84,8 +84,8 @@
 					</view>
 				</view>
 				<view class="choosebtn">
-					<view class="delbtn flex1">删除</view>
-					<view class="restorebtn flex1">复原</view>
+					<view class="delbtn flex1" @click="deleteDrawer">删除</view>
+					<view class="restorebtn flex1" @click="backDrawer">复原</view>
 				</view>
 			</view>
 		</u-popup>
@@ -94,6 +94,7 @@
 </template>
 
 <script>
+	let that
 	import tabar from "@/componet/tabbar/tabbar.vue"
 	export default {
 		components:{
@@ -103,8 +104,10 @@
 			return {
 				editall:false,
 				quan:false,
-				listall:'',
+				listall:[],
+				pageIndex:1,
 				total:'',
+				nomore:false,
 				show:false,
 				contract_status:0,
 				ctrstatus: [{
@@ -127,14 +130,29 @@
 			}
 		},
 		onLoad() {
+			that=this
 			this.init()
 		},
+		onshow(){
+			this.init()
+		},
+		// 下拉到底部后加载新数据
+		    onReachBottom() {
+		      //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+		      if (this.listall.length >= this.pageIndex * 10) {
+		        this.pageIndex++;//页数加一
+				this.init();//回调接口
+		      }else{
+				  this.nomore=true
+			  }
+		      
+		    },
 		methods: {
 			init(){
 				uni.showLoading()
 				uni.$u.http.post('/api/Drawer/search',{
-					// pageIndex:1,
-					// pageSize:10,
+					pageIndex:this.pageIndex,
+					pageSize:10,
 					// startTime:'',
 					// endTime:'',
 					// name:'',
@@ -146,11 +164,18 @@
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.listall=res.result
 					this.total=res.total
-					this.listall.forEach(item=>{
-						item.checked=false
-					})
+					
+					let list=res.result
+					if(list.length>0){
+						list.forEach(item=>{
+							item.checked=false
+							this.listall.push(item)
+						})
+						if(list.length<10){
+							that.nomore=true
+						}
+					}
 				}).catch((err) => {
 					uni.hideLoading()
 					console.log(err)
@@ -218,6 +243,101 @@
 				uni.navigateTo({
 					url:'/pages/alldeatil/addnewdrawer'
 				})
+			},
+			backDrawer(){
+				
+			},
+			deleteDrawer(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content:"是否批量删除？",
+					success: function (res) {
+							if (res.confirm) {
+								uni.showLoading()
+								uni.$u.http.post('/api/Drawer/manager',
+								{
+									ids:ids,
+									operateType:1
+								},
+								{
+									custom: {
+										auth: true
+									}
+								}).then((res) => {
+									uni.hideLoading()
+									that.editall=false
+									that.quan=false
+									that.$toast("操作成功")
+									setTimeout(()=>{
+										that.init()
+									},500)
+									
+								}).catch((err) => {
+									uni.hideLoading()
+									that.$toast(err.msg)
+								})
+							
+							} else if (res.cancel) {
+							
+							}
+						}
+				})
+			},
+			backDrawer(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content:"是否批量复原？",
+					success: function (res) {
+							if (res.confirm) {
+								uni.showLoading()
+								uni.$u.http.post('/api/Drawer/manager',
+								{
+									ids:ids,
+									operateType:2
+								},
+								{
+									custom: {
+										auth: true
+									}
+								}).then((res) => {
+									uni.hideLoading()
+									that.editall=false
+									that.quan=false
+									that.$toast("操作成功")
+									setTimeout(()=>{
+										that.init()
+									},500)
+									
+								}).catch((err) => {
+									uni.hideLoading()
+									that.$toast(err.msg)
+								})
+							
+							} else if (res.cancel) {
+							
+							}
+						}
+				})
 			}
 		}
 	}
@@ -277,7 +397,7 @@
 					width: 28rpx;
 					height: 28rpx;
 					border-radius: 50%;
-					background-color: #D8AB5A;
+					
 					margin-top: 8rpx;
 				}
 				.acpcont{

pages/index/index.vue

@@ -205,7 +205,9 @@
 				draft_status: '',
 				time_status: '',
 				listall:[],
+				pageIndex:1,
 				total:'',
+				nomore:false,
 				ctrstatus: [{
 					title: "合同状态",
 					list: [{
@@ -278,12 +280,26 @@
 			this.state = this.$store.state.admin
 			this.init()
 		},
+		onshow(){
+			this.init()
+		},
+		// 下拉到底部后加载新数据
+		    onReachBottom() {
+		      //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+		      if (this.listall.length >= this.pageIndex * 10) {
+		        this.pageIndex++;//页数加一
+				this.init();//回调接口
+		      }else{
+				  this.nomore=true
+			  }
+		      
+		    },
 		methods: {
 			
 			init() {
 				uni.showLoading()
 				uni.$u.http.post('/api/Contract/search',{
-					pageIndex:1,
+					pageIndex:this.pageIndex,
 					pageSize:10,
 					// startTime:'',
 					// endTime:'',
@@ -296,11 +312,18 @@
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.listall=res.result
 					this.total=res.total
-					this.listall.forEach(item=>{
-						item.checked=false
-					})
+					
+					let list=res.result
+					if(list.length>0){
+						list.forEach(item=>{
+							item.checked=false
+							this.listall.push(item)
+						})
+						if(list.length<10){
+							that.nomore=true
+						}
+					}
 				}).catch((err) => {
 					uni.hideLoading()
 					console.log(err)

pages/mine/mine.vue

@@ -114,6 +114,9 @@
 			})
 			this.init()
 		},
+		onshow(){
+			this.init()
+		},
 		methods: {
 			init(){
 				uni.showLoading()

pages/supplier/supplier.vue

@@ -18,10 +18,10 @@
 		<view class="cardlist">
 			<view class="lable" v-for="(item,index) in listall" style="width: 100%;" @click.stop="moveDetail(item.id)">
 				<view class="radiobox" v-if="editall">
-					<radio :value="index" :checked="false" color="#D8AB5A" @click="checkBox(item.id)" />
+					<radio :value="index" :checked="item.checked" color="#D8AB5A" @click="checkBox(item.id)" />
 				</view>
 				<view class="card">
-					<view class="passreview" v-if="item.status==1">
+					<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">
@@ -30,13 +30,13 @@
 					<view class="passreview" v-if="item.status==3">
 						<image src="../../static/img/fail.png" mode="aspectFill"></image>
 					</view>
-					<view class="passreview" v-if="item.status==4">
+					<view class="passreview" v-if="item.isDeleted==1">
 						<image src="../../static/img/disabled.png" mode="aspectFill"></image>
 					</view>
-					<view class="cicle" v-if="item.status==1"></view>
+					<view class="cicle" v-if="item.status==1&&item.isDeleted==0"></view>
 					<view class="cicle" v-if="item.status==0" style="background-color: #D05C39;"></view>
 					<view class="cicle" v-if="item.status==3" style="background-color: #1F242A;"></view>
-					<view class="cicle" v-if="item.status==4" style="background-color: #BEBDBB;"></view>
+					<view class="cicle" v-if="item.isDeleted==1" style="background-color: #BEBDBB;"></view>
 					<view class="innerbox">
 
 						<text class="cardtitle">{{item.name}}</text>
@@ -113,14 +113,14 @@
 						<text>全选</text>
 					</view>
 					<view class="anniu">
-						<text class="usa">删除</text>
-						<text class="usa">复原</text>
+						<text class="usa" @click="dele()">删除</text>
+						<text class="usa" @click="restore()">复原</text>
 						<text @click="selectDown" class="usa">完成</text>
 					</view>
 				</view>
 				<view class="choosebtn">
-					<view class="delbtn flex1">审核失败</view>
-					<view class="restorebtn flex1">审核成功</view>
+					<view class="delbtn flex1" @click="examineFail()">审核失败</view>
+					<view class="restorebtn flex1" @click="examineSuccess()">审核成功</view>
 				</view>
 			</view>
 		</u-popup>
@@ -145,7 +145,9 @@
 				endTime: "请选择",
 				value1: '',
 				intime: 1,
+				pageIndex:1,
 				total:'',
+				nomore:false,
 				contract_status: '',
 				draft_status: '',
 				time_status: '',
@@ -176,18 +178,32 @@
 						
 					]
 				}],
-				listall: [],
+			
 			}
 		},
 		onLoad() {
 			this.state = this.$store.state.admin
 			this.init()
 		},
+		onshow(){
+			this.init()
+		},
+		// 下拉到底部后加载新数据
+		    onReachBottom() {
+		      //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+		      if (this.listall.length >= this.pageIndex * 10) {
+		        this.pageIndex++;//页数加一
+				this.init();//回调接口
+		      }else{
+				  this.nomore=true
+			  }
+		      
+		    },
 		methods: {
 			init() {
 				uni.showLoading()
 				uni.$u.http.post('/api/Supplier/search', {
-					pageIndex: 1,
+					pageIndex: this.pageIndex,
 					pageSize: 10,
 					// startTime:'',
 					// endTime:'',
@@ -200,11 +216,17 @@
 					}
 				}).then((res) => {
 					uni.hideLoading()
-					this.listall = res.result
 					this.total=res.total
-					this.listall.forEach(item => {
-						item.checked = false
-					})
+					let list=res.result
+					if(list.length>0){
+						list.forEach(item=>{
+							item.checked=false
+							this.listall.push(item)
+						})
+						if(list.length<10){
+							that.nomore=true
+						}
+					}
 				}).catch((err) => {
 					uni.hideLoading()
 					console.log(err)
@@ -253,8 +275,9 @@
 					item.checked = false
 				})
 			},
-			allSelect() {
-				let list = this.listall
+			allSelect(){
+				let list=this.listall
+				console.log(this.quan,778)
 				if(this.quan){
 					list.forEach(item => {
 						item.checked =true
@@ -265,10 +288,9 @@
 					})
 				}
 				this.listall = JSON.parse(JSON.stringify(list))
-				console.log(this.listall)
 			},
-			makeSureAll() {
-				this.quan = !this.quan
+			makeSureAll(){
+				this.quan=!this.quan
 				this.allSelect()
 			},
 			chooseDate(e) {
@@ -318,7 +340,198 @@
 				} else if (title == "上传日期") {
 					this.time_status = k
 				}
-			}
+			},
+			examineFail(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					this.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否批量审核失败？',
+					success: function (res) {
+						if (res.confirm) {
+							
+							uni.showLoading()
+							uni.$u.http.post('/api/Contract/manage', 
+							{
+								ids:ids,
+								operateType:4
+							},
+							{
+								custom: {
+									auth: true
+								}
+							}).then((res) => {
+								uni.hideLoading()
+								that.editall=false
+								that.quan=false
+								that.$toast("操作成功")
+								setTimeout(()=>{
+									
+									that.init()
+								},500)
+							}).catch((err) => {
+								uni.hideLoading()
+								that.$toast(err.msg)
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+				
+			},
+			dele(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content:"是否批量删除？",
+					success: function (res) {
+							if (res.confirm) {
+								
+								uni.showLoading()
+								uni.$u.http.post('/api/Contract/manage',
+								{
+									ids:ids,
+									operateType:1
+								},
+								{
+									custom: {
+										auth: true
+									}
+								}).then((res) => {
+									uni.hideLoading()
+									that.editall=false
+									that.quan=false
+									that.$toast("操作成功")
+									setTimeout(()=>{
+										that.init()
+									},500)
+									
+								}).catch((err) => {
+									uni.hideLoading()
+									that.$toast(err.msg)
+								})
+							
+							} else if (res.cancel) {
+							
+							}
+						}
+				})
+				
+			},
+			restore(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content:"是否批量复原？",
+					success: function (res) {
+							if (res.confirm) {
+								
+								uni.showLoading()
+								uni.$u.http.post('/api/Contract/manage',
+								{
+									ids:ids,
+									operateType:2
+								},
+								{
+									custom: {
+										auth: true
+									}
+								}).then((res) => {
+									uni.hideLoading()
+									that.editall=false
+									that.quan=false
+									that.$toast("操作成功")
+									setTimeout(()=>{
+										that.init()
+									},500)
+									
+								}).catch((err) => {
+									uni.hideLoading()
+									that.$toast(err.msg)
+								})
+							
+							} else if (res.cancel) {
+							
+							}
+						}
+				})
+				
+			},
+			examineSuccess(){
+				let ids=[]
+				that.listall.forEach(item=>{
+					if(item.checked){
+						ids.push(item.id)
+					}
+				})
+				if(ids.length==0){
+					that.$toast("请选择合同")
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content:"是否批量审核成功？",
+					success: function (res) {
+							if (res.confirm) {
+								
+								uni.showLoading()
+								uni.$u.http.post('/api/Contract/manage',
+								{
+									ids:ids,
+									operateType:3
+								},
+								{
+									custom: {
+										auth: true
+									}
+								}).then((res) => {
+									uni.hideLoading()
+									that.editall=false
+									that.quan=false
+									that.$toast("操作成功")
+									setTimeout(()=>{
+										that.init()
+									},500)
+									
+								}).catch((err) => {
+									uni.hideLoading()
+									that.$toast(err.msg)
+								})
+							
+							} else if (res.cancel) {
+							
+							}
+						}
+				})
+				
+			},
 		}
 	}
 </script>

static/css/flex.scss

@@ -149,6 +149,19 @@
 			color: #fff;
 			text-align: center;
 		}
+		.newsufail{
+			
+		}
+		.newsucess{
+			
+				width: 335rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 45rpx;
+				border: 1rpx solid #D05C39;
+				color: #D05C39;
+			
+		}
 	}
 	.plusicon{
 		position: fixed;

store/index.js

@@ -8,7 +8,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state:{
 	  userinfo:'',
-		admin:1
+		admin:0
    },
    mutations:{
 	   // 获取用户信息

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -1,8 +1,8 @@
 <template>
-	<view class="uni-stat__select">
+	<view class="uni-stat__select" style="z-index: 999;">
 		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
-		<view class="uni-select">
-			<view class="uni-select__input-box" @click="toggleSelector">
+		<view class="uni-select" >
+			<view class="uni-select__input-box" @click="toggleSelector" >
 				<view v-if="current" class="uni-select__input-text">{{current}}</view>
 				<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
 				
@@ -374,7 +374,7 @@
 		border: 1px solid #EBEEF5;
 		border-radius: 6px;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		z-index: 2;
+		z-index: 999;
 		padding: 4px 0;
 	}
 

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -176,6 +176,14 @@ page {
   color: #fff;
   text-align: center;
 }
+.newbill .newsucess {
+  width: 335rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  border-radius: 45rpx;
+  border: 1rpx solid #D05C39;
+  color: #D05C39;
+}
 .plusicon {
   position: fixed;
   left: 0;

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1410,7 +1410,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8496,7 +8496,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8517,14 +8517,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8610,7 +8610,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -9180,7 +9180,7 @@ _vue.default.use(_vuex.default);
 var store = new _vuex.default.Store({
   state: {
     userinfo: '',
-    admin: 1 },
+    admin: 0 },
 
   mutations: {
     // 获取用户信息
@@ -22240,7 +22240,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
+if (typeof process !== 'undefined' && Object({"VUE_APP_NAME":"alhj-wx","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {

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

@@ -167,103 +167,104 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;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 */ 372));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+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 */ 372));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 {
   components: {
@@ -276,7 +277,9 @@ __webpack_require__.r(__webpack_exports__);
       show: false,
       contract_status: 0,
       listall: [],
+      pageIndex: 1,
       total: '',
+      nomore: false,
       ctrstatus: [{
         title: "承兑人状态",
         list: [{
@@ -297,13 +300,28 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onLoad: function onLoad() {
+    that = this;
+    this.init();
+  },
+  onshow: function onshow() {
     this.init();
   },
+  // 下拉到底部后加载新数据
+  onReachBottom: function onReachBottom() {
+    //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+    if (this.listall.length >= this.pageIndex * 10) {
+      this.pageIndex++; //页数加一
+      this.init(); //回调接口
+    } else {
+      this.nomore = true;
+    }
+
+  },
   methods: {
     init: function init() {var _this = this;
       uni.showLoading();
       uni.$u.http.post('/api/Acceptor/search', {
-        pageIndex: 1,
+        pageIndex: this.pageIndex,
         pageSize: 10
         // startTime:'',
         // endTime:'',
@@ -316,11 +334,18 @@ __webpack_require__.r(__webpack_exports__);
 
       then(function (res) {
         uni.hideLoading();
-        _this.listall = res.result;
         _this.total = res.total;
-        _this.listall.forEach(function (item) {
-          item.checked = false;
-        });
+
+        var list = res.result;
+        if (list.length > 0) {
+          list.forEach(function (item) {
+            item.checked = false;
+            _this.listall.push(item);
+          });
+          if (list.length < 10) {
+            that.nomore = true;
+          }
+        }
       }).catch(function (err) {
         uni.hideLoading();
         console.log(err);
@@ -368,7 +393,6 @@ __webpack_require__.r(__webpack_exports__);
         });
       }
       this.listall = JSON.parse(JSON.stringify(list));
-      console.log(this.listall);
     },
     makeSureAll: function makeSureAll() {
       this.quan = !this.quan;
@@ -389,6 +413,98 @@ __webpack_require__.r(__webpack_exports__);
       uni.navigateTo({
         url: '/pages/alldeatil/addnewacpt' });
 
+    },
+    deleteAcceptor: function deleteAcceptor() {
+      var ids = [];
+      that.listall.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+      if (ids.length == 0) {
+        that.$toast("请选择合同");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否批量删除？",
+        success: function success(res) {
+          if (res.confirm) {
+            uni.showLoading();
+            uni.$u.http.post('/api/Acceptor/manager',
+            {
+              ids: ids,
+              operateType: 1 },
+
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+    },
+    backAcceptor: function backAcceptor() {
+      var ids = [];
+      that.listall.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+      if (ids.length == 0) {
+        that.$toast("请选择合同");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否批量复原？",
+        success: function success(res) {
+          if (res.confirm) {
+            uni.showLoading();
+            uni.$u.http.post('/api/Acceptor/manager',
+            {
+              ids: ids,
+              operateType: 2 },
+
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
     } } };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/billdetail.js

@@ -298,8 +298,11 @@ var _default =
       });
     },
     tryAgain: function tryAgain() {
+      var obj = [
+      this.msg];
+
       uni.navigateTo({
-        url: "/pages/alldeatil/addbill" });
+        url: "/pages/alldeatil/addbill?obj=" + JSON.stringify(obj) });
 
     } } };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/contractdetail.js

@@ -315,6 +315,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 
 var that;var _default =
 {
@@ -425,16 +427,291 @@ var that;var _default =
 
     },
     makeSureAll: function makeSureAll() {
-      this.quan = true;
+      this.quan = !this.quan;
       this.allSelect();
     },
     selectDown: function selectDown() {
       this.editall = false;
-      that.quan = true;
+      this.quan = true;
       var list = this.msg.contractDraft.result;
       list.forEach(function (item) {
         item.checked = false;
       });
+    },
+    examineSuccess: function examineSuccess() {
+      var ids = [];
+
+      ids.push(this.id);
+
+
+      if (ids.length == 0) {
+        that.$toast("请选择合同");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否审核成功？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/manage', {
+              ids: ids,
+              operateType: 3 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
+    },
+    examineFail: function examineFail() {
+      var ids = [];
+
+      ids.push(this.id);
+
+      if (ids.length == 0) {
+        this.$toast("请选择合同");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: '是否审核失败？',
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/manage', {
+              ids: ids,
+              operateType: 4 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+
+                that.init();
+              }, 500);
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+          } else if (res.cancel) {
+            console.log('用户点击取消');
+          }
+        } });
+
+
+    },
+    examineBillSuccess: function examineBillSuccess() {
+      var ids = [];
+      this.msg.contractDraft.result.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+
+      if (ids.length == 0) {
+        that.$toast("请选择汇票");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否批量审核成功？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/contractDraft/manager', {
+              ids: ids,
+              operateType: 3 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
+    },
+
+    examineBillFail: function examineBillFail() {
+      var ids = [];
+      this.msg.contractDraft.result.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+      if (ids.length == 0) {
+        this.$toast("请选择汇票");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: '是否审核失败？',
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/contractDraft/manager', {
+              ids: ids,
+              operateType: 4 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+
+                that.init();
+              }, 500);
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+          } else if (res.cancel) {
+            console.log('用户点击取消');
+          }
+        } });
+
+
+    },
+    dele: function dele() {
+
+      var ids = [];
+      this.msg.contractDraft.result.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+      if (ids.length == 0) {
+        that.$toast("请选择汇票");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否删除合同？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/contractDraft/manager', {
+              ids: ids,
+              operateType: 1 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
+    },
+    restore: function restore() {
+      var ids = [];
+      this.msg.contractDraft.result.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+
+      if (ids.length == 0) {
+        that.$toast("请选择汇票");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否复原汇票？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Contract/contractDraft/manager', {
+              ids: ids,
+              operateType: 2 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
     },
     // 删除图片
     deletePic: function deletePic(event) {

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

@@ -262,7 +262,23 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-var _default =
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+var that;var _default =
 {
   data: function data() {
     return {
@@ -270,28 +286,28 @@ var _default =
 
 
       pwd: {
-        oldPassword: '',
-        newPassword: '' },
-
-      show: false,
-      rules: {
-        'pwd.oldPassword': {
-          type: 'string',
-          required: true,
-          message: '请填写旧密码',
-          trigger: ['blur', 'change'] },
-
-        'pwd.newPassword': {
-          type: 'string',
-          required: true,
-          message: '请填写新密码',
-          trigger: ['blur', 'change'] } } };
-
-
-
+        password: '' },
+
+      show: false
+      // rules: {
+      // 	'pwd.oldPassword': {
+      // 		type: 'string',
+      // 		required: true,
+      // 		message: '请填写旧密码',
+      // 		trigger: ['blur', 'change']
+      // 	},
+      // 	'pwd.newPassword': {
+      // 		type: 'string',
+      // 		required: true,
+      // 		message: '请填写新密码',
+      // 		trigger: ['blur', 'change']
+      // 	},
+      // },
+    };
 
   },
   onLoad: function onLoad(o) {
+    that = this;
     if (o.id) {
       this.id = o.id;
     }
@@ -322,21 +338,177 @@ var _default =
         console.log(err);
       });
     },
+    prviewPic: function prviewPic(item) {
+      var pics = [];
+      pics.push(item);
+      uni.previewImage({
+        urls: pics });
+
+    },
     makeSurePwd: function makeSurePwd() {var _this2 = this;
       uni.showLoading();
-      uni.$u.http.post('/api/Supplier/password', this.pwd, {
+      var pwd = {
+        password: this.pwd.password,
+        supplierId: this.form.id };
+
+      uni.$u.http.post('/api/Account/password/resetSupplier', pwd, {
         custom: {
           auth: true } }).
 
       then(function (res) {
         uni.hideLoading();
-        _this2.$toast("申请成功");
+        _this2.$toast("重置成功");
         _this2.show = false;
       }).catch(function (err) {
         console.log(err);
         uni.hideLoading();
         _this2.$toast(err.msg);
       });
+    },
+    resert: function resert() {
+      var ids = [];
+      ids.push(this.id);
+      uni.showModal({
+        title: '提示',
+        content: "是否认复原？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Supplier/manage', {
+              ids: ids,
+              operateType: 2 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+    },
+    forbidden: function forbidden() {
+      var ids = [];
+      ids.push(this.id);
+      uni.showModal({
+        title: '提示',
+        content: "是否认禁用？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Supplier/manage', {
+              ids: ids,
+              operateType: 1 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+    },
+    examineSuccess: function examineSuccess() {
+      var ids = [];
+      ids.push(this.id);
+      uni.showModal({
+        title: '提示',
+        content: "是否认证成功？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Supplier/manage', {
+              ids: ids,
+              operateType: 3 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
+    },
+    examineFail: function examineFail() {
+      var ids = [];
+      ids.push(this.id);
+      uni.showModal({
+        title: '提示',
+        content: "是否认证失败？",
+        success: function success(res) {
+          if (res.confirm) {
+
+            uni.showLoading();
+            uni.$u.http.post('/api/Supplier/manage', {
+              ids: ids,
+              operateType: 4 },
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+
     } } };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/supplierdetail.wxss

@@ -99,7 +99,7 @@ page {
 }
 .forgetbox {
   width: 600rpx;
-  height: 600rpx;
+  height: 500rpx;
   background-color: #fff;
   display: flex;
   flex-direction: column;

unpackage/dist/dev/mp-weixin/pages/bsinessadmin/register.js

@@ -266,7 +266,7 @@ var _default =
         return;
       }
       var form = this.form;
-      if (thie.checked == 1) {
+      if (this.checked == 1) {
         if (this.form.name.length == 0) {
           this.$toast("请输入您的账号");
           return;

unpackage/dist/dev/mp-weixin/pages/bsinessadmin/supplierges.js

@@ -275,7 +275,7 @@ var _baseUrl = __webpack_require__(/*! @/http/baseUrl.js */ 16); //
 //
 //
 //
-var that;var _default = { data: function data() {return { checked: 1, form: { name: '', socialCode: '', legalPerson: '', password: '', contacts: '', contactsMobile: '', identifyPics: [], proxyFile: [] } };}, onLoad: function onLoad(o) {that = this;if (o.checked) {this.checked = o.checked;}}, methods: { acountRegister: function acountRegister() {var form = this.form;if (form.name.length == 0) {this.$toast("输入供货商名陈");return;}if (form.name.socialCode == 0) {this.$toast("请输入统一社会信用代码");return;}if (form.name.legalPerson == 0) {this.$toast("请输入法人姓名");return;}if (form.name.contacts == 0) {this.$toast("请输入联系人");return;}if (form.name.contactsMobile == 0) {this.$toast("请输入联系电话");return;}if (form.name.identifyPics == 0) {this.$toast("请上传认证照片");return;}if (form.name.proxyFile == 0) {this.$toast("请上传授权委托书");return;}form.checked = 1;console.log(form);uni.navigateTo({ url: "/pages/bsinessadmin/register?form=" + JSON.stringify(form) });}, upImages: function upImages(e) {if (e == 1) {this.chooseImage(1);} else if (e == 2) {this.chooseImage(2);}
+var that;var _default = { data: function data() {return { checked: 1, form: { name: '', socialCode: '', legalPerson: '', password: '', contacts: '', contactsMobile: '', identifyPics: [], proxyFile: [] } };}, onLoad: function onLoad(o) {that = this;if (o.checked) {this.checked = o.checked;}}, methods: { acountRegister: function acountRegister() {var form = this.form;if (form.name.length == 0) {this.$toast("输入供货商名称");return;}if (form.socialCode.length == 0) {this.$toast("请输入统一社会信用代码");return;}if (form.legalPerson.length == 0) {this.$toast("请输入法人姓名");return;}if (form.contacts.length == 0) {this.$toast("请输入联系人");return;}if (form.contactsMobile.length == 0) {this.$toast("请输入联系电话");return;}if (form.identifyPics.length == 0) {this.$toast("请上传认证照片");return;}if (form.proxyFile.length == 0) {this.$toast("请上传授权委托书");return;}form.checked = 1;console.log(form);uni.navigateTo({ url: "/pages/bsinessadmin/register?form=" + JSON.stringify(form) });}, upImages: function upImages(e) {if (e == 1) {this.chooseImage(1);} else if (e == 2) {this.chooseImage(2);}
     },
     chooseImage: function chooseImage(u) {
       uni.chooseImage({
@@ -294,8 +294,10 @@ var that;var _default = { data: function data() {return { checked: 1, form: { na
 
     },
     upText: function upText(e, i) {
-      console.log(e, i);
       var list = [];
+      uni.showLoading({});
+
+
       uni.uploadFile({
         url: _baseUrl.mainUrl + '/api/File',
         filePath: e,
@@ -309,6 +311,7 @@ var that;var _default = { data: function data() {return { checked: 1, form: { na
           // file_name: fileName,
         },
         success: function success(re) {
+          uni.hideLoading();
           var res = JSON.parse(re.data);
           if (res.code == 200) {
             if (i == 1) {

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

@@ -167,102 +167,103 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;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 */ 372));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+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 */ 372));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 {
   components: {
@@ -272,8 +273,10 @@ __webpack_require__.r(__webpack_exports__);
     return {
       editall: false,
       quan: false,
-      listall: '',
+      listall: [],
+      pageIndex: 1,
       total: '',
+      nomore: false,
       show: false,
       contract_status: 0,
       ctrstatus: [{
@@ -296,14 +299,29 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onLoad: function onLoad() {
+    that = this;
+    this.init();
+  },
+  onshow: function onshow() {
     this.init();
   },
-  methods: {
+  // 下拉到底部后加载新数据
+  onReachBottom: function onReachBottom() {
+    //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+    if (this.listall.length >= this.pageIndex * 10) {
+      this.pageIndex++; //页数加一
+      this.init(); //回调接口
+    } else {
+      this.nomore = true;
+    }
+
+  },
+  methods: _defineProperty({
     init: function init() {var _this = this;
       uni.showLoading();
       uni.$u.http.post('/api/Drawer/search', {
-        // pageIndex:1,
-        // pageSize:10,
+        pageIndex: this.pageIndex,
+        pageSize: 10
         // startTime:'',
         // endTime:'',
         // name:'',
@@ -315,11 +333,18 @@ __webpack_require__.r(__webpack_exports__);
 
       then(function (res) {
         uni.hideLoading();
-        _this.listall = res.result;
         _this.total = res.total;
-        _this.listall.forEach(function (item) {
-          item.checked = false;
-        });
+
+        var list = res.result;
+        if (list.length > 0) {
+          list.forEach(function (item) {
+            item.checked = false;
+            _this.listall.push(item);
+          });
+          if (list.length < 10) {
+            that.nomore = true;
+          }
+        }
       }).catch(function (err) {
         uni.hideLoading();
         console.log(err);
@@ -387,7 +412,102 @@ __webpack_require__.r(__webpack_exports__);
       uni.navigateTo({
         url: '/pages/alldeatil/addnewdrawer' });
 
-    } } };exports.default = _default;
+    },
+    backDrawer: function backDrawer() {
+
+    },
+    deleteDrawer: function deleteDrawer() {
+      var ids = [];
+      that.listall.forEach(function (item) {
+        if (item.checked) {
+          ids.push(item.id);
+        }
+      });
+      if (ids.length == 0) {
+        that.$toast("请选择合同");
+        return;
+      }
+      uni.showModal({
+        title: '提示',
+        content: "是否批量删除？",
+        success: function success(res) {
+          if (res.confirm) {
+            uni.showLoading();
+            uni.$u.http.post('/api/Drawer/manager',
+            {
+              ids: ids,
+              operateType: 1 },
+
+            {
+              custom: {
+                auth: true } }).
+
+            then(function (res) {
+              uni.hideLoading();
+              that.editall = false;
+              that.quan = false;
+              that.$toast("操作成功");
+              setTimeout(function () {
+                that.init();
+              }, 500);
+
+            }).catch(function (err) {
+              uni.hideLoading();
+              that.$toast(err.msg);
+            });
+
+          } else if (res.cancel) {
+
+          }
+        } });
+
+    } }, "backDrawer", function backDrawer()
+  {
+    var ids = [];
+    that.listall.forEach(function (item) {
+      if (item.checked) {
+        ids.push(item.id);
+      }
+    });
+    if (ids.length == 0) {
+      that.$toast("请选择合同");
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: "是否批量复原？",
+      success: function success(res) {
+        if (res.confirm) {
+          uni.showLoading();
+          uni.$u.http.post('/api/Drawer/manager',
+          {
+            ids: ids,
+            operateType: 2 },
+
+          {
+            custom: {
+              auth: true } }).
+
+          then(function (res) {
+            uni.hideLoading();
+            that.editall = false;
+            that.quan = false;
+            that.$toast("操作成功");
+            setTimeout(function () {
+              that.init();
+            }, 500);
+
+          }).catch(function (err) {
+            uni.hideLoading();
+            that.$toast(err.msg);
+          });
+
+        } else if (res.cancel) {
+
+        }
+      } });
+
+  }) };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/drawer/drawer.wxss

@@ -74,7 +74,6 @@ page {
   width: 28rpx;
   height: 28rpx;
   border-radius: 50%;
-  background-color: #D8AB5A;
   margin-top: 8rpx;
 }
 .acpcardlist .acpcard .allmsg .acpcont {

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

@@ -377,7 +377,9 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
       draft_status: '',
       time_status: '',
       listall: [],
+      pageIndex: 1,
       total: '',
+      nomore: false,
       ctrstatus: [{
         title: "合同状态",
         list: [{
@@ -450,12 +452,26 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
     this.state = this.$store.state.admin;
     this.init();
   },
+  onshow: function onshow() {
+    this.init();
+  },
+  // 下拉到底部后加载新数据
+  onReachBottom: function onReachBottom() {
+    //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+    if (this.listall.length >= this.pageIndex * 10) {
+      this.pageIndex++; //页数加一
+      this.init(); //回调接口
+    } else {
+      this.nomore = true;
+    }
+
+  },
   methods: {
 
     init: function init() {var _this = this;
       uni.showLoading();
       uni.$u.http.post('/api/Contract/search', {
-        pageIndex: 1,
+        pageIndex: this.pageIndex,
         pageSize: 10
         // startTime:'',
         // endTime:'',
@@ -468,11 +484,18 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
 
       then(function (res) {
         uni.hideLoading();
-        _this.listall = res.result;
         _this.total = res.total;
-        _this.listall.forEach(function (item) {
-          item.checked = false;
-        });
+
+        var list = res.result;
+        if (list.length > 0) {
+          list.forEach(function (item) {
+            item.checked = false;
+            _this.listall.push(item);
+          });
+          if (list.length < 10) {
+            that.nomore = true;
+          }
+        }
       }).catch(function (err) {
         uni.hideLoading();
         console.log(err);

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

@@ -271,6 +271,9 @@ var that;var tabar = function tabar() {__webpack_require__.e(/*! require.ensure
 
     this.init();
   },
+  onshow: function onshow() {
+    this.init();
+  },
   methods: {
     init: function init() {var _this = this;
       uni.showLoading();

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

@@ -307,7 +307,7 @@ __webpack_require__.r(__webpack_exports__);
     tabar: tabar },
 
   data: function data() {
-    return _defineProperty({
+    return {
       editall: false,
       quan: false,
       keywords: '',
@@ -317,7 +317,9 @@ __webpack_require__.r(__webpack_exports__);
       endTime: "请选择",
       value1: '',
       intime: 1,
+      pageIndex: 1,
       total: '',
+      nomore: false,
       contract_status: '',
       draft_status: '',
       time_status: '',
@@ -342,24 +344,38 @@ __webpack_require__.r(__webpack_exports__);
 
 
         {
-          name: "认证失败" }] }] }, "listall",
+          name: "认证失败" }] }] };
+
 
 
 
 
 
-    []);
 
   },
   onLoad: function onLoad() {
     this.state = this.$store.state.admin;
     this.init();
   },
+  onshow: function onshow() {
+    this.init();
+  },
+  // 下拉到底部后加载新数据
+  onReachBottom: function onReachBottom() {
+    //判断下一页是否存在数据，不存在将显示暂无数据等提示语
+    if (this.listall.length >= this.pageIndex * 10) {
+      this.pageIndex++; //页数加一
+      this.init(); //回调接口
+    } else {
+      this.nomore = true;
+    }
+
+  },
   methods: (_methods = {
     init: function init() {var _this = this;
       uni.showLoading();
       uni.$u.http.post('/api/Supplier/search', {
-        pageIndex: 1,
+        pageIndex: this.pageIndex,
         pageSize: 10
         // startTime:'',
         // endTime:'',
@@ -372,11 +388,17 @@ __webpack_require__.r(__webpack_exports__);
 
       then(function (res) {
         uni.hideLoading();
-        _this.listall = res.result;
         _this.total = res.total;
-        _this.listall.forEach(function (item) {
-          item.checked = false;
-        });
+        var list = res.result;
+        if (list.length > 0) {
+          list.forEach(function (item) {
+            item.checked = false;
+            _this.listall.push(item);
+          });
+          if (list.length < 10) {
+            that.nomore = true;
+          }
+        }
       }).catch(function (err) {
         uni.hideLoading();
         console.log(err);
@@ -427,6 +449,7 @@ __webpack_require__.r(__webpack_exports__);
   }), _defineProperty(_methods, "allSelect", function allSelect()
   {
     var list = this.listall;
+    console.log(this.quan, 778);
     if (this.quan) {
       list.forEach(function (item) {
         item.checked = true;
@@ -437,7 +460,6 @@ __webpack_require__.r(__webpack_exports__);
       });
     }
     this.listall = JSON.parse(JSON.stringify(list));
-    console.log(this.listall);
   }), _defineProperty(_methods, "makeSureAll", function makeSureAll()
   {
     this.quan = !this.quan;
@@ -490,6 +512,197 @@ __webpack_require__.r(__webpack_exports__);
     } else if (title == "上传日期") {
       this.time_status = k;
     }
+  }), _defineProperty(_methods, "examineFail", function examineFail()
+  {
+    var ids = [];
+    that.listall.forEach(function (item) {
+      if (item.checked) {
+        ids.push(item.id);
+      }
+    });
+    if (ids.length == 0) {
+      this.$toast("请选择合同");
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: '是否批量审核失败？',
+      success: function success(res) {
+        if (res.confirm) {
+
+          uni.showLoading();
+          uni.$u.http.post('/api/Contract/manage',
+          {
+            ids: ids,
+            operateType: 4 },
+
+          {
+            custom: {
+              auth: true } }).
+
+          then(function (res) {
+            uni.hideLoading();
+            that.editall = false;
+            that.quan = false;
+            that.$toast("操作成功");
+            setTimeout(function () {
+
+              that.init();
+            }, 500);
+          }).catch(function (err) {
+            uni.hideLoading();
+            that.$toast(err.msg);
+          });
+        } else if (res.cancel) {
+          console.log('用户点击取消');
+        }
+      } });
+
+
+  }), _defineProperty(_methods, "dele", function dele()
+  {
+    var ids = [];
+    that.listall.forEach(function (item) {
+      if (item.checked) {
+        ids.push(item.id);
+      }
+    });
+    if (ids.length == 0) {
+      that.$toast("请选择合同");
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: "是否批量删除？",
+      success: function success(res) {
+        if (res.confirm) {
+
+          uni.showLoading();
+          uni.$u.http.post('/api/Contract/manage',
+          {
+            ids: ids,
+            operateType: 1 },
+
+          {
+            custom: {
+              auth: true } }).
+
+          then(function (res) {
+            uni.hideLoading();
+            that.editall = false;
+            that.quan = false;
+            that.$toast("操作成功");
+            setTimeout(function () {
+              that.init();
+            }, 500);
+
+          }).catch(function (err) {
+            uni.hideLoading();
+            that.$toast(err.msg);
+          });
+
+        } else if (res.cancel) {
+
+        }
+      } });
+
+
+  }), _defineProperty(_methods, "restore", function restore()
+  {
+    var ids = [];
+    that.listall.forEach(function (item) {
+      if (item.checked) {
+        ids.push(item.id);
+      }
+    });
+    if (ids.length == 0) {
+      that.$toast("请选择合同");
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: "是否批量复原？",
+      success: function success(res) {
+        if (res.confirm) {
+
+          uni.showLoading();
+          uni.$u.http.post('/api/Contract/manage',
+          {
+            ids: ids,
+            operateType: 2 },
+
+          {
+            custom: {
+              auth: true } }).
+
+          then(function (res) {
+            uni.hideLoading();
+            that.editall = false;
+            that.quan = false;
+            that.$toast("操作成功");
+            setTimeout(function () {
+              that.init();
+            }, 500);
+
+          }).catch(function (err) {
+            uni.hideLoading();
+            that.$toast(err.msg);
+          });
+
+        } else if (res.cancel) {
+
+        }
+      } });
+
+
+  }), _defineProperty(_methods, "examineSuccess", function examineSuccess()
+  {
+    var ids = [];
+    that.listall.forEach(function (item) {
+      if (item.checked) {
+        ids.push(item.id);
+      }
+    });
+    if (ids.length == 0) {
+      that.$toast("请选择合同");
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: "是否批量审核成功？",
+      success: function success(res) {
+        if (res.confirm) {
+
+          uni.showLoading();
+          uni.$u.http.post('/api/Contract/manage',
+          {
+            ids: ids,
+            operateType: 3 },
+
+          {
+            custom: {
+              auth: true } }).
+
+          then(function (res) {
+            uni.hideLoading();
+            that.editall = false;
+            that.quan = false;
+            that.$toast("操作成功");
+            setTimeout(function () {
+              that.init();
+            }, 500);
+
+          }).catch(function (err) {
+            uni.hideLoading();
+            that.$toast(err.msg);
+          });
+
+        } else if (res.cancel) {
+
+        }
+      } });
+
+
   }), _methods) };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/project.private.config.json

@@ -308,6 +308,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/alldeatil/addbill",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/alldeatil/supplierdetail",
+          "query": "id=3",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

unpackage/dist/dev/mp-weixin/static/css/flex.scss

@@ -149,6 +149,19 @@
 			color: #fff;
 			text-align: center;
 		}
+		.newsufail{
+			
+		}
+		.newsucess{
+			
+				width: 335rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 45rpx;
+				border: 1rpx solid #D05C39;
+				color: #D05C39;
+			
+		}
 	}
 	.plusicon{
 		position: fixed;

unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.wxss

@@ -124,7 +124,7 @@
   border: 1px solid #EBEEF5;
   border-radius: 6px;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  z-index: 2;
+  z-index: 999;
   padding: 4px 0;
 }
 .uni-select__selector-scroll {