Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

manifest.json

@@ -42,6 +42,9 @@
         },
         "devServer" : {
             "disableHostCheck" : true
+        },
+        "sdkConfigs" : {
+            "maps" : {}
         }
     },
     "app-plus" : {
@@ -71,6 +74,13 @@
                         "appkey_ios" : "64541bb9b52fe4d41d8ac5c1959cf4b9",
                         "appkey_android" : "8a601d5716a812aaf65291da18dae719"
                     }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "64541bb9b52fe4d41d8ac5c1959cf4b9",
+                        "appkey_android" : "8a601d5716a812aaf65291da18dae719"
+                    }
                 }
             },
             "android" : {
@@ -88,6 +98,7 @@
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>"

pageB/contract/enclosures.vue

@@ -2,18 +2,23 @@
 	<view class="center">
 		<view class="c-list">
 			<view class="xinxiup">
-				<view>{{title}}</view>
-				<view v-for="item in list">
-					<view class="c-row b-b">
-						<text class="tit">{{item.appendixName}}</text>
+				<view class='xinxiup-title'>{{title}}</view>
+				<view style='width:100%;' class='flex justify-between fujian align-item-center' v-for="item in list">
+					<view style='flex:2;' class="flex align-item-center">
+						<view><image style='width:25px;height:25px;position:relative;top:2px;' src="../../static/img/contract/pdf@3x.png" mode=""></image></view>
+						<view>
+							<text class="tit">{{item.appendixName}}</text>
+							<view style='color:#B0B3BF;font-size:12px;'>{{item.appendixSize}}</view>
+						</view>
+						
 					</view>
-					<view class="c-row b-b">
-						<text class="tit">{{item.appendixSize}}</text>
+					<view style='flex:1;'>
+						<image @click="download(item.appendixPath)" style='width:15px;height:15px;' src="../../static/img/contract/xiazai@3x.png" mode=""></image>
 					</view>
-					<view class="c-row b-b">
+					
+					<!-- <view class="c-row b-b">
 						<text class="tit">{{item.appendixPath}}</text>
-					</view>
-					<u-button @click="download(item.appendixPath)">下载</u-button>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -101,5 +106,22 @@
 		}
 </script>
 
-<style>
+<style scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.center{
+		background:#fff;
+		margin:10px;
+		padding:29rpx;
+	}
+	.xinxiup-title{
+		padding-bottom:10px;border-bottom:1px solid #EEEEEE;
+	}
+	.fujian{
+		padding:10px 0;
+	}
+	.tit{
+		font-size:16px;
+	}
 </style>

pages/grain_pulse/enter.vue

@@ -46,12 +46,23 @@
 			<view class="modular">
 				<u-form-item label="上传坐标" label-width="30%" class="title Regular">
 					<text @click='naviageToPage("/pages/grain_pulse/localtion/coordinate")'
-						class="con-list Regular">{{deptList.buyer == null ? "未上传":deptList.buyer}}<text
+						class="con-list Regular">{{position.longitude == undefined ? "未上传":'已上传'}}<text
 							class='tip_text cuIcon-right'></text></text>
 				</u-form-item>
 				<u-form-item label="所在区域" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" disabled
-						placeholder="自动获取" />
+					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.province!=undefined'>
+						{{position.province}}
+					{{position.city}}
+					{{position.district}}
+					</view>
+					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.pname!=undefined'>
+						{{position.pname}}
+					{{position.cityname}}
+					{{position.adname}}
+					</view>
+					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.pname==undefined&&position.province==undefined'>
+						未上传坐标
+					</view>
 				</u-form-item>
 				<u-form-item label="详细地址" label-width="30%" class="title Regular">
 					<u-input v-model="deptList.detailedAddress" input-align="right" class="write Regular"
@@ -61,19 +72,19 @@
 					<view class="title Regular" style="margin-top: 15rpx;">上传图片</view>
 					<view v-if="license1 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+							:size-type="['compressed']" @on-success="getImgUrl" 
+							 @on-uploaded="isAdd = true" :before-upload="filterFileType"
 							:options="uploadOptions" customBorder='2px dashed #D8DEF7' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
 							 :customBtnWidth='custombtnwidth' customBack='#F9FAFE' :customBtnImage="custombtnimage" :customBtn='custombtn'
-							  :custom="uploadCustom" @on-progress="onProgress"></upload>
+							  :custom="uploadCustom" ></upload>
 					</view>
 					<view v-if="license2 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-							:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError"
