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

# Conflicts:
#	config/index.js

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.107:9100/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
 	baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages.json

@@ -148,10 +148,45 @@
 			}
 		},
 		{
-			"path": "pages/task/details",
+			"path": "pages/task/procurement_details",
 			"style": {
 				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "详情"
+				"navigationBarTitleText": "采购订单详情"
+			}
+		},
+		{
+			"path": "pages/task/sale_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "销售订单详情"
+			}
+		},
+		{
+			"path": "pages/task/procurement_report_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "采购入库统计详情"
+			}
+		},
+		{
+			"path": "pages/task/sale_report_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "销售出库统计详情"
+			}
+		},
+		{
+			"path": "pages/task/sale_close_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "销售平仓统计详情"
+			}
+		},
+		{
+			"path": "pages/task/procurement_close_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "采购平仓统计详情"
 			}
 		},
 		{

pages/grain_pulse/dynamic.vue

@@ -71,7 +71,8 @@
 				currentPage: 1,
 				pageSize: 10,
 				isLoadMore: false,
-				loadStatus: "loading"
+				loadStatus: "loading",
+				getCompany:{},
 			}
 		},
 		computed: {
@@ -102,9 +103,6 @@
 			this.getrelease()
 		},
 		methods: {
-			// parseLoaded() {
-			// 	this.$refs.uReadMore.init();
-			// },
 			getrelease() {
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: this.currentPage,
@@ -134,9 +132,31 @@
 				this.keyword = ""
 			},
 			release() {
-				uni.navigateTo({
-					url: `/pages/grain_pulse/release`
-				})
+				this.getCompany.loginPhone = this.userInfo.phone
+				this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
+					.then(res => {
+						if (res.data.code == 200) {
+							if(res.data.data.length > 0){
+								uni.navigateTo({
+									url: `/pages/grain_pulse/release`
+								})
+							}else{
+								uni.showModal({
+									content: "您还没有入驻粮脉，不能发布，是否前去完善入驻信息！",
+									showCancel: true,
+									confirmText: '前往',
+									success: function(res) {
+										if (res.confirm) {
+											uni.navigateTo({
+												url: `/pages/grain_pulse/enter`
+											})
+										}
+									}
+								})
+							}
+						}
+					})
+				
 			},
 			record() {
 				uni.navigateTo({

pages/grain_pulse/enter.vue

@@ -158,6 +158,7 @@
 				show: false,
 				// anNiuCss:"types",
 				anNiuCss: [],
+				position:{},
 				custombtn:true,
 				custombtnimage:'../../static/img/liangmai/ic_shanchuan@3x.png',
 				custombtnwidth:50,
@@ -167,7 +168,10 @@
 
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			console.log(options)
+			this.position=JSON.parse(options.position)
+			console.log(this.position)
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])

pages/grain_pulse/friendcircle.vue

@@ -0,0 +1,11 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/grain_pulse/localtion/coordinate.nvue

@@ -126,6 +126,9 @@
 
 			},
 			config() {
+				// console.log("this.position",this.position)
+					// this.position.selectLocation = this.position.longitude+","+this.position.latitude
+					// console.log("this.position",this.position)
 				uni.navigateTo({
 						url:"/pages/grain_pulse/enter?position="+JSON.stringify(this.position)
 				})

pages/grain_pulse/localtion/coordinate.vue

@@ -125,7 +125,10 @@
 				this.covers = newmarker
 
 			},
-			config() {debugger
+			config() {
+				// console.log("this.position",this.position)
+					// this.position.selectLocation = this.position.longitude+","+this.position.latitude
+					// console.log("this.position",this.position)
 				uni.navigateTo({
 						url:"/pages/grain_pulse/enter?position="+JSON.stringify(this.position)
 				})

pages/grain_pulse/record.vue

@@ -26,17 +26,16 @@
 					<view class="touxiang">
 						<image :src="portraits" mode="" style="height: 76rpx;border-radius: 8rpx;"></image>
 					</view>
-					<view class="" style="margin: 20rpx 30rpx;">
+					<view style="margin: 20rpx 0 0 30rpx;width: 72%;">
 						<view style="color: #333333;font-weight: 600;font-size: 34rpx;">{{item.compName}}</view>
 						<view style="color: #AFB3BF; margin-top: 4rpx;">{{item.updateDate}}</view>
 					</view>
-					<view class="flex" style="width: 40%; justify-content: flex-end;margin: 40rpx;">
-						<view style="color: #FE6430;"
+					<view class="flex" style="width: 16%; justify-content: flex-end;margin-top: 40rpx;">
+						<view style="color: #FE6430;margin-right: 16rpx;"
 							v-if="item.status == '审核中' || item.status == '未审核'|| item.status == '待审核'">{{item.status}}
 						</view>
-						<view style="color: #22C572;" v-if="item.status == '已通过'">{{item.status}}</view>
-						<view style="color: #FB1E1E;" v-if="item.status == '已驳回'">{{item.status}}</view>
-
+						<view style="color: #22C572;margin-right: 16rpx;" v-if="item.status == '已通过'">{{item.status}}</view>
+						<view style="color: #FB1E1E;margin-right: 16rpx;" v-if="item.status == '已驳回'">{{item.status}}</view>
 					</view>
 				</view>
 				<view class="title">{{item.title}}</view>
@@ -136,6 +135,7 @@
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
+			this.release = []
 		},
 		onReachBottom() { //上拉触底函数
 			var that = this
@@ -175,17 +175,21 @@
 				this.getRelease()
 			},
 			getRelease() {
-				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
-						currentPage: this.currentPage,
-						pageSize: this.pageSize,
-						loginPhone: this.userInfo.phone,
-						searchType: this.searchType
-					})
-					.then(res => {
-						if (res.data.code == 200) {
-							if (!this.searchType) {
+				if (!this.searchType) {
+					this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							loginPhone: this.userInfo.phone,
+							searchType: this.searchType
+						})
+						.then(res => {
+							if (res.data.code == 200) {
+									if(this.currentPage = 1 ){
+										this.release = []
+									}
 								this.releaseInfo = res.data.data.records
 								if (this.releaseInfo.length > 0) {
+									
 									this.release = this.release.concat(this.releaseInfo)
 									this.count = this.release.length
 									this.isLoadMore = false
@@ -195,9 +199,20 @@
 								} else {
 									this.loadStatus = 'nomore'
 								}
-							} else {
-								debugger
-								if (this.searchTypeInfo == this.searchType) {
+							}
+						})
+						this.searchTypeInfo = this.searchType
+				} else {
+					if (this.searchTypeInfo == this.searchType) {
+						// this.loadStatus = "loading"
+						this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+								currentPage: this.currentPage,
+								pageSize: this.pageSize,
+								loginPhone: this.userInfo.phone,
+								searchType: this.searchType
+							})
+							.then(res => {
+								if (res.data.code == 200) {
 									this.releaseInfo = res.data.data.records
 									if (this.releaseInfo.length > 0) {
 										this.release = this.release.concat(this.releaseInfo)
@@ -209,30 +224,38 @@
 									} else {
 										this.loadStatus = 'nomore'
 									}
-								}else{
-										this.release = []
-										this.releaseInfo = res.data.data.records
-										if (this.releaseInfo.length > 0) {
-											this.release = this.release.concat(this.releaseInfo)
-											this.count = this.release.length
-											this.isLoadMore = false
-											for (let i = 0; i < this.release.length; i++) {
-												this.release[i].imgList = this.release[i].address.split(",")
-											}
-										} else {
-											this.loadStatus = 'nomore'
+								}
+							})
+					} else {
+						this.release = []
+						this.currentPage = 1
+						this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
+								currentPage: this.currentPage,
+								pageSize: this.pageSize,
+								loginPhone: this.userInfo.phone,
+								searchType: this.searchType
+							})
+							.then(res => {
+								if (res.data.code == 200) {
+									this.releaseInfo = res.data.data.records
+									if (this.releaseInfo.length > 0) {
+										this.release = this.release.concat(this.releaseInfo)
+										this.count = this.release.length
+										this.isLoadMore = false
+										for (let i = 0; i < this.release.length; i++) {
+											this.release[i].imgList = this.release[i].address.split(",")
 										}
+									} else {
+										this.loadStatus = 'nomore'
+									}
 								}
-								this.searchTypeInfo = this.searchType
-
-							}
-
-
-
+							})
+					}
+					this.searchTypeInfo = this.searchType
+				}
 
