更新

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.103:8090/',
+	baseUrlNew: 'http://192.168.1.122:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
-	baseUrlNew: 'https://apitest.eliangeyun.com/',
+	// baseUrlNew: 'https://apitest.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/bill/index.vue

@@ -109,7 +109,7 @@
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
 				this.currentPage += 1
-				this.loadData()
+				this.loadData("add")
 			}
 		},
 		methods: {
@@ -200,7 +200,7 @@
 				this.loadData()
 			},
 			//加载商品 ，带下拉刷新和上滑加载
-			async loadData(type = 'add', loading) {
+			async loadData(type, loading) {
 				if(!this.hasLogin){
 					ni.showModal({
 						title: '登录提示',
@@ -235,7 +235,12 @@
 					}).then(res => {
 						uni.hideLoading()
 						var data= res.data.data.records
-						this.dataInfo = this.dataInfo.concat(data)
+						if(type == "add"){
+							this.dataInfo = this.dataInfo.concat(data)
+						}
+						else{
+							this.dataInfo = data
+						}
 						if(data.length==0){
 							this.isContent=true
 						}

pages/erpbusiness/add_quality_testing.vue

@@ -1,20 +1,20 @@
 <template>
 	<view>
 		<view class='wrap'>
-			<view class='title'>基本信息</view>
-			<view class="c-row b-b">
+			<view class='title_b'>基本信息</view>
+			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
 					<view @click='gocustomer' v-if='gridList.customerName'>
@@ -25,28 +25,28 @@
 					</view>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
@@ -54,14 +54,14 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					<view @click='show2=true'>{{gridList.goodsName}}</view>
@@ -69,7 +69,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">类型</view>
 				<view class="con-list">
 					<view @click='show3=true'>{{gridList.type}}</view>
@@ -85,9 +85,9 @@
 			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title'>化验信息</view>
+			<view class='title_b'>化验信息</view>
 
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
 					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
@@ -95,35 +95,35 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.waterContent' placeholder="请输入水分占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
 					<input v-model='gridList.bulkDensity' placeholder="请输入容重"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
@@ -274,15 +274,20 @@
 					warehouseId:this.cangid
 				}).then(res => {
 					if(res.data.data){
-						this.goodsList=res.data.data
-						// for (let i = 0; i < this.goodsList.length; i++) {
-							if(this.goodsList.some(item=>{return item.goodsName=='玉米'})){
-								this.gridList.goodsName='玉米'
-								uni.setStorageSync('goodsName',this.gridList.goodsName)
-							}else{
-								this.gridList.goodsName=this.goodsList[0].goodsName
-								uni.setStorageSync('goodsName',this.gridList.goodsName)
-							}
+						this.goodsList = res.data.data
+						if(this.goodsList.length > 0){
+							this.gridList.goodsName=this.goodsList[0].goodsName
+						}
+						// for (let i = 0; i < res.data.data.length; i++) {
+						// 	this.goodsList.push(res.data.data[i].goodsName)
+						// }
+							// if(this.goodsList.some(item=>{return item.goodsName=='玉米'})){
+							// 	this.gridList.goodsName='玉米'
+							// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
+							// }else{
+							// 	this.gridList.goodsName=this.goodsList[0].goodsName
+							// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
+							// }
 					}
 				})
 		},
@@ -534,6 +539,12 @@
 	page{
 		background:#F5F6FA;
 	}
+	.title_b {
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding: 20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+	}
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -541,16 +552,8 @@
 		-webkit-box-align: center;
 		-webkit-align-items: center;
 		align-items: center;
-		padding: 10rpx 30rpx;
+		padding: 20rpx 30rpx;
 		position: relative;
-	
-		.title {
-			/* color: #9698A2; */
-		}
-	
-		.title-black {
-			color: #333;
-		}
 	}
 	
 	.con-list {
@@ -579,9 +582,7 @@
 		>.title{
 			padding:10px 16px;
 		}
-		.b-b:after{
-			border-bottom:1px solid #eee;
-		}
+		
 	}
 	.footer{
 		background:#fff;

pages/erpbusiness/customer.vue

@@ -166,9 +166,10 @@
 						goodsName: uni.getStorageSync('goodsName'),
 					}).then(res => {
 						for (let i = 0; i < this.purchasePriceList.length; i++) {
+							var data = res.data.data/1000
 							if(this.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
-								if(this.purchasePriceList[i].saleLimit - res.data.data < 50 || count > 0){
-									this.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${res.data.data}吨，最高可售${this.purchasePriceList[i].saleLimit}吨。`)
+								if(this.purchasePriceList[i].saleLimit - data < 50 || count > 0){
+									this.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data}吨，最高可售${this.purchasePriceList[i].saleLimit}吨。`)
 								}else{
 										that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
 										commonId:that.userInfo.id,
@@ -215,8 +216,9 @@
 							}).then(res => {
 								for (let i = 0; i < this.purchasePriceList.length; i++) {
 									if(this.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
-										if(this.purchasePriceList[i].saleLimit - res.data.data < 50 || count > 0){
-											this.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${res.data.data}吨，最高可售${this.purchasePriceList[i].saleLimit}吨。`)
+										var data = res.data.data/1000
+										if(this.purchasePriceList[i].saleLimit -  data < 50 || count > 0){
+											this.$api.msg(`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data}吨，最高可售${this.purchasePriceList[i].saleLimit}吨。`)
 										}else{
 												that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
 												commonId:that.userInfo.id,

pages/erpbusiness/edit_quality_testing.vue

@@ -1,47 +1,47 @@
 <template>
 	<view>
 		<view class='wrap'>
-			<view class='title'>基本信息</view>
-			<view class="c-row b-b">
+			<view class='title_b'>基本信息</view>
+			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
 					{{gridList.customerName}}({{gridList.customerPhone}})
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber}}</view>
@@ -49,20 +49,20 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">类型</view>
 				<view class="con-list">
 					{{gridList.type}}
@@ -76,9 +76,9 @@
 			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title'>化验信息</view>
+			<view class='title_b'>化验信息</view>
 
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
 					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
@@ -86,42 +86,42 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.waterContent' placeholder="请输入水分占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
 					<input v-model='gridList.bulkDensity' placeholder="请输入容重"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">热损伤（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
@@ -457,44 +457,15 @@
 	}
 </script>
 <style lang='scss' scoped>
+	.title_b {
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding: 20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+	}
 	page{
 		background:#F5F6FA;
 	}
-	.c-row {
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-box-align: center;
-		-webkit-align-items: center;
-		align-items: center;
-		padding: 10rpx 30rpx;
-		position: relative;
-	
-		.title {
-			/* color: #9698A2; */
-		}
-	
-		.title-black {
-			color: #333;
-		}
-	}
-	
-	.con-list {
-		-webkit-box-flex: 1;
-		-webkit-flex: 1;
-		flex: 1;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		-webkit-box-orient: vertical;
-		-webkit-box-direction: normal;
-		-webkit-flex-direction: column;
-		flex-direction: column;
-		color: #303133;
-		line-height: 40rpx;
-		text-align: right;
-		padding-right: 20rpx;
-	}
 	.wrap{
 		padding-bottom:10px;
 		font-size:14px;
@@ -526,6 +497,33 @@
 			border-radius: 30px;
 		}
 	}
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+	}
 </style>
 
 

pages/erpbusiness/examine_quality_testing.vue

@@ -1,74 +1,74 @@
 <template>
 	<view>
 		<view class='wrap'>
-			<view class='title'>基本信息</view>
-			<view class="c-row b-b">
+			<view class='title_b'>基本信息</view>
+			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view>
-			<view v-if='managementType==3' class="c-row b-b">
+			<view v-if='managementType==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
 					{{gridList.customerName}}({{gridList.customerPhone}})
 				</view>
 			</view>
-			<view v-if='managementType==3' class="c-row b-b">
+			<view v-if='managementType==3' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					{{gridList.carNumber}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					{{gridList.buckleWeightRatio}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					{{gridList.natureOfGrainPurchase}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					{{gridList.binNumber}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					{{gridList.storageTagNo}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row b-b">
+			<view v-if='managementType==1' class="c-row ">
 				<view class="title">类型</view>
 				<view class="con-list">
 					{{gridList.type}}
@@ -82,51 +82,51 @@
 			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title'>化验信息</view>
+			<view class='title_b'>化验信息</view>
 
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
 					{{gridList.grade}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
 					{{gridList.waterContent}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
 					{{gridList.bulkDensity}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
 					{{gridList.imperfectGrain}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
 					{{gridList.impurity}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
 					{{gridList.impurity}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">热损伤（%）</view>
 				<view class="con-list">
 					{{gridList.jiaorenli}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">不完善粒(%)<=</view>
 				<view class="con-list">
 					{{gridList.imperfectGrain}}
@@ -382,6 +382,12 @@
 	page{
 		background:#F5F6FA;
 	}
+	.title_b {
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding: 20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+	}
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -389,16 +395,8 @@
 		-webkit-box-align: center;
 		-webkit-align-items: center;
 		align-items: center;
-		padding: 10rpx 30rpx;
+		padding: 20rpx 30rpx;
 		position: relative;
-	
-		.title {
-			/* color: #9698A2; */
-		}
-	
-		.title-black {
-			color: #333;
-		}
 	}
 	
 	.con-list {

pages/erpbusiness/index.vue

@@ -169,6 +169,26 @@
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession",res)
+				if (res.data.data == "INVALID") {
+					uni.showModal({
+						title: '登录提示',
+						content: 'Session过期需要重新登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+			})
 			console.log("hasLogin",this.hasLogin )
 			if(this.userInfo){
 				if(!this.userInfo.avatarUrl){

pages/erpbusiness/out_quality_testing.vue

@@ -1,33 +1,33 @@
 <template>
 	<view>
 		<view class='wrap'>
-			<view class='title'>基本信息</view>
-			<view class="c-row b-b">
+			<view class='title_b'>基本信息</view>
+			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber}}</view>
@@ -35,7 +35,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
@@ -44,9 +44,9 @@
 			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title'>化验信息</view>
+			<view class='title_b'>化验信息</view>
 
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
 					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
@@ -54,42 +54,42 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.waterContent' placeholder="请输入水分占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
 					<input v-model='gridList.bulkDensity' placeholder="请输入容重"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
 					 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view class="c-row ">
 				<view class="title">热损伤（%）</view>
 				<view class="con-list">
 					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
@@ -419,6 +419,12 @@
 	page{
 		background:#F5F6FA;
 	}
+	.title_b {
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding: 20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+	}
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -426,16 +432,8 @@
 		-webkit-box-align: center;
 		-webkit-align-items: center;
 		align-items: center;
-		padding: 10rpx 30rpx;
+		padding: 20rpx 30rpx;
 		position: relative;
-	
-		.title {
-			/* color: #9698A2; */
-		}
-	
-		.title-black {
-			color: #333;
-		}
 	}
 	
 	.con-list {
@@ -464,9 +462,6 @@
 		>.title{
 			padding:10px 16px;
 		}
-		.b-b:after{
-			border-bottom:1px solid #eee;
-		}
 	}
 	.footer{
 		background:#fff;

pages/erpbusiness/quality_testing.vue

@@ -26,10 +26,39 @@
 			</view>
 		</view>
 		<view class="content">
-			<view class='wrap' v-for='item in gridList' @click='examine(item)'>
+			<view class="item-style" v-for='item in gridList' @click='examine(item)'>
+				<view class="row1">
+					<view class="row1-left">
+						<view class="left status1" v-if="item.status=='已质检'">检</view>
+						<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
+						<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
+						<view>
+							<view class="top-title">
+								<view  v-if='managementType==1' >{{item.qualityNo}}</view>
+								<view  v-if='managementType==3' >{{item.contractNo}}</view>
+							</view>
+							<view class="bottom">{{item.updateDate}}</view>
+						</view>
+					</view>
+					<view class="right">{{item.customer}}</view>
+					<view v-if='item.status=="已质检"' class='right'>{{item.qualityInspector}}</view>
+					<view v-else></view>
+				</view>
+				<view class="row2" >
+					<view v-if='managementType==1'>{{item.customerName}}</view>
+					<view>{{item.carNumber}}</view>
+					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
+				</view>
+				<view class="row3">
+					<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
+						<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
+						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+				</view>
+			</view>
+			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
 			<view class='flex justify-between'>
 				<view v-if='item.status=="已质检"'>
-					<view class='type type-zhi'>质</view>
+					<view class='type type-zhi'>检</view>
 				</view>
 				<view v-if='item.status=="已称毛重"'>
 					<view class='type type-mao'>毛</view>
@@ -55,7 +84,7 @@
 				<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
 				<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 			</view>
-		</view>
+		</view> -->
 		</view>
 		
 		<view v-show="isContent">
@@ -107,7 +136,7 @@
 				userphone:"",
 				username:"请更改昵称",
 				gridList: [],
-				managementType:'',
+				managementType:1,
 				warehouseName: '',
 				showTran: true,
 				companyId: 1,
@@ -117,9 +146,6 @@
 				cangid:''
 				
 			}
-		},
-		onLoad() {
-			
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -364,10 +390,11 @@
 		}
 	}
 </script>
-<style lang='scss' scoped>
+<style scoped lang='scss' >
 	page{
 		background:#F5F6FA;
 	}
+	
 	.container {
 		padding-top: 85px;
 		padding-top: 35px;
@@ -380,7 +407,87 @@
 		background-size: 100% 100%;
 		margin: 0 auto;
 	}
-
+	.item-style {
+		background: white;
+		margin: 20rpx;
+		padding: 20rpx;
+	
+		.row1 {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+	
+			.row1-left {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+	
+				.left {
+					margin-right: 20rpx;
+				}
+	
+				.top-title {
+					font-size: 32rpx;
+					font-weight: 600;
+					color: #333333;
+				}
+	
+				.bottom {
+					color: #878C9C;
+				}
+	
+				.right {
+					font-size: 28rpx;
+					font-weight: 600;
+					color: #333333;
+				}
+	
+			}
+		}
+	
+		.row2 {
+			display: flex;
+			background: #F9F9FA;
+			border-radius: 10rpx;
+			padding: 10rpx 0;
+			justify-content: space-evenly;
+			margin: 20rpx;
+			color: #878C9C;
+		}
+	
+		.row3 {
+			display: flex;
+			margin-top: 30rpx;
+			.row3-item {
+				display: flex;
+				margin-right: 40rpx;
+	
+				.left {
+					background: #22C572;
+					border-radius: 10rpx;
+					padding: 2rpx 10rpx;
+					box-sizing: border-box;
+					color: white;
+					font-size: 12px;
+					margin-right: 15rpx;
+				}
+			}
+		}
+	
+		.row4 {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 10px;
+	
+			.right {
+				border: 1px solid #CDCDCD;
+				border-radius: 45rpx;
+				padding: 10rpx 30rpx;
+				margin-left: 20rpx;
+			}
+		}
+	
+	}
 	.cu-tag.badge {
 		right: 26rpx;
 	}
@@ -815,5 +922,19 @@
 			border-radius: 30px;
 		}
 	}
+	.status1,.status2,.status3{
+		padding: 8rpx 12rpx;
+		border-radius: 50%;
+		color: white;
+	}
+	.status1{
+		background: #FD714F;
+	}
+	.status2{
+		background: #22C572;
+	}
+	.status3{
+		background: #3296FA;
+	}
 </style>
 

pages/user/user.vue

@@ -135,6 +135,15 @@
 					},
 					{
 						num: 3,
+						name: '收购业务',
+						// icon: 'cuIcon-copy',
+						src:'../../static/img/myimg/erp.png',
+						tips: 0,
+						url: `/pages/erpbusiness/index`,
+						show: true
+					},
+					{
+						num: 4,
 						name: 'ERP业务',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/myimg/erp.png',
@@ -204,10 +213,6 @@
 				current: 4
 			}
 		},
-		
-		onLoad() {
-			
-		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
 			const index = e.index;