前端gjy

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" : {
@@ -90,7 +100,8 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<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\"/>"
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ]
             },
             "icons" : {
@@ -155,7 +166,9 @@
         "modules" : {
             "SQLite" : {},
             "Push" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "Geolocation" : {},
+            "Fingerprint" : {}
         },
         "splashscreen" : {
             "waiting" : false

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/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'>50m</view>
 				</view>
 			</view>
 		</view>

pages/grain_pulse/position/position.vue

@@ -204,9 +204,11 @@
 			},
 			// 重新定位
 			reloadPosition() {
+				console.log(111111)
 				var that = this
 				that.po_tips = '定位中...'
 				let countdown = setInterval(() => {
+					console.log(2222)
 					that.seconds--;
 					uni.getLocation({
 						type: 'gcj02',

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>