-						}
-					})
 			},
+
 			delRecord(item) {
 				var that = this
 				uni.showModal({

pages/grain_pulse/release.vue

@@ -83,7 +83,6 @@
 			}
 			this.companyList()
 		},
-
 		methods: {
 			companyList() {
 				this.getCompany.loginPhone = this.userInfo.phone
@@ -129,7 +128,7 @@
 				}
 				if (!this.release.city) {
 					this.$api.msg('城市不能为空,功能没完成')
-					// return
+					 return
 				}
 				if (!this.release.title) {
 					this.$api.msg('标题不能为空')
@@ -149,53 +148,51 @@
 					this.$api.msg("动态内容和图片不能同时为空")
 					return
 				}
-				if (this.companyType.length == 0) {
-					uni.showModal({
-						content: "您还没有入驻粮脉，不能发布，是否前去完善入驻信息！",
-						showCancel: true,
-						confirmText: '前往',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: `/pages/grain_pulse/enter`
-								})
-							}
-						}
+				var that = this
+				that.$api.doRequest('get', '/settledCompanyDynamics/count', {
+						phone: this.userInfo.phone
 					})
-					return
-				} else {
-					this.release.address = this.address.toString()
-					this.release.phone = this.userInfo.phone
-					var that = this
-					uni.showModal({
-						content: "确定发布动态？",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.$api.doRequest('post',
-										'/settledCompanyDynamics/api/addSettledCompanyDynamics', that.release)
-									.then(res => {
-										if (res.data.code == 200) {
-											uni.showToast({
-												title: '发布成功！',
-												icon: 'none',
-												duration: 2000,
-												success() {
-													setTimeout(function() {
-														uni.navigateBack(1)
-													}, 1000);
-												}
-											})
-
+					.then(res => {
+						if (res.data.code == 200) {
+							if (res.data.data > 5) {
+								uni.showToast({
+									title: '今日发布已达上限！',
+									icon: 'none',
+									duration: 2000,
+								})
+							} else {
+								this.release.address = this.address.toString()
+								this.release.phone = this.userInfo.phone
+								var that = this
+								uni.showModal({
+									content: "确定发布动态？",
+									showCancel: true,
+									confirmText: '确定',
+									success: function(res) {
+										if (res.confirm) {
+											that.$api.doRequest('post',
+													'/settledCompanyDynamics/api/addSettledCompanyDynamics',
+													that.release)
+												.then(res => {
+													if (res.data.code == 200) {
+														uni.showToast({
+															title: '发布成功！',
+															icon: 'none',
+															duration: 2000,
+															success() {
+																setTimeout(function() {
+																	uni.navigateBack(1)
+																}, 1000);
+															}
+														})
+													}
+												})
 										}
-									})
+									}
+								})
 							}
 						}
 					})
-				}
-
-
 			},
 			location() {
 				uni.navigateTo({

pages/task/my_task.vue

@@ -15,20 +15,11 @@
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex">
-					<text v-if='statusFlag==1'>
-						{{item.carNo}}({{item.tranCarNo}})
-					</text>
-					<text v-else>{{item.messageTitle}}</text>
+					<text >{{item.messageTitle}}</text>
 					<view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
-					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
+					<view  class="title-tip" v-if="statusFlag==1">未完成</view>
 				</view>
-				<view v-if='statusFlag==1' class="flex title_b">
-					<view class="title-tip">
-						{{item.contractNo}}
-					</view>
-					<view class="title-tip-b">{{item.inOutDate}}</view>
-				</view>
-				<view v-else class="flex title_b">
+				<view class="flex title_b">
 					<view class="title">
 						{{item.messageContent}}
 					</view>
@@ -142,8 +133,6 @@
 				if(!this.keyword){
 					this.$api.msg('关键字不能为空')
 				}
-				this.warehouseInOutInfo.statusFlag = this.statusFlag
-				this.warehouseInOutInfo.keyWord = this.keyword
 				uni.showLoading({
 					title:"正在加载"
 				})
@@ -182,7 +171,7 @@
 				this.warehouseInOutInfo.pcFlag = 0
 				if(this.statusFlag==1){
 					data=this.warehouseInOutInfo
-					url='/warehouseInOutInfo/selectInfo'
+					url='/noticeTask/query/noticeTasks'
 				}else{
 					data=this.data
 					url='/commonUser/query/findHisPageNoticeTasks'
@@ -208,7 +197,6 @@
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
-						if(this.statusFlag==3){
 							for(var i=0;i<this.taskInfo.length;i++){
 								if(this.taskInfo[i].businessType=='WAREHOUSE'){
 									if(this.taskInfo[i].businessCode=='INOUTTASK-TASK-APPROVE'){
@@ -230,11 +218,10 @@
 									}
 								}else if(this.taskInfo[i].businessType=='SALE'){
 									if(this.taskInfo[i].businessCode=='SALE-ORDER-APPROVE'){
-										this.taskInfo[i].messageTitle='采购订单'
+										this.taskInfo[i].messageTitle='销售订单'
 									}
 								}
 							}
-						}
 						if(res.data.data.records.length==0){
 							that.isSole=true
 						}else{
@@ -262,28 +249,54 @@
 				this.getIndexBuyData(1)
 			},
 			navToDetailPage(item) {
-				if(item.taskType == "入库任务"){
-					
-				if(item.statusFlag == 3){
-				uni.navigateTo({
-					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
-				})
-				}else{
+				if(item.businessCode=='PROCUREMENT-ORDER-APPROVE'){
 					uni.navigateTo({
-						url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+						url:'/pages/task/procurement_details?id='+item.businessId
 					})
-				}
-			}else if(item.taskType == "出库任务"){
-				if(item.statusFlag == 3){
-				uni.navigateTo({
-					url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
-				})
-				}else{
+				}else if(item.businessCode=='SALE-ORDER-APPROVE'){
 					uni.navigateTo({
-						url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+						url:'/pages/task/sale_details?id='+item.businessId
+					})
+				}else if(item.businessCode=='PROCUREMENT-RECEIPT-REPORT'){
+					uni.navigateTo({
+						url:'/pages/task/procurement_report_details'
+					})
+				}else if(item.businessCode=='PROCUREMENT-CLOSE-REPORT'){
+					uni.navigateTo({
+						url:'/pages/task/procurement_close_details'
+					})
+				}else if(item.businessCode=='SALE-RECEIPT-REPORT'){
+					uni.navigateTo({
+						url:'/pages/task/sale_report_details'
+					})
+				}else if(item.businessCode=='SALE-CLOSE-REPORT'){
+					uni.navigateTo({
+						url:'/pages/task/sale_close_details'
 					})
 				}
-			}
+				
+			// 	if(item.taskType == "入库任务"){
+					
+			// 	if(item.statusFlag == 3){
+			// 	uni.navigateTo({
+			// 		url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+			// 	})
+			// 	}else{
+			// 		uni.navigateTo({
+			// 			url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+			// 		})
+			// 	}
+			// }else if(item.taskType == "出库任务"){
+			// 	if(item.statusFlag == 3){
+			// 	uni.navigateTo({
+			// 		url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+			// 	})
+			// 	}else{
+			// 		uni.navigateTo({
+			// 			url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+			// 		})
+			// 	}
+			// }
 			}
 		}
 	}

pages/task/procurement_details.vue

@@ -0,0 +1,173 @@
+<template name="task">
+	<view class="content">
+	<u-form :model="form" ref="uForm">
+			<u-form-item label-width='260' label="合同编号">
+				<view @click="show = true">{{list.contractNo?list.contractNo:'请选择合同编号'}}</view>
+				<u-select v-model="show" mode="single-column" :list="contractNoList" @confirm="confirm"></u-select>
+			</u-form-item>
+			<u-form-item label-width='260' label="采购计划">
+				{{list.procurementPlan}}
+			</u-form-item>
+			<u-form-item label-width='260' label="客户">
+				{{list.seller}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="现货"' label-width='260' label="单价(元/吨)">
+				<u-input v-model="list.unitPrice" />
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差(元/吨)">
+				{{list.basis}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金(元)">
+				{{list.freezingDeposit}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="拖欠定金(元)">
+				{{list.defaultDeposit}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+				{{list.unloadingCharge}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="发票费(元/吨)">
+				{{list.invoiceFee}}
+			</u-form-item>
+			<u-form-item label-width='260' label="合同重量(吨)">
+				{{list.transactionsNumber}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已入库量(吨)">
+				{{list.stockInQuantity}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="可平仓量(吨)">
+				{{list.openPosition}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已平仓量(吨)">
+				{{list.closedPosition}}
+			</u-form-item>
+			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="已成交量(吨)">
+				{{list.cumulativeTurnover}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="发票类型">
+				{{list.type}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="包装方式">
+				{{list.packingType}}
+			</u-form-item>
+			<u-form-item label-width='260' label="状态">
+				{{list.status}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="更新时间">
+				{{list.updateDate}}
+			</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>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				show:false,
+				id:0,
+				form: {
+					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() {
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
+			// this.userInfo =  uni.getStorageSync("userInfo")
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				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', '/purchaseOrder/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', '/purchaseOrder/api/editPurchaseOrder', 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);
+								}
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

pages/task/procurement_report_details.vue

@@ -0,0 +1,193 @@
+<template name="task">
+	<view class="content">
+	<u-form :model="form" ref="uForm">
+			<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="状态">
+				{{list.status}}
+			</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>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				show:false,
+				id:0,
+				form: {
+					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() {
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
+			// this.userInfo =  uni.getStorageSync("userInfo")
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				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', '/saleOrder/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', '/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);
+										}
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

pages/task/sale_close_details.vue

@@ -0,0 +1,107 @@
+<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>
+		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				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
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.getIndexBuyData()
+			// this.userInfo =  uni.getStorageSync("userInfo")
+			this.warehouseInOutInfo.phone = this.userInfo.phone
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				this.getIndexBuyData()
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

pages/task/sale_details.vue

@@ -0,0 +1,173 @@
+<template name="task">
+	<view class="content">
+	<u-form :model="form" ref="uForm">
+			<u-form-item label-width='260' label="合同编号">
+				<view @click="show = true">{{list.contractNo?list.contractNo:'请选择合同编号'}}</view>
+				<u-select v-model="show" mode="single-column" :list="contractNoList" @confirm="confirm"></u-select>
+			</u-form-item>
+			<u-form-item label-width='260' label="采购计划">
+				{{list.salePlan}}
+			</u-form-item>
+			<u-form-item label-width='260' label="客户">
+				{{list.buyer}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="现货"' label-width='260' label="单价(元/吨)">
+				<u-input v-model="list.unitPrice" />
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差(元/吨)">
+				{{list.basis}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金(元)">
+				{{list.freezingDeposit}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="拖欠定金(元)">
+				{{list.defaultDeposit}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="卸车费(元/吨)">
+				{{list.unloadingCharge}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="发票费(元/吨)">
+				{{list.invoiceFee}}
+			</u-form-item>
+			<u-form-item label-width='260' label="合同重量(吨)">
+				{{list.transactionsNumber}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已出库量(吨)">
+				{{list.stockOutQuantity}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="可平仓量(吨)">
+				{{list.openPosition}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已平仓量(吨)">
+				{{list.closedPosition}}
+			</u-form-item>
+			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="已成交量(吨)">
+				{{list.cumulativeTurnover}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="发票类型">
+				{{list.type}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="包装方式">
+				{{list.packingType}}
+			</u-form-item>
+			<u-form-item label-width='260' label="状态">
+				{{list.status}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="更新时间">
+				{{list.updateDate}}
+			</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>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				show:false,
+				id:0,
+				form: {
+					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() {
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
+			// this.userInfo =  uni.getStorageSync("userInfo")
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				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', '/saleOrder/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', '/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);
+										}
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

pages/task/sale_report_details.vue

@@ -0,0 +1,107 @@
+<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>
+		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				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
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.getIndexBuyData()
+			// this.userInfo =  uni.getStorageSync("userInfo")
+			this.warehouseInOutInfo.phone = this.userInfo.phone
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				this.getIndexBuyData()
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>