-							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+							:size-type="['compressed']" @on-success="getImgUrl1"
+							 @on-uploaded="isAdd = true" :before-upload="filterFileType"
 							:options="uploadOptions1"  customBack='#FEF9FA' customBorder='2px dashed #F9D5DC' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
 							 :customBtnWidth='custombtnwidth' :customBtnImage="custombtnimage" :customBtn='custombtn'
-							  :custom="uploadCustom" @on-progress="onProgress"></upload>
+							  :custom="uploadCustom" ></upload>
 					</view>
 				</view>
 			</view>
@@ -97,7 +108,8 @@
 
 <script>
 	import {
-		mapState
+		mapState,
+		mapMutations
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
 	export default {
@@ -123,7 +135,12 @@
 				mainBusinessType: [],
 				uploadCustom: true,
 				deptList: {
-					companyProfile:''
+					compName:'',
+					title:'',
+					companyProfile:'',
+					province:'',
+					city:'',
+					area:''
 				},
 				management: [{
 						name: "粮库",
@@ -158,7 +175,9 @@
 				show: false,
 				// anNiuCss:"types",
 				anNiuCss: [],
-				position:{},
+				position:{
+					province:''
+				},
 				custombtn:true,
 				custombtnimage:'../../static/img/liangmai/ic_shanchuan@3x.png',
 				custombtnwidth:50,
@@ -169,9 +188,13 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
-			this.position=JSON.parse(options.position)
-			console.log(this.position)
+			
+			if(options.position){
+				this.position=JSON.parse(options.position)
+			}
+		},
+		onShow() {
+			console.log(this.$store.state.enter)
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
@@ -182,9 +205,21 @@
 				this.deptList.attachmentAddress = res
 			},
 			naviageToPage(item) {
+				// console.log(this.enter)
+				var data={
+					compName:this.deptList.compName,
+					title:this.deptList.title,
+					mainBusinessType:this.mainBusinessType.toString(),
+					companyProfile:this.deptList.companyProfile,
+				}
+				this.$store.dispatch('enterchange',data)
+				console.log(this.$store.state.enter)
+				// this.enterchange()
+				var mainBusinessType=this.mainBusinessType.toString()
 				uni.navigateTo({
 					url: item
 				})
+				
 			},
 			getImgUrl1(res) {
 				console.log(res)
@@ -247,7 +282,7 @@
 					this.$api.msg('企业简介不能为空')
 					return
 				}
-				if (!this.deptList.longitude&&!this.deptList.longitude) {
+				if (!this.position.longitude&&!this.position.latitude) {
 					this.$api.msg('上传坐标不能为空')
 					return
 				}
@@ -282,8 +317,18 @@
 				// this.show = true
 				// return
 				this.deptList.mainBusinessType=this.mainBusinessType.toString()
-				this.deptList.longitude='40.22077'
-				this.deptList.latitude='116.23128'
+				this.deptList.longitude=this.position.longitude
+				this.deptList.latitude=this.position.latitude
+				if(this.position.province!=undefined){
+					this.deptList.province=this.position.province
+					this.deptList.city=this.position.city
+					this.deptList.area=this.position.district
+				}else if(this.position.pname!=undefined){
+					this.deptList.province=this.position.pname
+					this.deptList.city=this.position.cityname
+					this.deptList.area=this.position.adname
+				}
+				
 				this.deptList.createPhone=this.userInfo.phone
 				uni.showModal({
 					content: "确定提交企业信息？？",

pages/grain_pulse/home.vue

@@ -61,9 +61,9 @@
 					<view @click.stop='naviageToPage("/pages/grain_pulse/localtion/localtion")'
 						class='companylocation flex align-item-center Regular'>
 						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
-						辽宁省营口市鲅鱼圈区xx路108号
+						{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}
 					</view>
-					<view class='distance Regular'>50m</view>
+					<view v-if='position.name!="未设置"' class='distance Regular'>{{item._metre}}</view>
 				</view>
 			</view>
 		</view>
@@ -131,6 +131,14 @@
 			}).then(res => {
 				if (res.data.code == 200) {
 					this.datalist = res.data.data.records
+					console.log(this.position)
+					let lat2 =this.position.location.split(',')[1];
+					let lng2 = this.position.location.split(',')[0];
+					for(var i=0;i<this.datalist.length;i++){
+						this.datalist[i]._metre=this.utils.getDistance(this.datalist[i].latitude,this.datalist[i].longitude,lat2,lng2)
+					}
+					console.log(this.datalist)
+					// let _metre = this.utils.getDistance(lat1,lng1,lat2,lng2) +"千米"
 				}
 			})
 			uni.getStorage({
@@ -148,6 +156,7 @@
 		onLoad(option) {
 			if (option.position){
 				this.position = option.position
+				
 			}
 		},
 		methods: {

pages/grain_pulse/localtion/coordinate.nvue

@@ -41,7 +41,9 @@
 				// 	longitude: 116.39747,
 				// 	iconPath: '../../../static/img/location.png',
 				// }],
-				covers: []
+				covers: [],
+				amapPlugin:null,
+				mapKey:''
 			}
 		},
 		onReady() {
@@ -72,6 +74,12 @@
 
 			},
 		},
+		onLoad(options) {
+			console.log(11111)
+			// if(options){
+				console.log(options)
+			// }
+		},
 		onShow() {
 			let that = this
 			uni.getStorage({
@@ -109,21 +117,46 @@
 			
 			},
 			tap(e) {
+				var that = this
 					let newmarker =[];
 							var id=1;
-				this.position.longitude = e.detail.longitude;
-				this.position.latitude = e.detail.latitude;
-				console.log(this.longitude)
-				console.log(this.latitude)
-				let maker= {
-					id: id++,
-					latitude: this.position.latitude,
-					longitude:this.position.longitude,
-					iconPath: '../../../static/img/location.png',
+						
+				// this.position.longitude = e.detail.longitude;
+				// this.position.latitude = e.detail.latitude;
+				// console.log(this.longitude)
+				// console.log(this.latitude)
+				// let maker= {
+				// 	id: id++,
+				// 	latitude: this.position.latitude,
+				// 	longitude:e.detail.longitude,
+				// 	iconPath: '../../../static/img/location.png',
+				// }
+				// newmarker.push(maker)
+				// this.covers = newmarker
+				var lnglat = e.detail.longitude+','+e.detail.latitude
+				console.log("lnglat",lnglat)
+				let parameters = {
+					key: 'dd701d394d116b50268dc16470ddd615',
+					location: lnglat
 				}
-				newmarker.push(maker)
-				this.covers = newmarker
-
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo?parameters',
+					data: parameters,
+					success: (res) => {
+						that.position=res.data.regeocode.addressComponent
+						console.log(res.data.regeocode.addressComponent)
+						that.position.longitude = res.data.regeocode.addressComponent.streetNumber.location.split(',')[0];
+						that.position.latitude = res.data.regeocode.addressComponent.streetNumber.location.split(',')[1];
+						let maker= {
+							id: id++,
+							latitude: that.position.latitude,
+							longitude:that.position.longitude,
+							iconPath: '../../../static/img/location.png',
+						}
+						newmarker.push(maker)
+						that.covers = newmarker
+					}
+				});
 			},
 			config() {
 				// console.log("this.position",this.position)

pages/grain_pulse/localtion/coordinate.vue

@@ -109,20 +109,46 @@
 			
 			},
 			tap(e) {
+				var that = this
 					let newmarker =[];
 							var id=1;
-				this.position.longitude = e.detail.longitude;
-				this.position.latitude = e.detail.latitude;
-				console.log(this.longitude)
-				console.log(this.latitude)
-				let maker= {
-					id: id++,
-					latitude: this.position.latitude,
-					longitude:this.position.longitude,
-					iconPath: '../../../static/img/location.png',
+						
+				// this.position.longitude = e.detail.longitude;
+				// this.position.latitude = e.detail.latitude;
+				// console.log(this.longitude)
+				// console.log(this.latitude)
+				// let maker= {
+				// 	id: id++,
+				// 	latitude: this.position.latitude,
+				// 	longitude:e.detail.longitude,
+				// 	iconPath: '../../../static/img/location.png',
+				// }
+				// newmarker.push(maker)
+				// this.covers = newmarker
+				var lnglat = e.detail.longitude+','+e.detail.latitude
+				console.log("lnglat",lnglat)
+				let parameters = {
+					key: 'dd701d394d116b50268dc16470ddd615',
+					location: lnglat
 				}
-				newmarker.push(maker)
-				this.covers = newmarker
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo?parameters',
+					data: parameters,
+					success: (res) => {
+						that.position=res.data.regeocode.addressComponent
+						console.log(res.data.regeocode.addressComponent)
+						that.position.longitude = res.data.regeocode.addressComponent.streetNumber.location.split(',')[0];
+						that.position.latitude = res.data.regeocode.addressComponent.streetNumber.location.split(',')[1];
+						let maker= {
+							id: id++,
+							latitude: that.position.latitude,
+							longitude:that.position.longitude,
+							iconPath: '../../../static/img/location.png',
+						}
+						newmarker.push(maker)
+						that.covers = newmarker
+					}
+				});
 
 			},
 			config() {

pages/grain_pulse/my_grain_pulse.vue

@@ -44,7 +44,7 @@
 				</view>
 			</view>
 			<view v-if='mainBusinessType=="我的企业"' class='exitloginwrap'>
-				<button @click='enter()' class='exitlogin'>新增</button>
+				<button @click.stop='enterclick()' class='exitlogin'>新增</button>
 			</view>
 		</view>
 	</view>
@@ -123,7 +123,7 @@
 					url:item
 				})
 			},
-			enter(){
+			enterclick(){
 				//入驻
 				uni.navigateTo({
 					url:'/pages/grain_pulse/enter'

pages/grain_pulse/perfect.vue

@@ -81,7 +81,7 @@
 		data() {
 			return {
 				deptList: {},
-				label: ["世界一流", "世界500强"],
+				label: [],
 				closeable: true,
 				show: true,
 				show1: true,
@@ -99,6 +99,13 @@
 			this.deptList=JSON.parse(options.deptList)
 			console.log(this.deptList)
 		},
+		computed: {
+			show(){
+				if(!this.deptList.companyContant&&!this.deptList){
+					
+				}
+			}
+		},
 		methods: {
 			add() {
 				if (this.label.length >= 6) {

pages/grain_pulse/position/position.vue

@@ -182,13 +182,14 @@
 			},
 			getLocation() {
 				let that = this;
+				console.log(11111)
 				uni.getLocation({
 					type: 'gcj02',
 					geocode: true,
 					success: function(res) {
-						// console.log('获取位置数据：', res);
-						// console.log('当前位置的经度：' + res.longitude);
-						// console.log('当前位置的纬度：' + res.latitude);
+						console.log('获取位置数据：', res);
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
 						//拼接当前定位回显地址
 						// #ifdef APP-PLUS
 						let _address = res.address
@@ -199,11 +200,15 @@
 							.poiName
 						console.log(that.address)
 						// #endif
+					},
+					fail:function(req){
+						console.log(req)
 					}
 				});
 			},
 			// 重新定位
 			reloadPosition() {
+				console.log(111111)
 				var that = this
 				that.po_tips = '定位中...'
 				let countdown = setInterval(() => {

pages/task/my_task.vue

@@ -259,19 +259,19 @@
 					})
 				}else if(item.businessCode=='PROCUREMENT-RECEIPT-REPORT'){
 					uni.navigateTo({
-						url:'/pages/task/procurement_report_details'
+						url:'/pages/task/procurement_report_details?id='+item.businessId
 					})
 				}else if(item.businessCode=='PROCUREMENT-CLOSE-REPORT'){
 					uni.navigateTo({
-						url:'/pages/task/procurement_close_details'
+						url:'/pages/task/procurement_close_details?id='+item.businessId
 					})
 				}else if(item.businessCode=='SALE-RECEIPT-REPORT'){
 					uni.navigateTo({
-						url:'/pages/task/sale_report_details'
+						url:'/pages/task/sale_report_details?id='+item.businessId
 					})
 				}else if(item.businessCode=='SALE-CLOSE-REPORT'){
 					uni.navigateTo({
-						url:'/pages/task/sale_close_details'
+						url:'/pages/task/sale_close_details?id='+item.businessId
 					})
 				}
 				

pages/task/procurement_close_details.vue

@@ -1,34 +1,65 @@
 <template name="task">
 	<view class="content">
 	<u-form :model="form" ref="uForm">
-			<u-form-item label-align='right' label-width='260' label="合同编号"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="货名"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="仓位号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="车牌号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="入库日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="蛋白(%)>="><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="水分(%)<="><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="单价(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="基差(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="卸车费(元/吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票费(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="扣款(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结算单价(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="净重(吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="应付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="未付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="付款日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结转"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户确认"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="库点"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票类型"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="状态"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已开发票(元)"><u-input v-model="form.sex" /></u-form-item>
-			
+			<u-form-item label-width='260' label="合同编号">
+				{{list.contractNo}}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓日期">
+				{{list.closePositionDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓数量">
+				{{list.closingQuantity}}
+			</u-form-item>
+			<u-form-item label-width='260' label="成交价格">
+				{{ list.transactionPrice }}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓价格(元/吨)">
+				{{list.closeRate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="基差(元/吨)">
+				{{list.basisPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="应付金额(元)">
+				{{list.amountIngPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="已付金额(元)">
+				{{list.amountEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未付金额(元)">
+				{{list.amountNotPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="付款日期">
+				{{list.paymentDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="应收金额(元)">
+				{{list.collectionIngPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="已收金额(元)">
+				{{list.collectionEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未收金额(元)">
+				{{list.collectionNotPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="收款日期">
+				{{list.collectionDate}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="客户">
+				{{list.customerName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="库点">
+				{{list.warehouseName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="状态">
+				<view v-if='list.approveStatus!=null'>
+					{{list.approveStatus}}
+				</view>
+				<view v-else>{{list.status}}</view>
+			</u-form-item>
 		</u-form>
-		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -41,58 +72,107 @@
 		
 		data() {
 			return {
+				show:false,
+				id:0,
 				form: {
-								name: '',
-								intro: '',
-								sex: ''
-							},
-							checkboxList: [
-								{
-									name: '苹果',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '雪梨',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '柠檬',
-									checked: false,
-									disabled: false
-								}
-							],
-							radioList: [
-								{
-									name: '鲜甜',
-									disabled: false
-								},
-								{
-									name: '麻辣',
-									disabled: false
-								}
-							],
-							radio: '',
-							switchVal: false
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				list:{},
+				radio: '',
+				pcUserInfo:uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList:[]
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onLoad(options){
+			console.log(options)
+			this.id=options.id
+		},
 		onShow() {
-			this.getIndexBuyData()
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
 			// this.userInfo =  uni.getStorageSync("userInfo")
-			this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.warehouseInOutInfo.currentPage += 1
-				this.getIndexBuyData()
+				this.Data()
 			}
 		},
 		methods: {
-			
+			getData(){
+				var data=[]
+				this.$api.doRequest('get', '/purchaseClosingReport/getInfo', {id:this.id}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+					}
+					})
+			},
+			confirm(item){
+				this.list.contractNo=item[0].value
+			},
+			audit(){
+							var that=this
+							uni.showModal({
+								content: "是否确定通过审核？",
+								showCancel: true,
+								confirmText: '提交',
+								success: function(res) {
+									if (res.confirm) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId:that.list.taskId,
+											approved: true,
+											auditMind: '34',
+											needReapply: false,
+											}).then(res1 => {
+												if (res1.data.code == 200) {
+													that.$api.msg('审核成功');
+													that.$nextTick(function(){
+														uni.navigateBack()
+													})
+												}else{
+													that.$api.msg(res1.data.message);
+												}
+											})
+										}
+									}
+							})
+						},
+						reject(){
+							var that=this
+							uni.showModal({
+								content: "是否确定驳回？",
+								showCancel: true,
+								confirmText: '提交',
+								success: function(res) {
+									if (res.confirm) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId:that.list.taskId,
+											approved: false,
+											auditMind: '已驳回',
+											needReapply: true,
+											}).then(res1 => {
+												if (res1.data.code == 200) {
+													that.$api.msg('驳回成功');
+													that.$nextTick(function(){
+														uni.navigateBack()
+													})
+												}else{
+													that.$api.msg(res1.data.message);
+												}
+											}).catch()
+										}
+									}
+							})
+						}
 		}
 	}
 </script>

pages/task/procurement_report_details.vue

@@ -74,10 +74,16 @@
 				{{list.alreadyInvoice}}
 			</u-form-item>
 			<u-form-item  label-width='260' label="状态">
-				{{list.status}}
+				<view v-if='list.approveStatus!=null'>
+					{{list.approveStatus}}
+				</view>
+				<view v-else>{{list.status}}</view>
 			</u-form-item>
 		</u-form>
-		<view style='padding:10px;' class='flex'><u-button v-if='list.status=="待审核"' @click='audit' type="success">审核</u-button></view>
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -128,16 +134,16 @@
 		methods: {
 			getData(){
 				var data=[]
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', 
-				{compId:this.pcUserInfo.compId,flag:3}).then(res => {
-					if(res.data.code==200){
-						for(var i=0;i<res.data.data.length;i++){
-							data.push({value:res.data.data[i].contractNo,label:res.data.data[i].contractNo})
-						}
-						this.contractNoList=data
-					}
-				})
-				this.$api.doRequest('get', '/saleOrder/getInfo', {id:this.id}).then(res => {
+				// this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', 
+				// {compId:this.pcUserInfo.compId,flag:3}).then(res => {
+				// 	if(res.data.code==200){
+				// 		for(var i=0;i<res.data.data.length;i++){
+				// 			data.push({value:res.data.data[i].contractNo,label:res.data.data[i].contractNo})
+				// 		}
+				// 		this.contractNoList=data
+				// 	}
+				// })
+				this.$api.doRequest('get', '/purchaseReceiptReport/getInfo', {id:this.id}).then(res => {
 					if(res.data.code==200){
 						this.list=res.data.data
 					}
@@ -149,34 +155,55 @@
 			audit(){
 				var that=this
 				uni.showModal({
-					content: "审核通过后，将通知客户订单生效，是否确定通过审核？",
+					content: "是否确定通过审核？",
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/saleOrder/api/editSaleOrder', that.list).then(res => {
-								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
-										taskId:that.list.taskId,
-										approved: true,
-										auditMind: '34',
-										needReapply: false,
-										}).then(res1 => {
-										if (res1.data.code == 200) {
-											that.$api.msg('审核成功');
-											that.$nextTick(function(){
-												uni.navigateBack(-1)
-											})
-										}else{
-											that.$api.msg(res1.data.message);
-										}
-									})
-								}else{
-											that.$api.msg(res.data.message);
-										}
-							})
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId:that.list.taskId,
+								approved: true,
+								auditMind: '34',
+								needReapply: false,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('审核成功');
+										that.$nextTick(function(){
+											uni.navigateBack()
+										})
+									}else{
+										that.$api.msg(res1.data.message);
+									}
+								})
+							}
+						}
+				})
+			},
+			reject(){
+				var that=this
+				uni.showModal({
+					content: "是否确定驳回？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId:that.list.taskId,
+								approved: false,
+								auditMind: '已驳回',
+								needReapply: true,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('驳回成功');
+										that.$nextTick(function(){
+											uni.navigateBack()
+										})
+									}else{
+										that.$api.msg(res1.data.message);
+									}
+								}).catch()
+							}
 						}
-					}
 				})
 			}
 		}

pages/task/sale_close_details.vue

@@ -1,34 +1,65 @@
 <template name="task">
 	<view class="content">
 	<u-form :model="form" ref="uForm">
-			<u-form-item label-align='right' label-width='260' label="合同编号"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="货名"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="仓位号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="车牌号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="入库日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="蛋白(%)>="><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="水分(%)<="><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="单价(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="基差(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="卸车费(元/吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票费(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="扣款(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结算单价(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="净重(吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="应付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="未付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="付款日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结转"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户确认"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="库点"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票类型"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="状态"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已开发票(元)"><u-input v-model="form.sex" /></u-form-item>
-			
+			<u-form-item label-width='260' label="合同编号">
+				{{list.contractNo}}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓日期">
+				{{list.closePositionDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓数量">
+				{{list.closingQuantity}}
+			</u-form-item>
+			<u-form-item label-width='260' label="成交价格">
+				{{ list.transactionPrice }}
+			</u-form-item>
+			<u-form-item label-width='260' label="平仓价格(元/吨)">
+				{{list.closeRate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="基差(元/吨)">
+				{{list.basisPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="应付金额(元)">
+				{{list.amountIngPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="已付金额(元)">
+				{{list.amountEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未付金额(元)">
+				{{list.amountNotPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="付款日期">
+				{{list.paymentDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="应收金额(元)">
+				{{list.collectionIngPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="已收金额(元)">
+				{{list.collectionEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未收金额(元)">
+				{{list.collectionNotPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="收款日期">
+				{{list.collectionDate}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="客户">
+				{{list.customerName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="库点">
+				{{list.warehouseName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="状态">
+				<view v-if='list.approveStatus!=null'>
+					{{list.approveStatus}}
+				</view>
+				<view v-else>{{list.status}}</view>
+			</u-form-item>
 		</u-form>
-		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -41,58 +72,107 @@
 		
 		data() {
 			return {
+				show:false,
+				id:0,
 				form: {
-								name: '',
-								intro: '',
-								sex: ''
-							},
-							checkboxList: [
-								{
-									name: '苹果',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '雪梨',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '柠檬',
-									checked: false,
-									disabled: false
-								}
-							],
-							radioList: [
-								{
-									name: '鲜甜',
-									disabled: false
-								},
-								{
-									name: '麻辣',
-									disabled: false
-								}
-							],
-							radio: '',
-							switchVal: false
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				list:{},
+				radio: '',
+				pcUserInfo:uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList:[]
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onLoad(options){
+			console.log(options)
+			this.id=options.id
+		},
 		onShow() {
-			this.getIndexBuyData()
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
 			// this.userInfo =  uni.getStorageSync("userInfo")
-			this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.warehouseInOutInfo.currentPage += 1
-				this.getIndexBuyData()
+				this.Data()
 			}
 		},
 		methods: {
-			
+			getData(){
+				var data=[]
+				this.$api.doRequest('get', '/salesClosingReport/getInfo', {id:this.id}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+					}
+					})
+			},
+			confirm(item){
+				this.list.contractNo=item[0].value
+			},
+			audit(){
+							var that=this
+							uni.showModal({
+								content: "是否确定通过审核？",
+								showCancel: true,
+								confirmText: '提交',
+								success: function(res) {
+									if (res.confirm) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId:that.list.taskId,
+											approved: true,
+											auditMind: '34',
+											needReapply: false,
+											}).then(res1 => {
+												if (res1.data.code == 200) {
+													that.$api.msg('审核成功');
+													that.$nextTick(function(){
+														uni.navigateBack()
+													})
+												}else{
+													that.$api.msg(res1.data.message);
+												}
+											})
+										}
+									}
+							})
+						},
+						reject(){
+							var that=this
+							uni.showModal({
+								content: "是否确定驳回？",
+								showCancel: true,
+								confirmText: '提交',
+								success: function(res) {
+									if (res.confirm) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId:that.list.taskId,
+											approved: false,
+											auditMind: '已驳回',
+											needReapply: true,
+											}).then(res1 => {
+												if (res1.data.code == 200) {
+													that.$api.msg('驳回成功');
+													that.$nextTick(function(){
+														uni.navigateBack()
+													})
+												}else{
+													that.$api.msg(res1.data.message);
+												}
+											}).catch()
+										}
+									}
+							})
+						}
 		}
 	}
 </script>

pages/task/sale_report_details.vue

@@ -1,34 +1,89 @@
 <template name="task">
 	<view class="content">
 	<u-form :model="form" ref="uForm">
-			<u-form-item label-align='right' label-width='260' label="合同编号"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="货名"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="仓位号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="车牌号"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="入库日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="蛋白(%)>="><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="水分(%)<="><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="单价(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="基差(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="卸车费(元/吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票费(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="扣款(元/吨)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结算单价(元/吨)"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="净重(吨)"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="应付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="未付金额(元)"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="付款日期"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="结转"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户确认"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="客户"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="库点"><u-input v-model="form.name" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="发票类型"><u-input v-model="form.intro" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="状态"><u-input v-model="form.sex" /></u-form-item>
-			<u-form-item label-align='right' label-width='260' label="已开发票(元)"><u-input v-model="form.sex" /></u-form-item>
-			
+			<u-form-item label-width='260' label="合同编号">
+				{{list.contractNo}}
+			</u-form-item>
+			<u-form-item label-width='260' label="货名">
+				{{list.goodsName}}
+			</u-form-item>
+			<u-form-item label-width='260' label="仓位号">
+				{{list.positionNumber}}
+			</u-form-item>
+			<u-form-item label-width='260' label="车牌号">
+				{{ list.carNo }}({{ list.tranCarNo }})
+			</u-form-item>
+			<u-form-item label-width='260' label="入库日期">
+				{{list.warehousingDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="蛋白(%)>=">
+				{{list.protein}}
+			</u-form-item>
+			<u-form-item label-width='260' label="水分(%)<=">
+				{{list.waterContent}}
+			</u-form-item>
+			<u-form-item label-width='260' label="单价(元/吨)">
+				{{list.unitPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="基差(元/吨)">
+				{{list.basisPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="卸车费(元/吨)">
+				{{list.unloadingCharge}}
+			</u-form-item>
+			<u-form-item label-width='260' label="发票费(元/吨)">
+				{{list.invoiceFee}}
+			</u-form-item>
+			<u-form-item label-width='260' label="扣款(元/吨)">
+				{{list.deductionAmount}}
+			</u-form-item>
+			<u-form-item label-width='260' label="结算单价(元/吨)">
+				{{list.settlementPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="净重(吨)">
+				{{list.netWeight}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="应付金额(元)">
+				{{list.amountIngPayable}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="已付金额(元)">
+				{{list.amountEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未付金额(元)">
+				{{list.amountNotPayable}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="付款日期">
+				{{list.paymentDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="结转">
+				{{list.carryForward}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="客户确认">
+				{{list.customerConfirmationStatus}}
+			</u-form-item>
+			<u-form-item label-width='260' label="客户">
+				{{list.customerName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="库点">
+				{{list.warehouseName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="发票类型">
+				{{list.invoiceType}}
+			</u-form-item>
+			<u-form-item label-width='260' label="已开发票(元)">
+				{{list.alreadyInvoice}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="状态">
+				<view v-if='list.approveStatus!=null'>
+					{{list.approveStatus}}
+				</view>
+				<view v-else>{{list.status}}</view>
+			</u-form-item>
 		</u-form>
-		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -41,58 +96,116 @@
 		
 		data() {
 			return {
+				show:false,
+				id:0,
 				form: {
-								name: '',
-								intro: '',
-								sex: ''
-							},
-							checkboxList: [
-								{
-									name: '苹果',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '雪梨',
-									checked: false,
-									disabled: false
-								},
-								{
-									name: '柠檬',
-									checked: false,
-									disabled: false
-								}
-							],
-							radioList: [
-								{
-									name: '鲜甜',
-									disabled: false
-								},
-								{
-									name: '麻辣',
-									disabled: false
-								}
-							],
-							radio: '',
-							switchVal: false
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				list:{},
+				radio: '',
+				pcUserInfo:uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList:[]
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onLoad(options){
+			console.log(options)
+			this.id=options.id
+		},
 		onShow() {
-			this.getIndexBuyData()
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
 			// this.userInfo =  uni.getStorageSync("userInfo")
-			this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.warehouseInOutInfo.currentPage += 1
-				this.getIndexBuyData()
+				this.Data()
 			}
 		},
 		methods: {
-			
+			getData(){
+				var data=[]
+				// this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', 
+				// {compId:this.pcUserInfo.compId,flag:3}).then(res => {
+				// 	if(res.data.code==200){
+				// 		for(var i=0;i<res.data.data.length;i++){
+				// 			data.push({value:res.data.data[i].contractNo,label:res.data.data[i].contractNo})
+				// 		}
+				// 		this.contractNoList=data
+				// 	}
+				// })
+				this.$api.doRequest('get', '/salesDeliveryReport/getInfo', {id:this.id}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+					}
+					})
+			},
+			confirm(item){
+				this.list.contractNo=item[0].value
+			},
+			audit(){
+				var that=this
+				uni.showModal({
+					content: "是否确定通过审核？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId:that.list.taskId,
+								approved: true,
+								auditMind: '34',
+								needReapply: false,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('审核成功');
+										that.$nextTick(function(){
+											uni.navigateBack()
+										})
+									}else{
+										that.$api.msg(res1.data.message);
+									}
+								})
+							}
+						}
+				})
+			},
+			reject(){
+				var that=this
+				uni.showModal({
+					content: "是否确定驳回？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId:that.list.taskId,
+								approved: false,
+								auditMind: '已驳回',
+								needReapply: true,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('驳回成功');
+										that.$nextTick(function(){
+											uni.navigateBack()
+										})
+									}else{
+										that.$api.msg(res1.data.message);
+									}
+								}).catch()
+							}
+						}
+				})
+			}
 		}
 	}
 </script>

store/index.js

@@ -44,6 +44,12 @@ const saveLifeData = function(key, value) {
 
 const store = new Vuex.Store({
 	state: {
+		enter:{
+			compName:'',
+			title:'',
+			mainBusinessType:'',
+			companyProfile:'',
+		},
 		hasLogin: false,
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		pushRes:lifeData.pushRes?lifeData.pushRes: {},
@@ -115,6 +121,7 @@ const store = new Vuex.Store({
 			state.userInfo = provider;
 			uni.setStorageSync('userInfo', provider)
 		},
+		
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
@@ -130,7 +137,14 @@ const store = new Vuex.Store({
 		
 	},
 	actions: {
-	
+		enterchange(state, provider) {
+	    console.log(state)  
+		console.log(provider)  
+		state.compName = provider.compName;  
+		state.title = provider.title;  
+		state.mainBusinessType = provider.mainBusinessType;  
+		state.companyProfile = provider.companyProfile;  
+		},  
 	},
 	getters: {
 		getUserInfo(state) {