叫号新需求添加页面

pages/erp/demo.vue → demo.vue

@@ -48,25 +48,18 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
+			uni.showLoading({
+				title:"加载中...",
+				mask:true
+			})
+			uni.hideLoading()
+			that.$api.msg('添加成功')
+			uni.setStorageSync("depotAcquisition_warehouseName",this.warehouseName)
+			uni.getStorageSync("depotAcquisition_warehouseName")
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
-					// uni.showModal({
-					// 	title: '登录提示',
-					// 	content: '当前登入信息验证失败，是否重新登录？',
-					// 	showCancel: true,
-					// 	confirmText: '登录',
-					// 	success: (e) => {
-					// 		if (e.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/public/login'
-					// 			})
-					// 		}
-					// 	},
-					// 	fail: () => {},
-					// 	complete: () => {}
-					// })
 				}
 			})
 			console.log("hasLogin", this.hasLogin)

pages.json

@@ -1158,6 +1158,69 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/audit/acquisition_information_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购信息审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/acquisition_information_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购信息详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/erpbusiness/acquisitionInformation",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购信息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/depotAcquisition/depotAcquisition",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "库点收购",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/depotAcquisition/grainDeliveryRegistration",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "送粮登记",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/depotAcquisition/grainDeliveryRecord",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "送粮记录",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/depotAcquisition/grainDeliveryRecord",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subpackages": [{
 			"root": "pageA",

pages/erpbusiness/acquisitionInformation.vue

@@ -0,0 +1,300 @@
+<template>
+	<view class="wrap">
+		<view class='content1'>
+			<view class='row content-item'>
+				<view class="left" style="color: #878C9C ;">仓库</view>
+				<view class="right" @click='show1=true'>
+					<view>{{warehouseName}}</view>
+					<u-icon name="arrow-right" color=""></u-icon>
+					<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show1"
+						:range="warehouseList"></u-picker>
+				</view>
+			</view>
+			<view class='row content-item'>
+				<textarea placeholder="请输入仓库信息" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<view class="textarea-bottom">{{textareaValue?textareaValue.length:'0'}}/2000字</view>
+			</view>
+			<view class='row content-item'>
+				<u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox>
+			</view>
+		</view>
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="submit()">提交</u-button>
+		</view>
+		<u-toast ref="uToast" />
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='收购信息'
+			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				isSHowBtn: true,
+				isShowAlert: false,
+				isShowAlert1: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				content1: '确定提交收购信息？',
+				textareaValue: '',
+				value: false,
+				warehouseName: '暂无仓库',
+				warehouseList: [],
+				show1: false,
+				status: "",
+				isEdit: false,
+				sgId: '',
+				id: ''
+			}
+		},
+
+		onLoad(options) {
+			debugger
+			this.status = options.status
+			this.sgId = options.id
+			console.log("this.status", this.status)
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			uni.showLoading({
+				title: "加载中...",
+				mask: true
+			})
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+					// uni.showModal({
+					// 	title: '登录提示',
+					// 	content: '当前登入信息验证失败，是否重新登录？',
+					// 	showCancel: true,
+					// 	confirmText: '登录',
+					// 	success: (e) => {
+					// 		if (e.confirm) {
+					// 			uni.navigateTo({
+					// 				url: '/pages/public/login'
+					// 			})
+					// 		}
+					// 	},
+					// 	fail: () => {},
+					// 	complete: () => {}
+					// })
+				}
+				this.init()
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			init() {
+				let _obj = {
+					commonId: this.sgId
+				}
+				this.$api.doRequest('get', '/acquisitionInfo/getInfo', _obj).then(res => {
+					if (res.data.code == 200) {
+						debugger
+						if (res.data.data) {
+							this.isEdit = true
+							this.value = res.data.data.checkFlag == '0' ? false : true
+							this.warehouseName = res.data.data.warehouseName
+							this.textareaValue = res.data.data.acquisitionInformation
+							this.id = res.data.data.id
+						} else {
+							this.isEdit = false
+							this.value = false
+						}
+					}
+				})
+
+
+
+				switch (this.status) {
+					case '已隐藏':
+						break;
+					case '显示中':
+
+						break;
+				}
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
+					compId: uni.getStorageSync('pcUserInfo').compId,
+				}).then(res => {
+					if (res.data.data.length != 0) {
+						uni.hideLoading()
+						// let _showData = uni.getStorageSync("erpSelectWarehous")
+						// let _showCWData = uni.getStorageSync("erpSelectWarehousCW")
+						this.warehouseList = res.data.data
+						let _storangewarehouseName = uni.getStorageSync("depotAcquisition_warehouseName")
+						if (_storangewarehouseName) {
+							this.warehouseName = _storangewarehouseName
+						} else {
+							this.warehouseName = res.data.data[0].warehouseName
+						}
+					} else {
+						this.warehouseList = []
+						this.warehouseName = '暂无仓库'
+					}
+				})
+			},
+			warehousechange(e) {
+				this.warehouseName = this.warehouseList[e[0]].warehouseName
+				this.warehouseId = this.warehouseList[e[0]].id
+				uni.setStorageSync("depotAcquisition_warehouseName", this.warehouseName)
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
+			alertBtn1() {
+				debugger
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				})
+				let _flag = ''
+				if (this.value) {
+					_flag = 1
+				} else {
+					_flag = 0
+				}
+
+				let _obj = {
+					warehouseName: this.warehouseName,
+					acquisitionInformation: this.textareaValue,
+					checkFlag: _flag,
+					followFlag: "0",
+
+				}
+				if (this.isEdit) {
+					_obj.id = this.id
+				}
+				this.$api.doRequest('post', '/acquisitionInfo/api/addAcquisition', _obj).then(res => {
+					if (res.data.code == 200) {
+						uni.hideLoading()
+						this.$api.msg('添加成功')
+					uni.navigateBack()
+					}
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			checkBoxChange(e) {
+				console.log("e-----", e)
+				this.value = !this.value
+				console.log("value----", this.value)
+			},
+			submit() {
+				this.isShowAlert1 = true
+
+				// this.$api.msg('提交成功')
+				// this.$api.msg('提交失败')
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+
+		/* border-bottom: 1px solid #EEEEEE; */
+		input {
+			font-size: 28rpx;
+			// color: #333333;
+		}
+
+		.right {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.textarea {
+		background: #F9F9FA;
+		font-size: 12px;
+		text-align: left;
+		width: 100%;
+		height: 60px;
+		padding: 10px;
+		border-radius: 5px;
+		margin-top: 10px;
+		height: 50vh;
+		padding-bottom: 20rpx;
+	}
+
+	.textarea-bottom {
+		position: absolute;
+		bottom: 20rpx;
+		right: 20rpx;
+		color: #606266;
+	}
+
+	.submit {
+		/* width: 90%; */
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+
+	.bottom-btn {
+		position: fixed;
+		bottom: 30rpx;
+		width: 90%;
+	}
+</style>

pages/erpbusiness/customer.vue

@@ -4,29 +4,40 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 				<view style='flex:6;' class="search-form round Medium">
 					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-					<input @input='searchinput' type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
-						 placeholder="输入客户姓名或手机号" confirm-type="search"></input>
+					<input @input='searchinput' type="text" maxlength="20" :focus="true" v-model="searchKeyWord"
+						@confirm="doSearch()" placeholder=" 输入客户姓名、客户手机号或供应商姓名" confirm-type="search"></input>
 				</view>
 				<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
-				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34" name="close-circle-fill" color="#D6D9E0"></u-icon>
+				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34"
+					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 		</view>
 		<view class="content">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
-			
+
 			<view v-for='item in gridList'>
 				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
 					<view v-if="item.supplier"> {{item.customerName}}({{item.customerPhone}})-{{item.supplier}} </view>
 					<view v-else> {{item.customerName}}({{item.customerPhone}}) </view>
 				</view>
 			</view>
-			<view   v-for='item in gridList' style='display:inline-block;'>
+			<view v-for='item in gridList' style='display:inline-block;'>
 				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>{{item.searchContent}}</view>
 			</view>
-			
 		</view>
+		<view class="content content1">
+			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 		
+			<view v-for='item in gridList'>
+				<view class="row">
+					<view class="row-item">辽H12345</view>
+					<view class="row-item">张三（货）</view>
+					<view class="row-item">李四（商）</view>
+				</view>
+			</view>
+		</view>
+
 		<view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
@@ -50,188 +61,134 @@
 				modalName: '',
 				mycarStyle: '',
 				feild: undefined,
-				params:{},
-				selector:[],
-				isContent:false,
-				loadStatus:'noMore',
+				params: {},
+				selector: [],
+				isContent: false,
+				loadStatus: 'noMore',
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
 				footprintList: [],
-				searchKeyWord:'',
+				searchKeyWord: '',
 				isVip: false,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
-				show:false,
-				pageSize:10,
-				currentPage:1,
+				show: false,
+				pageSize: 10,
+				currentPage: 1,
 				gridBorder: false,
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				userphone:"",
-				username:"请更改昵称",
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
+				username: "请更改昵称",
 				gridList: [],
-				managementType:'',
+				managementType: '',
 				warehouseName: '',
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				customerList:[],
-				purchasePriceList:[],
-				warehouseCount:'',
-				commonWarehouseNo:'',
-				cangid:''
-				
+				customerList: [],
+				purchasePriceList: [],
+				warehouseCount: '',
+				commonWarehouseNo: '',
+				cangid: ''
+
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
-			starUserphone(){
+			starUserphone() {
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				if(this.userphone){
+				if (this.userphone) {
 					return this.userphone.replace(reg, "$1****$2");
 				}
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.cangid = options.cangid
-			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName',{
-				warehouseId:this.cangid
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.cangid
 			}).then(res => {
-				if(res.data.data){
-					uni.setStorageSync('purchasePriceList',res.data.data)
-					this.purchasePriceList=uni.getStorageSync('purchasePriceList')
+				if (res.data.data) {
+					uni.setStorageSync('purchasePriceList', res.data.data)
+					this.purchasePriceList = uni.getStorageSync('purchasePriceList')
 				}
 			})
 		},
 		onShow() {
-			this.purchasePriceList=uni.getStorageSync('purchasePriceList')
-			this.gridList=[]
-			this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo',{
-				pageSize:this.pageSize,
-				currentPage:this.currentPage,
-				functionType:"3",
-				commonId:this.userInfo.id
+			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
+			this.gridList = []
+			this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo', {
+				pageSize: this.pageSize,
+				currentPage: this.currentPage,
+				functionType: "3",
+				commonId: this.userInfo.id
 			}).then(res => {
-				if(res.data.data){
-					this.gridList=res.data.data.records
+				if (res.data.data) {
+					this.gridList = res.data.data.records
 					console.log(this.gridList)
 				}
 			})
-			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
-				compId:'',
-				authenticationStatusKey:7,
+			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+				compId: '',
+				authenticationStatusKey: 7,
 			}).then(res => {
-				if(res.data.data){
-					this.customerList=res.data.data
-					}
+				if (res.data.data) {
+					this.customerList = res.data.data
+				}
 			})
 		},
 		methods: {
-			searchinput(e){
-				if(this.searchKeyWord.length==0){
-					this.show=false
+			searchinput(e) {
+				if (this.searchKeyWord.length == 0) {
+					this.show = false
 					this.getList()
 				}
-				
+
 			},
-			checkcustomer(item){
-				
+			checkcustomer(item) {
+
 				var that = this
-				var count=''
-				if(item.authenticationStatus=='已认证'){
-					uni.showLoading({title: '加载中'})
-					that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
-						commonId:that.userInfo.id,
-						searchContent:item.customerName+'('+item.customerPhone+')',
-						functionType:3
-					}).then(res => {
-						
-						uni.setStorageSync('checkcustomer',item)
-						that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
-							compId:'',
-							customerName: item.customerName,
-							goodsName: uni.getStorageSync('goodsName'),
-						}).then(res => {
-							if(res.data.code==200){
-								count=res.data.data
-								that.$api.doRequest('get', '/paymentManagement/cumulant',{
-									compId:'',
-									customerName: item.customerName,
-									goodsName: uni.getStorageSync('goodsName'),
-								}).then(res => {
-									for (let i = 0; i < that.purchasePriceList.length; i++) {
-										var data = res.data.data/1000
-										if(that.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
-											if(that.purchasePriceList[i].saleLimit - data < 50 || count > 0){
-												that.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`)
-											}
-										}
-									}
-									that.show=false
-									uni.hideLoading()
-									uni.navigateBack()
-								})
-							}
-						})
-					})
-					.catch(res => {
-						uni.showToast({
-							title: '系统异常，请联系管理员',
-							icon: 'none',
-							duration: 2000
-						})
-						uni.hideLoading()
+				var count = ''
+				if (item.authenticationStatus == '已认证') {
+					uni.showLoading({
+						title: '加载中'
 					})
-					
-					
-					
-				}else{
-					this.$api.msg('客户身份不可用')
-				}
-				
-			},
-			recentcustomer(item){
-				var count=''
-				var that = this
-				var name=item.searchContent.split('(')[0]
-				var phone=item.searchContent.split('(')[1]
-				phone = phone.substring(0,phone.length-1)
-				for(var i=0;i<this.customerList.length;i++){
-					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
-					if(this.customerList[i].customerPhone==phone){
-						var tmpName = this.customerList[i].customerName
-						uni.setStorageSync('checkcustomer',this.customerList[i])
-						uni.showLoading({title: '加载中'})
-						that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
-							commonId:that.userInfo.id,
-							searchContent:this.customerList[i].customerName+'('+this.customerList[i].customerPhone+')',
-							functionType:3
+					that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+							commonId: that.userInfo.id,
+							searchContent: item.customerName + '(' + item.customerPhone + ')',
+							functionType: 3
 						}).then(res => {
-							that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
-								compId:'',
-								customerName: tmpName,
+
+							uni.setStorageSync('checkcustomer', item)
+							that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+								compId: '',
+								customerName: item.customerName,
 								goodsName: uni.getStorageSync('goodsName'),
 							}).then(res => {
-								if(res.data.code==200){
-									count=res.data.data
-									that.$api.doRequest('get', '/paymentManagement/cumulant',{
-										compId:'',
-										customerName: tmpName,
+								if (res.data.code == 200) {
+									count = res.data.data
+									that.$api.doRequest('get', '/paymentManagement/cumulant', {
+										compId: '',
+										customerName: item.customerName,
 										goodsName: uni.getStorageSync('goodsName'),
-									}).then(res => {	
+									}).then(res => {
 										for (let i = 0; i < that.purchasePriceList.length; i++) {
-											if(that.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
-												var data = res.data.data/1000
-												if(that.purchasePriceList[i].saleLimit -  data < 50 || count >0){
-													that.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`)
+											var data = res.data.data / 1000
+											if (that.purchasePriceList[i].goodsName == uni
+												.getStorageSync('goodsName')) {
+												if (that.purchasePriceList[i].saleLimit - data < 50 ||
+													count > 0) {
+													that.$api.msg(
+														`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`
+														)
 												}
 											}
 										}
-										that.show=false				
+										that.show = false
 										uni.hideLoading()
 										uni.navigateBack()
 									})
@@ -246,81 +203,151 @@
 							})
 							uni.hideLoading()
 						})
+
+
+
+				} else {
+					this.$api.msg('客户身份不可用')
+				}
+
+			},
+			recentcustomer(item) {
+				var count = ''
+				var that = this
+				var name = item.searchContent.split('(')[0]
+				var phone = item.searchContent.split('(')[1]
+				phone = phone.substring(0, phone.length - 1)
+				for (var i = 0; i < this.customerList.length; i++) {
+					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
+					if (this.customerList[i].customerPhone == phone) {
+						var tmpName = this.customerList[i].customerName
+						uni.setStorageSync('checkcustomer', this.customerList[i])
+						uni.showLoading({
+							title: '加载中'
+						})
+						that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+								commonId: that.userInfo.id,
+								searchContent: this.customerList[i].customerName + '(' + this.customerList[i]
+									.customerPhone + ')',
+								functionType: 3
+							}).then(res => {
+								that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+									compId: '',
+									customerName: tmpName,
+									goodsName: uni.getStorageSync('goodsName'),
+								}).then(res => {
+									if (res.data.code == 200) {
+										count = res.data.data
+										that.$api.doRequest('get', '/paymentManagement/cumulant', {
+											compId: '',
+											customerName: tmpName,
+											goodsName: uni.getStorageSync('goodsName'),
+										}).then(res => {
+											for (let i = 0; i < that.purchasePriceList.length; i++) {
+												if (that.purchasePriceList[i].goodsName == uni
+													.getStorageSync('goodsName')) {
+													var data = res.data.data / 1000
+													if (that.purchasePriceList[i].saleLimit - data <
+														50 || count > 0) {
+														that.$api.msg(
+															`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`
+															)
+													}
+												}
+											}
+											that.show = false
+											uni.hideLoading()
+											uni.navigateBack()
+										})
+									}
+								})
+							})
+							.catch(res => {
+								uni.showToast({
+									title: '系统异常，请联系管理员',
+									icon: 'none',
+									duration: 2000
+								})
+								uni.hideLoading()
+							})
 					}
 				}
 			},
-			emptysearch(){
-				this.show=false
-				this.searchKeyWord=''
-				this.gridList=[]
-				this.currentPage=1
+			emptysearch() {
+				this.show = false
+				this.searchKeyWord = ''
+				this.gridList = []
+				this.currentPage = 1
 				this.getList()
 			},
-			doSearch(){
-				this.show=true
-				this.gridList=[]
-				this.currentPage=1
+			doSearch() {
+				this.show = true
+				this.gridList = []
+				this.currentPage = 1
 				this.getList()
 			},
-			getList(){
+			getList() {
 				var that = this
-				var url=''
-				var data={}
-				if(this.searchKeyWord.length>0){
-					url='/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
-					data={
-						compId:'',
-						authenticationStatusKey:7,
-						searchKeyWord:this.searchKeyWord
+				var url = ''
+				var data = {}
+				if (this.searchKeyWord.length > 0) {
+					url = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
+					data = {
+						compId: '',
+						authenticationStatusKey: 7,
+						searchKeyWord: this.searchKeyWord
 					}
-				}else{
-					url='/searchRecordsInfo/selectSearchRecordsInfo'
-					data={
-						pageSize:this.pageSize,
-						currentPage:this.currentPage,
-						functionType:"3",
-						commonId:this.userInfo.id
+				} else {
+					url = '/searchRecordsInfo/selectSearchRecordsInfo'
+					data = {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						functionType: "3",
+						commonId: this.userInfo.id
 					}
 				}
-				this.$api.doRequest('get', url,data).then(res => {
-					if(res.data.data){
-						let data = res.data.data.records?res.data.data.records:res.data.data
+				this.$api.doRequest('get', url, data).then(res => {
+					if (res.data.data) {
+						let data = res.data.data.records ? res.data.data.records : res.data.data
 						//采购信息
 						if (data.length > 0) {
-								that.gridList = data
-						}else{
-							if(this.currentPage==1){
-								that.gridList=[]
+							that.gridList = data
+						} else {
+							if (this.currentPage == 1) {
+								that.gridList = []
 							}
-							this.isContent=true
+							this.isContent = true
 						}
 					}
 				})
 			},
-			edit(item){
+			edit(item) {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+					url: '/pages/erpbusiness/edit_quality_testing?id=' + item.id + '&managementType=' + this
+						.managementType + '&cangid=' + this.cangid
 				})
 			},
-			add(){
+			add() {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/add_quality_testing?managementType='+this.managementType+'&cangid='+this.cangid+'&warehouseCount='+this.warehouseCount+'&commonWarehouseNo='+this.commonWarehouseNo+'&warehouseName='+this.warehouseName
+					url: '/pages/erpbusiness/add_quality_testing?managementType=' + this.managementType +
+						'&cangid=' + this.cangid + '&warehouseCount=' + this.warehouseCount +
+						'&commonWarehouseNo=' + this.commonWarehouseNo + '&warehouseName=' + this.warehouseName
 				})
 			},
-			del(item){
-				this.$api.doRequest('post', '/qualityInspectionManagement/api/deleteQualityInspection',{
-					id:item.id
+			del(item) {
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/deleteQualityInspection', {
+					id: item.id
 				}).then(res => {
-					if(res.data.code==200){
+					if (res.data.code == 200) {
 						this.$api.msg('删除成功')
-						this.gridList=[]
+						this.gridList = []
 						this.getList()
-					}else{
+					} else {
 						this.$api.msg('系统异常，请联系管理员')
 					}
 				})
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -431,9 +458,10 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
+
 	.container {
 		padding-top: 85px;
 		padding-top: 35px;
@@ -470,6 +498,7 @@
 		color: #fff;
 		font-size: 32rpx;
 	}
+
 	@keyframes move_wave {
 		0% {
 			transform: translateX(0) translateZ(0) scaleY(1)
@@ -517,10 +546,11 @@
 		border-radius: 10upx;
 	}
 
-.cuIcon {
+	.cuIcon {
 		position: absolute;
 		right: 80px;
 	}
+
 	.grid-item-box {
 		flex: 1;
 		/* position: relative;
@@ -561,12 +591,13 @@
 			/* opacity: .7; */
 		}
 	}
+
 	.cover-container {
-		padding: 1px 10px ;
+		padding: 1px 10px;
 		padding-bottom: 200upx;
-		
-	   /* background-color: #F5F6FA; */
-	/* 	border-radius: 20px; */
+
+		/* background-color: #F5F6FA; */
+		/* 	border-radius: 20px; */
 		margin-top: 60upx;
 
 		.arc {
@@ -656,7 +687,8 @@
 			}
 		}
 	}
-.search-form {
+
+	.search-form {
 		background: #F5F6F9;
 	}
 
@@ -715,6 +747,7 @@
 		width: 100%;
 		background-color: rgb(242, 242, 242);
 	}
+
 	.grid {
 		display: flex;
 		align-items: center;
@@ -767,107 +800,140 @@
 		border-radius: 40px;
 		border: 2px solid #ffffff;
 	}
+
 	.information {
 		font-size: 15px;
 		font-weight: 600;
 		height: 36px;
 	}
-	.cu-list>.cu-item:after{
-		border:none;
+
+	.cu-list>.cu-item:after {
+		border: none;
 	}
-	.sign{
+
+	.sign {
 		width: 40px;
 		height: 40px;
 		top: 4px;
 		margin-right: 6px;
 	}
-	.indexUp{
-		padding:0 20px;
+
+	.indexUp {
+		padding: 0 20px;
 		align-items: center;
 	}
-	.wrap{
-		    background: #F5F6F9;
-		    margin: 5px 10px;
-		    border-radius: 20px;
-		    width: 92%;
-		    display: inline-block;
-		    padding: 10px;
-	}
-	.searchwrap{
-		border-top:1px solid #eee;padding:10px 20px;
-	}
-	.searchwrap:last-child{
-		border-bottom:1px solid #eee;
-	}
-	.qualityNo{
-		font-size:16px;
-	}
-	.type{
-		font-size:12px;
-		color:#fff;
-		padding:3px 5px;
-		border-radius:50%;
-		line-height:16px;
-	}
-	.type-zhi{
-		background:#22C572;
-	}
-	.type-mao{
-		background:#3296FA;
-	}
-	.type-pi{
-		background:#FD714F;
-	}
-	.time{
-		font-size:12px;
-		color:#878C9C;
-	}
-	.qualityInspector{
-		font-size:14px;
-	}
-	.customerinformation{
-		background:#F9F9FA;
-		padding:7px;
-		margin:20px 0;
-		border-radius:10px;
-		color:#9698A2;
-	}
-	.buttons{
-		flex-direction:row-reverse;
-	}
-	.button{
-		padding:13rpx 30rpx;
-		border:1px solid #CDCDCD;
-		border-radius:15px;
-		margin:0 10px;
-	}
-	.changewarehouse{
-		padding:10px 20px;
-	}
-	.header{
-		background:#fff;
-		border-radius:0px 0px 16px 16px;
-	}
-	.content{
-		background:#fff;
-		height:85.5vh;
-	}
-	.footer{
-		background:#fff;
-		position:fixed;
-		bottom:0;
-		width:100%;
-		padding:20px 10px;
-		z-index:10;
-		.button{
-			background:#22C572;
-			width:90%;
-			margin:0 auto;
-			padding:10px;
-			color:#fff;
-			text-align:center;
+
+	.wrap {
+		background: #F5F6F9;
+		margin: 5px 10px;
+		border-radius: 20px;
+		width: 92%;
+		display: inline-block;
+		padding: 10px;
+	}
+
+	.searchwrap {
+		border-top: 1px solid #eee;
+		padding: 10px 20px;
+	}
+
+	.searchwrap:last-child {
+		border-bottom: 1px solid #eee;
+	}
+
+	.qualityNo {
+		font-size: 16px;
+	}
+
+	.type {
+		font-size: 12px;
+		color: #fff;
+		padding: 3px 5px;
+		border-radius: 50%;
+		line-height: 16px;
+	}
+
+	.type-zhi {
+		background: #22C572;
+	}
+
+	.type-mao {
+		background: #3296FA;
+	}
+
+	.type-pi {
+		background: #FD714F;
+	}
+
+	.time {
+		font-size: 12px;
+		color: #878C9C;
+	}
+
+	.qualityInspector {
+		font-size: 14px;
+	}
+
+	.customerinformation {
+		background: #F9F9FA;
+		padding: 7px;
+		margin: 20px 0;
+		border-radius: 10px;
+		color: #9698A2;
+	}
+
+	.buttons {
+		flex-direction: row-reverse;
+	}
+
+	.button {
+		padding: 13rpx 30rpx;
+		border: 1px solid #CDCDCD;
+		border-radius: 15px;
+		margin: 0 10px;
+	}
+
+	.changewarehouse {
+		padding: 10px 20px;
+	}
+
+	.header {
+		background: #fff;
+		border-radius: 0px 0px 16px 16px;
+	}
+
+	.content {
+		background: #fff;
+		/* height: 85.5vh; */
+	}
+
+	.footer {
+		background: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 20px 10px;
+		z-index: 10;
+
+		.button {
+			background: #22C572;
+			width: 90%;
+			margin: 0 auto;
+			padding: 10px;
+			color: #fff;
+			text-align: center;
 			border-radius: 30px;
 		}
 	}
+	.content1{
+		margin-top: 20rpx;
+		padding: 20rpx 0;
+		.row{
+			display: flex;
+			padding:20rpx 30rpx;
+			.row-item{
+				margin-right: 20rpx;
+			}
+		}
+	}
 </style>
-

pages/erpbusiness/index.vue

@@ -11,6 +11,10 @@
 					<text>{{item.name}}</text>
 				</view>
 			</view>
+			<view class="content2">
+				<view>收购信息</view>
+				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}></view>
+			</view>
 		</view>
 		<!-- <view class="wrap">
 			<view class='title'>出库管理</view>
@@ -47,6 +51,7 @@
 		},
 		data() {
 			return {
+				status:'',
 				isShowAlert1: false,
 				content1: '当前登入信息验证失败，是否重新登录？',
 				isShowAlert: false,
@@ -140,7 +145,8 @@
 				],
 				showTran: true,
 				companyId: 1,
-				current: 4
+				current: 4,
+				sgId:''
 			}
 		},
 
@@ -182,6 +188,7 @@
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
+			this.getStatus()
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
@@ -249,6 +256,17 @@
 			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
+			getStatus(){
+				let _obj = {
+					commonId:uni.getStorageSync("userInfo").id,
+				}
+				this.$api.doRequest('get', '/acquisitionInfo/getInfo',_obj ).then(res => {
+					if (res.data.code == 200) {
+						this.status = res.data.data.status
+						this.sgId = res.data.data.commonId
+					}
+				})
+			},
 			alertBtn1() {
 				uni.navigateTo({
 					url: '/pages/public/login'
@@ -959,4 +977,8 @@
 			font-size: 16px;
 		}
 	}
+	.content2{
+		display: flex;
+		justify-content: space-between;
+	}
 </style>

pages/task/audit/acquisition_information_approval.vue

@@ -0,0 +1,168 @@
+<template>
+	<view class="wrap">
+		<view class='content1'>
+			<view class='row content-item'>
+				<view class="left" style="color: #878C9C ;">仓库</view>
+				<view class="right">鲅鱼圈库</view>
+			</view>
+			<view class='row content-item'>
+				<textarea placeholder="请输入仓库信息" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<view class="textarea-bottom">{{textareaValue?textareaValue.length:'0'}}/2000字</view>
+			</view>
+			<view class='row content-item'>
+				<u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<!-- getRoles("acquisitionQuality.initial") -->
+			<u-button v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
+		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				isSHowBtn: true,
+				isShowAlert: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				textareaValue: '',
+				value: ''
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+					// uni.showModal({
+					// 	title: '登录提示',
+					// 	content: '当前登入信息验证失败，是否重新登录？',
+					// 	showCancel: true,
+					// 	confirmText: '登录',
+					// 	success: (e) => {
+					// 		if (e.confirm) {
+					// 			uni.navigateTo({
+					// 				url: '/pages/public/login'
+					// 			})
+					// 		}
+					// 	},
+					// 	fail: () => {},
+					// 	complete: () => {}
+					// })
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			checkBoxChange(e) {
+				console.log(e)
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		/* border-bottom: 1px solid #EEEEEE; */
+
+		.right,
+		input {
+			font-size: 28rpx;
+			// color: #333333;
+		}
+	}
+
+	.textarea {
+		background: #F9F9FA;
+		font-size: 12px;
+		text-align: left;
+		width: 100%;
+		height: 60px;
+		padding: 10px;
+		border-radius: 5px;
+		margin-top: 10px;
+		height: 50vh;
+		padding-bottom: 20rpx;
+	}
+
+	.textarea-bottom {
+		position: absolute;
+		bottom: 20rpx;
+		right: 20rpx;
+		color: #606266;
+	}
+</style>

pages/task/audit/acquisition_information_details.vue

@@ -0,0 +1,162 @@
+<template>
+	<view class="wrap">
+		<view class='content1'>
+			<view class='row content-item'>
+				<view class="left" style="color: #878C9C ;">仓库</view>
+				<view class="right">鲅鱼圈库</view>
+			</view>
+			<view class='row content-item'>
+				<textarea disabled placeholder="请输入仓库信息" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<view class="textarea-bottom">{{textareaValue?textareaValue.length:'0'}}/2000字</view>
+			</view>
+			<view class='row content-item'>
+				<u-checkbox disabled activeColor="#19be6b" v-model="value">显示在易粮易运收购信息中</u-checkbox>
+			</view>
+		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				isSHowBtn: true,
+				isShowAlert: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				textareaValue: '',
+				value: ''
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+					// uni.showModal({
+					// 	title: '登录提示',
+					// 	content: '当前登入信息验证失败，是否重新登录？',
+					// 	showCancel: true,
+					// 	confirmText: '登录',
+					// 	success: (e) => {
+					// 		if (e.confirm) {
+					// 			uni.navigateTo({
+					// 				url: '/pages/public/login'
+					// 			})
+					// 		}
+					// 	},
+					// 	fail: () => {},
+					// 	complete: () => {}
+					// })
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			checkBoxChange(e) {
+				console.log(e)
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		/* border-bottom: 1px solid #EEEEEE; */
+
+		.right,
+		input {
+			font-size: 28rpx;
+			// color: #333333;
+		}
+	}
+
+	.textarea {
+		background: #F9F9FA;
+		font-size: 12px;
+		text-align: left;
+		width: 100%;
+		height: 60px;
+		padding: 10px;
+		border-radius: 5px;
+		margin-top: 10px;
+		height: 50vh;
+		padding-bottom: 20rpx;
+	}
+
+	.textarea-bottom {
+		position: absolute;
+		bottom: 20rpx;
+		right: 20rpx;
+		color: #606266;
+	}
+</style>

pages/user/depotAcquisition/depotAcquisition.vue

@@ -0,0 +1,214 @@
+<template>
+	<view class="wrap">
+		<view class="header">
+			<view class='locationwrap' @click='naviageToPage("/pages/grain_pulse/position/position")'>
+				<image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image>
+				{{position.name}}
+			</view>
+			<view
+				@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")'
+				class='Regular flex align-item-center distribution justify-center'>
+				<image class='cangku' src="../../../static/img/liangmai/cangku.png" mode=""></image>
+			</view>
+		</view>
+		<u-search class="search" placeholder="日照香炉生紫烟" v-model="keyword" :show-action="false" @change="searchChange"></u-search>
+		<view class="content1">
+			<view class="row row1">
+				<view>鲅鱼圈1号库</view>
+				<view class='follow'>已关注</view>
+			</view>
+			<view class="row2">
+				<view class='locationwrap' @click='naviageToPage("/pages/grain_pulse/position/position")'>
+					<image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image>
+					{{position.name}}
+				</view>
+			</view>
+			<view class="row3">
+				<view class="row3-item" v-for="(item,index) in listData" :key='index'>
+					<u-read-more color='#22C572' show-height="140" :index="index" :shadow-style="shadowStyle" :toggle="true" close-text="展开阅读更多内容" @open='open' @close='close'>
+						<rich-text :nodes="item.content" class="rich-item"></rich-text>
+						<!-- @load="parseLoaded" -->
+						<!-- <u-parse :html="item.content" ></u-parse> -->
+					</u-read-more>
+				</view>
+			</view>
+			<view class="row4">
+				<u-button @click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration")'>我要送粮</u-button>
+				<view>2021-11-23</view>
+			</view>
+		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				isShowAlert: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				position: {
+					name: '全国'
+				},
+					keyword: '遥看瀑布挂前川',
+					shadowStyle: {
+						backgroundImage: "none",
+						paddingTop: "0",
+						marginTop: "20rpx",
+					},
+					listData:[
+						{
+							content:'1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111我按水分地方地方萨芬撒初学者从行政村自行车在X初学者从行政村'
+						},{
+							content:'222222'
+						},
+						{
+							content:'33333'
+						}
+					]
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+					// uni.showModal({
+					// 	title: '登录提示',
+					// 	content: '当前登入信息验证失败，是否重新登录？',
+					// 	showCancel: true,
+					// 	confirmText: '登录',
+					// 	success: (e) => {
+					// 		if (e.confirm) {
+					// 			uni.navigateTo({
+					// 				url: '/pages/public/login'
+					// 			})
+					// 		}
+					// 	},
+					// 	fail: () => {},
+					// 	complete: () => {}
+					// })
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			open(e){
+				console.log(e)
+			},
+			close(e){
+				console.log(e)
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			naviageToPage(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			searchChange(e){
+				console.log(e)
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+	}
+
+	.header {
+		padding: 0 25rpx;
+		background: #fff;
+		border-radius: 0 0 10px 10px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.location {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx;
+	}
+
+	.locationwrap {
+		font-size: 16px;
+		display: flex;
+		align-items: center;
+	}
+
+	.cangku {
+		width: 16.5px;
+		height: 16.5px;
+		margin-right: 5px;
+	}
+	.search{
+		margin-top: 20rpx!important;
+	}
+	.rich-item{
+		line-height: 44rpx;
+	}
+	.row1{
+		display: flex;
+		justify-content: space-between;
+	}
+	.row4{
+		display: flex;
+	}
+</style>

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -0,0 +1,161 @@
+<template>
+	<view class="wrap">
+	
+		<view class="content content1" v-for="(item,index) in dataList" :key="index">
+			<view class="top">
+				<view>{{item.warehouseName}}</view>
+				<view>25日0时前有效</view>
+			</view>
+			<view>{{item.name}}</view>
+			<view class="car-list">
+				<view v-for="(item1,index) in item.carList">
+					{{item1.carNumber}}
+				</view>
+			</view>
+			<u-button @click='del(item)'>删除</u-button>
+		</view>
+		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				id:'',
+				warehouseName:'',
+				isShowAlert: false,
+				isShowAlert1:false,
+				content: '当前登入信息验证失败，是否重新登录？',
+					content1: '确定删除送粮记录？',
+				dataList:[
+					{
+						warehouseName:"鲅鱼圈1号库",
+						id:1,
+						name:'张三',
+						carList:[{carNumber:'123123'},{carNumber:'123123'},{carNumber:'123123'}
+						]
+					},
+					{
+						warehouseName:"鲅鱼圈2号库",
+						id:2,
+						name:'张三1',
+						carList:[{carNumber:'123123'},{carNumber:'123123'},{carNumber:'123123'}
+						]
+					}
+				]
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+				}
+				let _obj = {
+					commonId:uni.getStorageSync("userInfo").id,
+					pageSize:1,
+					currentPage:10
+					
+				}
+			this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration',_obj ).then(res => {
+				if (res.data.code == 200) {
+			
+				}
+			})
+				
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			del(row){
+				this.isShowAlert1=true
+				this.id = row.id
+				// 删除成功后删除页面当前行
+				
+				
+				
+				},
+				
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {debugger
+				this.$api.doRequest('post', '//grainDeliveryRegistration/api/deleteInfo',{
+					id:this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+				for(let i=0;i<this.dataList.length;i++){
+					if(this.id==this.dataList[i].id){
+						this.dataList.splice(i,1)
+					}
+				}
+					}
+				})
+			
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+	}
+	.top{
+		display: flex;
+		justify-content: space-between;
+	}
+</style>

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="wrap">
+		<view class="content1">
+			<view>{{dataList.warehouseName}}</view>
+			<view class="row2">
+				<view class='locationwrap'>
+					<image class='location' src="../../../static/img/liangmai/icon_ditu@2x.png" mode=""></image>
+					{{warehouseNameAddress}}
+				</view>
+			</view>
+			<view class="row3">
+				<view>{{startDate}}创建（有效期{{dataList.validityDate}}）</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">送货信息</view>
+			<view class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
+				<view class="row1">
+					<view class="left">
+						<view>货主{{index+1}}-{{item.shipperName}}</view>
+						<view @click="reduceBtn(index)">--</view>
+					</view>
+					<view class="right" @click='show=true'>
+						<view>{{shipperName}}</view>
+						<u-icon name="arrow-right" color=""></u-icon>
+						<u-picker @confirm="nameConfirm" range-key='name' mode="selector" v-model="show"
+							:range="nameList"></u-picker>
+					</view>
+				</view>
+				<view class="row2">
+					<view class="left">
+						供应商（送粮人）
+					</view>
+					<view class="right">{{item.supplier}}</view>
+				</view>
+				<view class="row2" v-for="(item1,index1) in item.carNumberList" :key='index1'>
+					<view class="left">
+						车牌号-{{index1+1}}
+					</view>
+					<u-input v-model="item1.carNo" placeholder="输入7为车牌号" />
+					<view>
+						<view @click="addCarNumber(item.carNumberList)">+</view>
+						<view @click="delCarNumber(item.carNumberList,index1)">-</view>
+					</view>
+				</view>
+
+
+			</view>
+			<u-button @click='addGoodPeople'>增加货主</u-button>
+		</view>
+		<u-button @click='submit'>提交</u-button>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				isShowAlert: false,
+				isShowAlert1: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				content1: '确定提交送粮信息？',
+				show: false,
+				show1: false,
+				cargoOwner: [{
+					name: '123'
+				}],
+				shipperName: "王五",
+				nameList: [{
+						name: '1'
+					},
+					{
+						name: '2'
+					}
+				],
+				warehouseNameAddress: '辽宁省营口市龙港花园',
+				startDate: "2021-11-20",
+				dataList: {
+					warehouseName: "鲅鱼圈1号库",
+					validityDate: '2021-11-23',
+					shippingInformationList: [{
+						shipperName: '张三',
+						supplier: '供应商姓名',
+						carNo: '123456,123456,1234456',
+						carNumberList: [{
+							carNo: '123'
+						}]
+					}]
+
+				}
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			reduceBtn(index) {
+				debugger
+				if (this.dataList.shippingInformationList.length > 1) {
+					this.dataList.shippingInformationList.splice(index, 1)
+					this.$forceUpdate()
+				}
+			},
+			submit() {
+				this.isShowAlert1 = true
+			},
+			nameConfirm() {},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				this.$api.doRequest('post', '/grainDeliveryRegistration/api/insertInfo', this.submitData).then(res => {
+					if (res.data.code == 200) {
+
+					}
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+				this.isShowAlert1 = false
+			},
+			addGoodPeople() {
+				this.dataList.shippingInformationList.push({
+					shipperName: '张三1',
+					supplier: '供应商姓名1',
+					carNo: '123456,123456,1234456',
+					carNumberList: [{
+						carNo: '222'
+					}]
+				})
+			},
+			addCarNumber(val) {
+				val.push({
+					carNo: '456'
+				})
+			},
+			delCarNumber(val, index) {
+				debugger
+				if (val.length > 1) {
+					val.splice(index, 1)
+					this.$forceUpdate()
+				}
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+	}
+
+	.location {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx;
+	}
+
+	.locationwrap {
+		font-size: 16px;
+		display: flex;
+		align-items: center;
+	}
+</style>

pages/user/report.vue

@@ -80,7 +80,7 @@
 				title: "加载中",
 				mask: true
 			})
-			this.url = "http://192.168.1.116:8011?id="+uni.getStorageSync('pcUserInfo').compId
+			this.url = "https://liangxin.zthymaoyi.com/map.html?id="+uni.getStorageSync('pcUserInfo').compId
 			this.init()
 		},
 		methods: {

pages/user/user.vue

@@ -39,7 +39,7 @@
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
 					<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index"
-						@click="gridClick(item, index)" v-if="index<gridCol*2" v-show="item.show">
+						@click="gridClick(item, index)" v-show="item.show">
 						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 							<text v-if='item.num==4&&taskTip' class='badge_user'>{{taskTip}}</text>
 							<image :src="item.src" class="sign1"></image>
@@ -236,6 +236,15 @@
 						tips: 0,
 						url: `/pages/user/depotMonitoring`,
 						show: false
+					},
+					{
+						num: 8,
+						name: '库点收购',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/kudianjiankong@2x.png',
+						tips: 0,
+						url: `/pages/user/depotAcquisition/depotAcquisition`,
+						show: true
 					}
 				],
 				showTran: true,