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

pageD/identity/companyIdentity.vue

@@ -8,11 +8,12 @@
 			<!-- 公司营业执照上传 -->
 			<view v-if="license1 != ''">
 				<upload v-if="consentStatus == true" class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl"  @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
-					:custom="uploadCustom" @on-progress="onProgress"></upload>
+					:custom="uploadCustom" ></upload>
 			</view>
 			<view class="c-row b-b">
+				<text class="tit_red">*</text>
 				<text class="tit">公司名称</text>
 				<view class="con-list">
 					<input placeholder="请填写公司名称" name="input" v-model="identityAuthenticationInfo.compName"></input>
@@ -30,16 +31,17 @@
 			<view>
 				<!-- 个人身份证正面 -->
 				<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-					:custom="uploadCustom1" @on-progress="onProgress"></upload>
+					:custom="uploadCustom1" ></upload>
 				<!-- 个人身份证反面 -->
 				<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl2" @on-error="onError" @on-remove="onRemove"
+					:size-type="['compressed']" @on-success="getImgUrl2"  @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
-					:custom="uploadCustom2" @on-progress="onProgress"></upload>
+					:custom="uploadCustom2" ></upload>
 			</view>
 			<view class="c-row b-b">
+				<text class="tit_red">*</text>
 				<text class="tit">姓名</text>
 				<view class="con-list">
 					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
@@ -218,20 +220,20 @@
 						this.$api.msg('公司名称输入错误')
 						return
 					}
-					if (!this.identityAuthenticationInfo.payTaxesCard) {
-						this.$api.msg('纳税人识别号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo
-						.payTaxesCard.length > 20) {
-						this.$api.msg('纳税人识别号输入错误')
-						return
-					}
-					if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
-						.businessLicenseAddressUrl == null) {
-						this.$api.msg('请上传营业执照')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.payTaxesCard) {
+					// 	this.$api.msg('纳税人识别号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo
+					// 	.payTaxesCard.length > 20) {
+					// 	this.$api.msg('纳税人识别号输入错误')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
+					// 	.businessLicenseAddressUrl == null) {
+					// 	this.$api.msg('请上传营业执照')
+					// 	return
+					// }
 					this.identityAuthenticationInfo.customerTypeFlag = "2"
 					this.identityAuthenticationInfo.customerType = "企业"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -240,14 +242,14 @@
 					})
 				} else if (this.consentStatus1) {
 					this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-					if (this.id[0] == '' || this.id[0] == null) {
-						this.$api.msg('请上传身份证正面')
-						return
-					}
-					if (this.id[1] == '' || this.id[1] == null) {
-						this.$api.msg('请上传身份证反面')
-						return
-					}
+					// if (this.id[0] == '' || this.id[0] == null) {
+					// 	this.$api.msg('请上传身份证正面')
+					// 	return
+					// }
+					// if (this.id[1] == '' || this.id[1] == null) {
+					// 	this.$api.msg('请上传身份证反面')
+					// 	return
+					// }
 					if (!this.identityAuthenticationInfo.customerName) {
 						this.$api.msg('姓名不能为空')
 						return
@@ -257,14 +259,14 @@
 						this.$api.msg('姓名输入错误')
 						return
 					}
-					if (!this.identityAuthenticationInfo.customerNumberCard) {
-						this.$api.msg('身份证号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
-						this.$api.msg('身份证号输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.customerNumberCard) {
+					// 	this.$api.msg('身份证号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+					// 	this.$api.msg('身份证号输入错误')
+					// 	return
+					// }
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -393,4 +395,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/companyIdentityThree.vue

@@ -53,6 +53,7 @@
 			</view>
 		</view>
 		<view class="c-row b-b">
+			<text class="tit_red">*</text>
 			<text class="tit">手机号</text>
 			<view class="con-list">
 				<input placeholder="请填写手机号" @input='phoneinput' type="number" maxlength="11"
@@ -246,41 +247,41 @@
 			},
 			commit() {
 				var that = this
-				if (this.bankid[0] == '' || this.bankid[0] == null) {
-					this.$api.msg('请上传银行卡正面')
-					return
-				}
-				if (this.bankid[1] == '' || this.bankid[1] == null) {
-					this.$api.msg('请上传银行卡反面')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankCard) {
-					this.$api.msg('银行卡号不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
-					.length > 19) {
-					this.$api.msg('银行卡号输入错误')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankDeposit) {
-					this.$api.msg('开户行不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
-					.length > 15) {
-					this.$api.msg('开户行输入错误')
-					return
-				}
-				if (!this.identityAuthenticationInfo.bankDepositBranch) {
-					this.$api.msg('开户支行不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
-					.bankDepositBranch.length > 30) {
-					this.$api.msg('开户支行输入错误')
-					return
-				}
+				// if (this.bankid[0] == '' || this.bankid[0] == null) {
+				// 	this.$api.msg('请上传银行卡正面')
+				// 	return
+				// }
+				// if (this.bankid[1] == '' || this.bankid[1] == null) {
+				// 	this.$api.msg('请上传银行卡反面')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankCard) {
+				// 	this.$api.msg('银行卡号不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard
+				// 	.length > 19) {
+				// 	this.$api.msg('银行卡号输入错误')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankDeposit) {
+				// 	this.$api.msg('开户行不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit
+				// 	.length > 15) {
+				// 	this.$api.msg('开户行输入错误')
+				// 	return
+				// }
+				// if (!this.identityAuthenticationInfo.bankDepositBranch) {
+				// 	this.$api.msg('开户支行不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo
+				// 	.bankDepositBranch.length > 30) {
+				// 	this.$api.msg('开户支行输入错误')
+				// 	return
+				// }
 				if (!this.identityAuthenticationInfo.customerPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -294,41 +295,41 @@
 					return
 				}
 				if (this.identityAuthenticationInfo.customerTypeFlag == 1) {
-					if (!this.identityAuthenticationInfo.payeeName) {
-						this.$api.msg('收款人姓名不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
-						this.$api.msg('收款人姓名输入错误')
-						return
-					}
-					if (!this.identityAuthenticationInfo.payeeNumberCard) {
-						this.$api.msg('收款人身份证号不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
-						this.$api.msg('收款人身份证号输入错误')
-						return
-					}
-					if (!this.identityAuthenticationInfo.compAddress) {
-						this.$api.msg('联系地址不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 20) {
-						this.$api.msg('联系地址输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.payeeName) {
+					// 	this.$api.msg('收款人姓名不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10) {
+					// 	this.$api.msg('收款人姓名输入错误')
+					// 	return
+					// }
+					// if (!this.identityAuthenticationInfo.payeeNumberCard) {
+					// 	this.$api.msg('收款人身份证号不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
+					// 	this.$api.msg('收款人身份证号输入错误')
+					// 	return
+					// }
+					// if (!this.identityAuthenticationInfo.compAddress) {
+					// 	this.$api.msg('联系地址不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+					// 	.compAddress.length > 20) {
+					// 	this.$api.msg('联系地址输入错误')
+					// 	return
+					// }
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
-					if (!this.identityAuthenticationInfo.compAddress) {
-						this.$api.msg('公司地址不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 20) {
-						this.$api.msg('公司地址输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.compAddress) {
+					// 	this.$api.msg('公司地址不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+					// 	.compAddress.length > 20) {
+					// 	this.$api.msg('公司地址输入错误')
+					// 	return
+					// }
 				}
 				this.amendprice()
 
@@ -364,7 +365,7 @@
 											that.identityAuthenticationInfo.commonId = res.data.data.id
 										}
 										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
-										that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+										// that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
 										that.$api.doRequest('get',
@@ -593,4 +594,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -13,6 +13,7 @@
 				:custom="uploadCustom1" ></upload>
 		</view>
 		<view class="c-row b-b">
+			<text class="tit_red">*</text>
 			<text class="tit">姓名</text>
 			<view class="con-list">
 				<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
@@ -152,14 +153,14 @@
 			},
 			jumpUrl() {
 				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
-				if (this.id[0] == '' || this.id[0] == null) {
-					this.$api.msg('请上传身份证正面')
-					return
-				}
-				if (this.id[1] == '' || this.id[1] == null) {
-					this.$api.msg('请上传身份证反面')
-					return
-				}
+				// if (this.id[0] == '' || this.id[0] == null) {
+				// 	this.$api.msg('请上传身份证正面')
+				// 	return
+				// }
+				// if (this.id[1] == '' || this.id[1] == null) {
+				// 	this.$api.msg('请上传身份证反面')
+				// 	return
+				// }
 				if (!this.identityAuthenticationInfo.customerName) {
 					this.$api.msg('姓名不能为空')
 					return
@@ -169,14 +170,14 @@
 					this.$api.msg('姓名输入错误')
 					return
 				}
-				if (!this.identityAuthenticationInfo.customerNumberCard) {
-					this.$api.msg('身份证号不能为空')
-					return
-				}
-				if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
-					this.$api.msg('身份证号输入错误')
-					return
-				}
+				// if (!this.identityAuthenticationInfo.customerNumberCard) {
+				// 	this.$api.msg('身份证号不能为空')
+				// 	return
+				// }
+				// if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+				// 	this.$api.msg('身份证号输入错误')
+				// 	return
+				// }
 				var model = JSON.stringify(this.identityAuthenticationInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
@@ -255,4 +256,7 @@
 	.upload {
 		margin: 20rpx 0;
 	}
+	.tit_red{
+		color: #E54D42;
+	}
 </style>

pageD/identity/driverIdentity.vue

@@ -354,7 +354,7 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {}).catch(
 					res => {
 						uni.showToast({

pageD/identity/driverIdentityEdit.vue

@@ -466,7 +466,7 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				console.log(this.DriverViewInfo, "司机对象")
 				this.$api.doRequest('post', '/driverViewInfo/api/editInfo', this.DriverViewInfo).then(res => {}).catch(
 					res => {

pageD/identity/driverIdentityThree.vue

@@ -198,7 +198,7 @@
 				this.DriverViewInfo.addressUrl = this.addressUrl.toString()
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
-				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+				// this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 
 				var that = this
 				that.identityAuthenticationInfo.driverPhone = that.DriverViewInfo.driverPhone

pages.json

@@ -356,6 +356,30 @@
 				"navigationBarTitleText": "编辑质检信息"
 			}
 		},
+		{
+			"path": "pages/erpbusiness/out_quality_testing",
+			"style": {
+				"navigationBarTitleText": "质检信息"
+			}
+		},
+		{
+			"path": "pages/erpbusiness/add_quality_testing",
+			"style": {
+				"navigationBarTitleText": "质检信息"
+			}
+		},
+		{
+			"path": "pages/erpbusiness/examine_quality_testing",
+			"style": {
+				"navigationBarTitleText": "质检详情"
+			}
+		},
+		{
+			"path": "pages/erpbusiness/customer",
+			"style": {
+				"navigationBarTitleText": "选择客户"
+			}
+		},
 		{
 			"path": "pages/attestation/indexTwo",
 			"style": {

pages/erpbusiness/add_quality_testing.vue

@@ -0,0 +1,564 @@
+<template>
+	<view>
+		<view class='wrap'>
+			<view class='title'>基本信息</view>
+			<view class="c-row b-b">
+				<view class="title">仓库</view>
+				<view class="con-list">
+					{{gridList.warehouseName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">编号</view>
+				<view class="con-list">
+					{{gridList.qualityNo}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">客户</view>
+				<view class="con-list">
+					<view @click='gocustomer' v-if='gridList.customerName'>
+						{{gridList.customerName}}({{gridList.customerPhone}})
+					</view>
+					<view @click='gocustomer' v-else>
+						选择客户
+					</view>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="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="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="title">仓位号</view>
+				<view class="con-list">
+					<view @click='show=true'>{{gridList.binNumber}}</view>
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="title">货名</view>
+				<view class="con-list">
+					{{gridList.goodsName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">类型</view>
+				<view class="con-list">
+					{{gridList.type}}
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
+				<view class="con-list">
+					{{gridList.tidalGrainPrice}}
+				</view>
+			</view>
+		</view>
+		<view style='margin-bottom:100px;' class='wrap'>
+			<view class='title'>化验信息</view>
+
+			<view class="c-row b-b">
+				<view class="title">等级</view>
+				<view class="con-list">
+					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="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="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="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="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="title">热损伤（%）</view>
+				<view class="con-list">
+					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+					 name="input"></input>
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<view @click='submit' class="button">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				id:0,
+				show:false,
+				selector:[],
+				show1:false,
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				searchKeyWord:'',
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				pageSize:10,
+				currentPage:1,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: {},
+				managementType:'',
+				warehouseName: '',
+				warehouseList:[],
+				warehouseCount:'',
+				commonWarehouseNo:'',
+				showTran: true,
+				companyId: 1,
+				current: 4,
+				gradeList:[
+					{key:1,value:'一等品'},
+					{key:2,value:'二等品'},
+					{key:3,value:'三等品'},
+					{key:4,value:'等外'},
+				],
+				cangid:''
+			}
+		},
+		// #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']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options){
+			console.log(options)
+			this.commonWarehouseNo=options.commonWarehouseNo
+			this.warehouseCount=options.warehouseCount
+			 let number = '000' + this.warehouseCount
+			 number = number.substring(number.length - 4, number.length)
+			this.gridList.warehouseName=options.warehouseName
+			this.gridList.qualityNo='SGRK' + this.getdate() + this.commonWarehouseNo + number
+			this.purchasePriceList=uni.getStorageSync('purchasePriceList')
+			this.cangid=options.cangid
+			this.managementType=options.managementType
+		},
+		onShow() {
+			var that = this
+				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
+					compId:'',
+					authenticationStatusKey:7
+				}).then(res => {
+					if(res.data.data){
+						// let data = res.data.data
+						// that.gridList =data
+						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
+							id:this.cangid
+						}).then(res => {
+							that.warehouseList=res.data.data.warehousePositionInfoList
+						})
+					}
+				})
+		},
+		methods: {
+			gocustomer(){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/customer'
+				})
+			},
+			getdate() {
+			        var date = new Date()
+			        var year = date.getFullYear() //获取完整的年份(4位)
+			        var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+			        var datetime = date.getDate() //获取当前日(1-31)
+			        if (mouth < 10) {
+			          mouth = '0' + mouth
+			        }
+			        if (datetime < 10) {
+			          datetime = '0' + datetime
+			        }
+			        return year + mouth + datetime
+			      },
+			submit(){
+				var that = this
+				if (!this.gridList.qualityNo) {
+					this.$api.msg('编号不能为空')
+					return
+				}
+				if (!this.gridList.binNumber) {
+					this.$api.msg('仓位不能为空')
+					return
+				}
+				if (!this.gridList.customerName) {
+					this.$api.msg('客户不能为空')
+					return
+				}
+				if (!this.gridList.storageTagNo) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (this.gridList.storageTagNo.length > 10) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (!this.gridList.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.gridList.carNumber.length > 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.gridList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (this.gridList.buckleWeightRatio < 0 ||this.gridList.buckleWeightRatio > 2) {
+					this.$api.msg('扣重比输入错误')
+					return
+				}
+				if (
+					String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					String(this.gridList.buckleWeightRatio).length -
+					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
+					{
+						this.$api.msg('扣重比输入错误')
+						return
+				}
+				if (!this.gridList.type) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.gridList.natureOfGrainPurchase) {
+					this.$api.msg('购粮性质不能为空')
+					return
+				}
+				if (!this.gridList.grade) {
+					this.$api.msg('等级不能为空')
+					return
+				}
+				if (!this.gridList.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.gridList.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.gridList.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.gridList.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.gridList.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.gridList.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				uni.showModal({
+					content: "确定提交质检信息？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
+								if(res.data.code==200){
+									that.$api.msg('编辑质检成功')
+									uni.navigateBack({
+									})
+								}
+							})
+						}
+					}
+				})
+			},
+			gradepicker(e){
+				console.log(e)
+				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
+				this.gridList.grade=this.gradeList[e[0]].value
+				this.gridList.gradeKey=this.gradeList[e[0]].key
+			},
+			binNumberpicker(e){
+				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			},
+			del(item){
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
+					id:item.id
+				}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+					}else{
+						this.$api.msg('系统异常，请联系管理员')
+					}
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	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;
+		background:#fff;margin:10px;border-radius:10px;
+		input{
+			font-size:14px;
+		}
+		>.title{
+			padding:10px 16px;
+		}
+		.b-b:after{
+			border-bottom:1px solid #eee;
+		}
+	}
+	.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;
+		}
+	}
+</style>
+
+

pages/erpbusiness/customer.vue

@@ -0,0 +1,751 @@
+<template>
+	<view>
+		<view class="header">
+			<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 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>
+				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
+			</view>
+		</view>
+		<view class="content">
+			<view v-if='searchKeyWord.length==0'>近期客户</view>
+			<view v-if='searchKeyWord.length>0' class='searchwrap' v-for='item in gridList' @click='checkcustomer(item)'>
+			{{item.customerName}}({{item.customerPhone}})
+			</view>
+			<view class='wrap' v-else>{{item.customerName}}({{item.customerPhone}})</view>
+		</view>
+		
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+	</view>
+</template>
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				params:{},
+				selector:[],
+				isContent:false,
+				loadStatus:'noMore',
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				searchKeyWord:'',
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				show:false,
+				pageSize:10,
+				currentPage:1,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: [],
+				managementType:'',
+				warehouseName: '',
+				showTran: true,
+				companyId: 1,
+				current: 4,
+				warehouseCount:'',
+				commonWarehouseNo:'',
+				cangid:''
+				
+			}
+		},
+		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']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options){
+			this.managementType=options.managementType
+		},
+		onShow() {
+			this.gridList=[]
+			this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo',{
+				compId:'',
+				authenticationStatusKey:7,
+			}).then(res => {
+				if(res.data.data){
+					this.gridList=res.data.data.records
+				}
+			})
+		},
+		methods: {
+			checkcustomer(item){
+				this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
+					commonId:this.userInfo.id,
+					searchContent:item.customerName,
+					functionType:3
+				}).then(res => {
+				})
+			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.gridList=[]
+				this.currentPage=1
+				this.getList()
+			},
+			doSearch(){
+				this.gridList=[]
+				this.currentPage=1
+				this.getList()
+			},
+			warehousechange(e){
+				this.warehouseName=this.selector[e[0]].warehouseName
+				this.cangid=this.selector[e[0]].id
+				this.warehouseCount = this.selector[e[0]].count
+				this.commonWarehouseNo=this.selector[e[0]].commonWarehouseNo
+				uni.setStorageSync('purchasePriceList',this.selector[e[0]].purchasePriceList)
+				this.getList()
+				console.log(e)
+			},
+			getList(){
+				var that = this
+				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
+					compId:'',
+					authenticationStatusKey:7,
+					searchKeyWord:this.searchKeyWord
+				}).then(res => {
+					if(res.data.data){
+						let data = res.data.data
+						//采购信息
+						if (data.length > 0) {
+								that.gridList = that.gridList.concat(data)
+						}else{
+							if(this.currentPage==1){
+								that.gridList=[]
+							}
+							this.isContent=true
+						}
+					}
+					// console.log(that.gridList)
+				})
+			},
+			edit(item){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+				})
+			},
+			add(){
+				uni.navigateTo({
+					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
+				}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+						this.gridList=[]
+						this.getList()
+					}else{
+						this.$api.msg('系统异常，请联系管理员')
+					}
+				})
+			},
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.container {
+		padding-top: 85px;
+		padding-top: 35px;
+		background-color: #F5F6FA;
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: url('~@/static/img/login/bg_slices/bg@3x.png');
+		background-size: 100% 100%;
+		margin: 0 auto;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.path {
+		color: #007aff;
+		display: inline-block;
+		text-align: center;
+	}
+
+	.icon {
+		margin-right: 10rpx;
+	}
+
+	.portrait-box {
+		margin-top: 20rpx;
+	}
+
+	.qr-wrap {
+		margin-top: 20upx;
+		color: #fff;
+		font-size: 32rpx;
+	}
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1)
+		}
+
+		50% {
+			transform: translateX(-25%) translateZ(0) scaleY(0.55)
+		}
+
+		100% {
+			transform: translateX(-50%) translateZ(0) scaleY(1)
+		}
+	}
+
+	.bg {
+		position: relative;
+		height: 300rpx;
+		/* background: linear-gradient(to bottom, #56ccf2, #2f80ed); */
+		/*background: linear-gradient(to bottom, #0be9fe, #4bb0fe); */
+		background: linear-gradient(to bottom, #d5f8ff, #56ccf2);
+
+	}
+
+	.bg_ware {
+		position: absolute;
+		left: 0;
+		bottom: -2rpx;
+		width: 100%;
+		mix-blend-mode: screen;
+		height: 224rpx;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10upx;
+	}
+
+.cuIcon {
+		position: absolute;
+		right: 80px;
+	}
+	.grid-item-box {
+		flex: 1;
+		/* position: relative;
+ */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.image {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.text {
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.user-section {
+		height: 520upx;
+		padding: 100upx 30upx 0;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			filter: blur(1px);
+			box-shadow: 0px 1px 8px #ccc;
+			/* background:linear-gradient(#0eb0c9,#126bae); */
+			/* opacity: .7; */
+		}
+	}
+	.cover-container {
+		padding: 1px 10px ;
+		padding-bottom: 200upx;
+		
+	   /* background-color: #F5F6FA; */
+	/* 	border-radius: 20px; */
+		margin-top: 60upx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34upx;
+			width: 100%;
+			height: 36upx;
+		}
+	}
+
+	.tj-sction {
+		@extend %section;
+
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 140upx;
+			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8upx;
+		}
+	}
+
+	.order-section {
+		@extend %section;
+		padding: 28upx 0;
+		margin-top: 20upx;
+
+		.order-item {
+			@extend %flex-center;
+			width: 120upx;
+			height: 120upx;
+			border-radius: 10upx;
+			font-size: $font-sm;
+			color: $font-color-dark;
+		}
+
+		.yticon {
+			font-size: 48upx;
+			margin-bottom: 18upx;
+			color: #fa436a;
+		}
+
+		.icon-shouhoutuikuan {
+			font-size: 44upx;
+		}
+	}
+
+	.history-section {
+		padding: 30upx 0 0;
+		margin-top: 20upx;
+		background: #fff;
+		border-radius: 10upx;
+
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 40upx;
+			margin-left: 30upx;
+
+			.yticon {
+				font-size: 44upx;
+				color: #5eba8f;
+				margin-right: 16upx;
+				line-height: 40upx;
+			}
+		}
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30upx 30upx 0;
+
+			image {
+				display: inline-block;
+				width: 160upx;
+				height: 160upx;
+				margin-right: 20upx;
+				border-radius: 10upx;
+			}
+		}
+	}
+.search-form {
+		background: #F5F6F9;
+	}
+
+	.search-box {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+		padding: 15upx 2.5%;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.search-box .mSearch-input-box {
+		width: 100%;
+	}
+
+	.search-box .input-box {
+		width: 85%;
+		flex-shrink: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.search-box .search-btn {
+		width: 15%;
+		margin: 0 0 0 2%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		font-size: 28upx;
+		color: #fff;
+		background: linear-gradient(to right, #ff9801, #ff570a);
+		border-radius: 60upx;
+	}
+
+	.search-box .input-box>input {
+		width: 100%;
+		height: 60upx;
+		font-size: 32upx;
+		border: 0;
+		border-radius: 60upx;
+		-webkit-appearance: none;
+		-moz-appearance: none;
+		appearance: none;
+		padding: 0 3%;
+		margin: 0;
+		background-color: #ffffff;
+	}
+
+	.placeholder-class {
+		color: #9e9e9e;
+	}
+
+	.search-keyword {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+	}
+	.grid {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+
+		/* border-top: 2upx solid rgba(172,172,172,.2); */
+		.grid-item-3 {
+			box-sizing: border-box;
+			width: calc(100% / 3);
+			border-bottom: 2upx solid rgba(172, 172, 172, .2);
+			border-right: 2upx solid rgba(172, 172, 172, .2);
+			text-align: center;
+			padding: 40upx 0;
+			position: relative;
+
+			/* view{
+				font-size: $font-sm;
+				margin-top: 16upx;
+				color: $font-color-dark;
+			} */
+			.grid_icon {
+				font-size: 48upx;
+				margin-bottom: 18upx;
+				color: #fa436a;
+			}
+
+			.tip_text {
+				display: block;
+				padding: 4upx 8upx;
+				text-align: center;
+				border-radius: 36upx;
+				font-size: 24upx;
+				background-color: #fa436a;
+				color: rgba(255, 255, 255, 1);
+				position: absolute;
+				right: 6upx;
+				top: 6upx;
+			}
+		}
+
+		.grid-item-3:nth-child(3n + 3),
+		.grid-item-4:nth-child(4n + 4) {
+			border-right: none;
+		}
+	}
+
+	.headPortrait {
+		width: 75px;
+		height: 75px;
+		border-radius: 40px;
+		border: 2px solid #ffffff;
+	}
+	.information {
+		font-size: 15px;
+		font-weight: 600;
+		height: 36px;
+	}
+	.cu-list>.cu-item:after{
+		border:none;
+	}
+	.sign{
+		width: 40px;
+		height: 40px;
+		top: 4px;
+		margin-right: 6px;
+	}
+	.indexUp{
+		padding:0 20px;
+		align-items: center;
+	}
+	.wrap{
+		    background: #F5F6F9;
+		    margin: 5px 10px;
+		    border-radius: 20px;
+		    width: 42%;
+		    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;
+		}
+	}
+</style>
+

pages/erpbusiness/edit_quality_testing.vue

@@ -24,18 +24,114 @@
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
-						placeholder-style="font-size: 12px;" name="input"></input>
+						 name="input"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="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="title">仓位号</view>
+				<view class="con-list">
+					<view @click='show=true'>{{gridList.binNumber}}</view>
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="title">货名</view>
 				<view class="con-list">
-					<input v-model='gridList.goodsName' placeholder="请输入货名，如玉米"
-						placeholder-style="font-size: 12px;" disabled name="input"></input>
+					{{gridList.goodsName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">类型</view>
+				<view class="con-list">
+					{{gridList.type}}
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
+				<view class="con-list">
+					{{gridList.tidalGrainPrice}}
+				</view>
+			</view>
+		</view>
+		<view style='margin-bottom:100px;' class='wrap'>
+			<view class='title'>化验信息</view>
+
+			<view class="c-row b-b">
+				<view class="title">等级</view>
+				<view class="con-list">
+					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="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="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="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="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="title">热损伤（%）</view>
+				<view class="con-list">
+					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+					 name="input"></input>
 				</view>
 			</view>
 		</view>
-		
+		<view class="footer">
+			<view @click='submit' class="button">提交</view>
+		</view>
 	</view>
 </template>
 
@@ -58,6 +154,9 @@
 				mycarStyle: '',
 				feild: undefined,
 				id:0,
+				show:false,
+				selector:[],
+				show1:false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -78,15 +177,19 @@
 				gridList: {},
 				managementType:'',
 				warehouseName: '',
+				warehouseList:[],
 				showTran: true,
 				companyId: 1,
-				current: 4
+				current: 4,
+				gradeList:[
+					{key:1,value:'一等品'},
+					{key:2,value:'二等品'},
+					{key:3,value:'三等品'},
+					{key:4,value:'等外'},
+				],
+				cangid:''
 			}
 		},
-		
-		onLoad() {
-			
-		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
 			const index = e.index;
@@ -118,8 +221,9 @@
 			}
 		},
 		onLoad(options){
-			console.log(options)
 			this.id=options.id
+			this.cangid=options.cangid
+			this.managementType=options.managementType
 		},
 		onShow() {
 			var that = this
@@ -129,10 +233,123 @@
 					if(res.data.data){
 						let data = res.data.data
 						that.gridList =data
+						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
+							id:this.cangid
+						}).then(res => {
+							that.warehouseList=res.data.data.warehousePositionInfoList
+						})
 					}
 				})
 		},
 		methods: {
+			submit(){
+				var that = this
+				if (!this.gridList.qualityNo) {
+					this.$api.msg('编号不能为空')
+					return
+				}
+				if (!this.gridList.binNumber) {
+					this.$api.msg('仓位不能为空')
+					return
+				}
+				if (!this.gridList.customerName) {
+					this.$api.msg('客户不能为空')
+					return
+				}
+				if (!this.gridList.storageTagNo) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (this.gridList.storageTagNo.length > 10) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (!this.gridList.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.gridList.carNumber.length > 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.gridList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (this.gridList.buckleWeightRatio < 0 ||this.gridList.buckleWeightRatio > 2) {
+					this.$api.msg('扣重比输入错误')
+					return
+				}
+				if (
+					String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					String(this.gridList.buckleWeightRatio).length -
+					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
+					{
+						this.$api.msg('扣重比输入错误')
+						return
+				}
+				if (!this.gridList.type) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.gridList.natureOfGrainPurchase) {
+					this.$api.msg('购粮性质不能为空')
+					return
+				}
+				if (!this.gridList.grade) {
+					this.$api.msg('等级不能为空')
+					return
+				}
+				if (!this.gridList.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.gridList.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.gridList.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.gridList.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.gridList.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.gridList.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				uni.showModal({
+					content: "确定提交质检信息？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
+								if(res.data.code==200){
+									that.$api.msg('编辑质检成功')
+									uni.navigateBack({
+									})
+								}
+							})
+						}
+					}
+				})
+			},
+			gradepicker(e){
+				console.log(e)
+				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
+				this.gridList.grade=this.gradeList[e[0]].value
+				this.gridList.gradeKey=this.gradeList[e[0]].key
+			},
+			binNumberpicker(e){
+				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			},
 			del(item){
 				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
 					id:item.id
@@ -144,21 +361,6 @@
 					}
 				})
 			},
-			fankui(){
-				uni.navigateTo({
-					url: `/pages/user/fankui`
-				})
-			},
-			zhibo() {
-				uni.navigateTo({
-					url: `/pageB/video/broadcast`
-				})
-			},
-			look() {
-				uni.navigateTo({
-					url: `/pageB/video/look`
-				})
-			},
 			contactUs() {
 				const that = this
 				uni.makePhoneCall({
@@ -292,10 +494,14 @@
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
-		font-size: 12px;
 	}
 	.wrap{
+		padding-bottom:10px;
+		font-size:14px;
 		background:#fff;margin:10px;border-radius:10px;
+		input{
+			font-size:14px;
+		}
 		>.title{
 			padding:10px 16px;
 		}
@@ -303,6 +509,23 @@
 			border-bottom:1px solid #eee;
 		}
 	}
+	.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;
+		}
+	}
 </style>
 
 

pages/erpbusiness/examine_quality_testing.vue

@@ -0,0 +1,440 @@
+<template>
+	<view>
+		<view class='wrap'>
+			<view class='title'>基本信息</view>
+			<view class="c-row b-b">
+				<view class="title">仓库</view>
+				<view class="con-list">
+					{{gridList.warehouseName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">编号</view>
+				<view class="con-list">
+					{{gridList.qualityNo}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">客户</view>
+				<view class="con-list">
+					{{gridList.customerName}}({{gridList.customerPhone}})
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">车牌号</view>
+				<view class="con-list">
+					{{gridList.carNumber}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">扣重比</view>
+				<view class="con-list">
+					{{gridList.buckleWeightRatio}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">购粮性质</view>
+				<view class="con-list">
+					{{gridList.natureOfGrainPurchase}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">仓位号</view>
+				<view class="con-list">
+					{{gridList.binNumber}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">囤位号</view>
+				<view class="con-list">
+					{{gridList.storageTagNo}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">货名</view>
+				<view class="con-list">
+					{{gridList.goodsName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">类型</view>
+				<view class="con-list">
+					{{gridList.type}}
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
+				<view class="con-list">
+					{{gridList.tidalGrainPrice}}
+				</view>
+			</view>
+		</view>
+		<view style='margin-bottom:100px;' class='wrap'>
+			<view class='title'>化验信息</view>
+
+			<view class="c-row b-b">
+				<view class="title">等级</view>
+				<view class="con-list">
+					{{gridList.grade}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">水分（%）</view>
+				<view class="con-list">
+					{{gridList.waterContent}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">容重（克/升）</view>
+				<view class="con-list">
+					{{gridList.bulkDensity}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">不完善粒（%）</view>
+				<view class="con-list">
+					{{gridList.imperfectGrain}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">杂质（%）</view>
+				<view class="con-list">
+					{{gridList.impurity}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">霉变粒（%）</view>
+				<view class="con-list">
+					{{gridList.impurity}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">热损伤（%）</view>
+				<view class="con-list">
+					{{gridList.jiaorenli}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">不完善粒(%)<=</view>
+				<view class="con-list">
+					{{gridList.imperfectGrain}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				id:0,
+				show:false,
+				selector:[],
+				show1:false,
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				searchKeyWord:'',
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				pageSize:10,
+				currentPage:1,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: {},
+				managementType:'',
+				warehouseName: '',
+				warehouseList:[],
+				showTran: true,
+				companyId: 1,
+				current: 4,
+				gradeList:[
+					{key:1,value:'一等品'},
+					{key:2,value:'二等品'},
+					{key:3,value:'三等品'},
+					{key:4,value:'等外'},
+				],
+				cangid:''
+			}
+		},
+		
+		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']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options){
+			console.log(options)
+			this.id=options.id
+			this.cangid=options.cangid
+		},
+		onShow() {
+			var that = this
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection',{
+					id:this.id
+				}).then(res => {
+					if(res.data.data){
+						let data = res.data.data
+						that.gridList =data
+						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
+							id:this.cangid
+						}).then(res => {
+							that.warehouseList=res.data.data.warehousePositionInfoList
+						})
+					}
+				})
+		},
+		methods: {
+			gradepicker(e){
+				console.log(e)
+				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
+				this.gridList.grade=this.gradeList[e[0]].value
+				this.gridList.gradeKey=this.gradeList[e[0]].key
+			},
+			binNumberpicker(e){
+				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			},
+			del(item){
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
+					id:item.id
+				}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+					}else{
+						this.$api.msg('系统异常，请联系管理员')
+					}
+				})
+			},
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	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;
+		background:#fff;margin:10px;border-radius:10px;
+		input{
+			font-size:14px;
+		}
+		>.title{
+			padding:10px 16px;
+		}
+		.b-b:after{
+			border-bottom:1px solid #eee;
+		}
+	}
+	.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;
+		}
+	}
+</style>
+
+

pages/erpbusiness/out_quality_testing.vue

@@ -0,0 +1,490 @@
+<template>
+	<view>
+		<view class='wrap'>
+			<view class='title'>基本信息</view>
+			<view class="c-row b-b">
+				<view class="title">仓库</view>
+				<view class="con-list">
+					{{gridList.warehouseName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">合同编号</view>
+				<view class="con-list">
+					{{gridList.contractNo}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">货名</view>
+				<view class="con-list">
+					{{gridList.goodsName}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="title">仓位号</view>
+				<view class="con-list">
+					<view @click='show=true'>{{gridList.binNumber}}</view>
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">囤位号</view>
+				<view class="con-list">
+					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
+						 name="input"></input>
+				</view>
+			</view>
+		</view>
+		<view style='margin-bottom:100px;' class='wrap'>
+			<view class='title'>化验信息</view>
+
+			<view class="c-row b-b">
+				<view class="title">等级</view>
+				<view class="con-list">
+					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
+					</u-picker>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<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="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="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="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="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="title">热损伤（%）</view>
+				<view class="con-list">
+					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+					 name="input"></input>
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<view @click='submit' class="button">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				id:0,
+				show:false,
+				selector:[],
+				show1:false,
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				searchKeyWord:'',
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				pageSize:10,
+				currentPage:1,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: {},
+				managementType:'',
+				warehouseName: '',
+				warehouseList:[],
+				showTran: true,
+				companyId: 1,
+				current: 4,
+				gradeList:[
+					{key:1,value:'一等品'},
+					{key:2,value:'二等品'},
+					{key:3,value:'三等品'},
+					{key:4,value:'等外'},
+				],
+				cangid:''
+			}
+		},
+		// #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']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options){
+			this.id=options.id
+			this.cangid=options.cangid
+			this.managementType=options.managementType
+		},
+		onShow() {
+			var that = this
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection',{
+					id:this.id
+				}).then(res => {
+					if(res.data.data){
+						let data = res.data.data
+						that.gridList =data
+						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
+							id:this.cangid
+						}).then(res => {
+							that.warehouseList=res.data.data.warehousePositionInfoList
+						})
+					}
+				})
+		},
+		methods: {
+			submit(){
+				var that = this
+				if (!this.gridList.contractNo) {
+					this.$api.msg('编号不能为空')
+					return
+				}
+				if (!this.gridList.binNumber) {
+					this.$api.msg('仓位不能为空')
+					return
+				}
+				if (!this.gridList.storageTagNo) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (this.gridList.storageTagNo.length > 10) {
+					this.$api.msg('囤位号不超过10个字符！')
+					return
+				}
+				if (!this.gridList.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.gridList.carNumber.length > 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.gridList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (!this.gridList.grade) {
+					this.$api.msg('等级不能为空')
+					return
+				}
+				if (!this.gridList.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.gridList.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.gridList.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.gridList.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.gridList.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.gridList.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				uni.showModal({
+					content: "确定提交质检信息？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/addQualityInspectionOut',that.gridList).then(res => {
+								if(res.data.code==200){
+									that.$api.msg('提交成功')
+									uni.navigateBack({
+									})
+								}
+							})
+						}
+					}
+				})
+			},
+			gradepicker(e){
+				console.log(e)
+				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
+				this.gridList.grade=this.gradeList[e[0]].value
+				this.gridList.gradeKey=this.gradeList[e[0]].key
+			},
+			binNumberpicker(e){
+				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			},
+			del(item){
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
+					id:item.id
+				}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+					}else{
+						this.$api.msg('系统异常，请联系管理员')
+					}
+				})
+			},
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	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;
+		background:#fff;margin:10px;border-radius:10px;
+		input{
+			font-size:14px;
+		}
+		>.title{
+			padding:10px 16px;
+		}
+		.b-b:after{
+			border-bottom:1px solid #eee;
+		}
+	}
+	.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;
+		}
+	}
+</style>
+
+

pages/erpbusiness/quality_testing.vue

@@ -1,16 +1,25 @@
 <template>
 	<view>
-		<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 type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
-					@input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+		<view class="header">
+			<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 v-if='managementType==1' type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
+						 placeholder="输入编号、客户名、车牌号" confirm-type="search"></input>
+					<input v-if='managementType==3' 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>
+				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
+			</view>
+			<view class='changewarehouse'>
+				<view @click='show=true'>{{warehouseName}}<text class='cuIcon-unfold'></text></view>
+				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"  :range="selector"></u-picker>
 			</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>
-			<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 		</view>
-		<view class='wrap' v-for='item in gridList'>
+		<view class="content">
+			<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>
@@ -35,11 +44,19 @@
 				<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 			</view>
 			<view class='flex buttons'>
-				<view v-if='item.status=="已质检"&&managementType==1' @click='del(item)' class='button'>删除</view>
-				<view v-if='item.status!="已称皮重"&&managementType==1' @click='edit(item)' class='button'>编辑</view>
-				<view v-if='item.status=="已称毛重"&&managementType==3' class='button'>质检</view>
+				<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>
+		
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+		<view class="footer">
+			<view @click='add' class="button">新增</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -60,6 +77,10 @@
 				modalName: '',
 				mycarStyle: '',
 				feild: undefined,
+				params:{},
+				selector:[],
+				isContent:false,
+				loadStatus:'noMore',
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -71,26 +92,25 @@
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
+				show:false,
 				pageSize:10,
 				currentPage:1,
 				gridBorder: false,
 				headUrl:"../../static/img/myimg/YongHu@3x.png",
 				userphone:"",
 				username:"请更改昵称",
-				gridList: [
-					
-				],
-				gridList1: [
-					
-				],
+				gridList: [],
 				managementType:'',
 				warehouseName: '',
 				showTran: true,
 				companyId: 1,
-				current: 4
+				current: 4,
+				warehouseCount:'',
+				commonWarehouseNo:'',
+				cangid:''
+				
 			}
 		},
-		
 		onLoad() {
 			
 		},
@@ -125,20 +145,67 @@
 			}
 		},
 		onLoad(options){
-			console.log(options)
 			this.managementType=options.managementType
 		},
 		onShow() {
-			var that = this
+			this.gridList=[]
+			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf',{
+				compId:'',
+				personCharge:this.userInfo.phone
+			}).then(res => {
+				if(res.data.data){
+					this.warehouseName=res.data.data[0].warehouseName
+					this.cangid=res.data.data[0].id
+					this.warehouseCount = res.data.data[0].count
+					this.commonWarehouseNo=res.data.data[0].commonWarehouseNo
+					uni.setStorageSync('purchasePriceList',res.data.data[0].purchasePriceList)
+					this.selector=res.data.data
+					this.getList()
+				}
+			})
+		},
+		methods: {
+			quality_testing(item){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/out_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+				})
+			},
+			examine(item){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/examine_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+				})
+			},
+			emptysearch(){
+				this.searchKeyWord=''
+				this.gridList=[]
+				this.currentPage=1
+				this.getList()
+			},
+			doSearch(){
+				this.gridList=[]
+				this.currentPage=1
+				this.getList()
+			},
+			warehousechange(e){
+				this.warehouseName=this.selector[e[0]].warehouseName
+				this.cangid=this.selector[e[0]].id
+				this.warehouseCount = this.selector[e[0]].count
+				this.commonWarehouseNo=this.selector[e[0]].commonWarehouseNo
+				uni.setStorageSync('purchasePriceList',this.selector[e[0]].purchasePriceList)
+				this.getList()
+				console.log(e)
+			},
+			getList(){
+				var that = this
 				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection',{
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					searchKeyWord: this.searchKeyWord,
 					searchType: this.searchType,
 					managementType:this.managementType,
-					warehouseName: '测试库',
+					warehouseName: this.warehouseName,
 					compId:'2710b21efc1e4393930c5dc800010dc4',
-					pcFlag:1
+					// pcFlag:1
 				}).then(res => {
 					if(res.data.data){
 						let data = res.data.data.records
@@ -146,24 +213,33 @@
 						if (data.length > 0) {
 								that.gridList = that.gridList.concat(data)
 						}else{
-							
+							if(this.currentPage==1){
+								that.gridList=[]
+							}
+							this.isContent=true
 						}
 					}
-					console.log(that.gridList)
+					// console.log(that.gridList)
 				})
-		},
-		methods: {
+			},
 			edit(item){
 				uni.navigateTo({
-					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType
+					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+				})
+			},
+			add(){
+				uni.navigateTo({
+					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('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/deleteQualityInspection',{
 					id:item.id
 				}).then(res => {
 					if(res.data.code==200){
 						this.$api.msg('删除成功')
+						this.gridList=[]
+						this.getList()
 					}else{
 						this.$api.msg('系统异常，请联系管理员')
 					}
@@ -366,6 +442,10 @@
 		border-radius: 10upx;
 	}
 
+.cuIcon {
+		position: absolute;
+		right: 80px;
+	}
 	.grid-item-box {
 		flex: 1;
 		/* position: relative;
@@ -505,31 +585,6 @@
 		background: #F5F6F9;
 	}
 
-	.line {
-		display: inline-block;
-		padding: 5px;
-		position: relative;
-		font-size: 17px;
-	}
-
-	.line.active {
-		font-size: 19px;
-		font-weight: 900;
-	}
-
-	.line.active:after {
-		content: '';
-		display: block;
-		position: absolute;
-		width: 36rpx;
-		height: 6rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		bottom: 0;
-		background: #22C572;
-		/* border-bottom: 1px solid #22C572; */
-	}
-
 	.search-box {
 		width: 100%;
 		background-color: rgb(242, 242, 242);
@@ -704,5 +759,32 @@
 		border-radius:15px;
 		margin:0 10px;
 	}
+	.changewarehouse{
+		padding:10px 20px;
+	}
+	.header{
+		background:#fff;
+		border-radius:0px 0px 16px 16px;
+	}
+	.content{
+		margin-bottom:100px;
+	}
+	.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;
+		}
+	}
 </style>
 

pages/grain_pulse/details.vue

@@ -375,7 +375,7 @@
 				margin-bottom:10px;
 			}
 			.phone{
-				width:14px;height:14px;margin-left:6px;
+				width:22rpx;height:22rpx;margin-left:6px;
 			}
 		}
 	}

pages/grain_pulse/distribution/distribution.nvue

@@ -111,6 +111,7 @@
 			},
 			getList(val) {
 				this.metreList = []
+				let that = this;
 				let detailedAddress = ""
 				if (val) {
 					detailedAddress = this.position.name
@@ -120,7 +121,9 @@
 					pageSize: 10000,
 					currentPage: 1,
 					detailedAddress:detailedAddress,
-					mainBusinessType:this.mainBusinessType
+					mainBusinessType:this.mainBusinessType,
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					let newmarker =[];
 					var id=1;

pages/grain_pulse/dynamic.vue

@@ -179,37 +179,74 @@
 				this.keyword = ""
 			},
 			release() {
-				this.getCompany.loginPhone = this.userInfo.phone
-				this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
-					.then(res => {
-						if (res.data.code == 200) {
-							console.log("companyList",res)
-							if(res.data.data.length > 0){
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
 								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`
-											})
-										}
-									}
+									url: '/pages/public/login'
 								})
 							}
-						}
+						},
+						fail: () => {},
+						complete: () => {}
 					})
-				
+				}
+				else{
+					this.getCompany.loginPhone = this.userInfo.phone
+					this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
+						.then(res => {
+							if (res.data.code == 200) {
+								console.log("companyList",res)
+								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({
-					url: `/pages/grain_pulse/record`
-				})
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: `/pages/grain_pulse/record`
+					})
+				}
 			}
 		}
 	}

pages/grain_pulse/home.vue

@@ -174,6 +174,7 @@
 						//拼接当前定位回显地址
 						// #ifdef APP-PLUS
 						that.position.name = res.address.poiName
+						that.position.cityname = res.address.city
 						that.position.location = res.longitude + "," +  res.latitude
 						uni.setStorage({
 							key: 'setLocaltion',
@@ -216,13 +217,14 @@
 				var that = this
 				uni.showLoading({
 					title:"正在加载"
-				})
+				}) 
 				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
 					mainBusinessType: this.mainBusinessType,
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						var data = res.data.data.records
@@ -259,6 +261,7 @@
 				})
 			},
 			getInfo(){
+				var that = this
 				uni.showLoading({
 					title:"正在加载"
 				})
@@ -267,7 +270,8 @@
 					pageSize: this.pageSize,
 					currentPage: 1,
 					pcFlag: 2,
-					searchType: 2
+					searchType: 2,
+					location:that.position.cityname
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.datalist = res.data.data.records

pages/grain_pulse/release.vue

@@ -88,8 +88,10 @@
 				this.$api.doRequest('get', '/settledCompanyInfo/companyList', this.getCompany)
 					.then(res => {
 						if (res.data.code == 200) {
-							this.release.compName = res.data.data[0].compName
 							for (let i = 0; i < res.data.data.length; i++) {
+								if(i ==0 && !this.release.compName){
+									this.release.compName = res.data.data[i].compName
+								}
 								this.companyType.push(res.data.data[i].compName)
 							}
 						}
@@ -111,8 +113,10 @@
 				}
 			},
 			companyChange(e) {
+				
 				this.companyIndex = e.detail.value
 				this.release.compName = this.companyType[this.companyIndex]
+				console.log("companyChange",e,this.release.compName)
 			},
 			getImgUrl(e) {
 				this.address.push(e)
@@ -172,6 +176,7 @@
 											uni.showLoading({
 												title:"正在提交"
 											})
+											console.log("addSettledCompanyDynamics",that.release)
 											that.$api.doRequest('post',
 													'/settledCompanyDynamics/api/addSettledCompanyDynamics',
 													that.release)

pages/sale/information.vue

@@ -219,26 +219,7 @@
 				});
 			}
 			var that = this
-			// 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: () => {}
-			// 		})
-			// 	}
-			// })
+			
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)

pages/task/my_task.vue

@@ -76,6 +76,26 @@
 			this.taskInfo=[]
 			this.getIndexBuyData()
 			this.pcUserInfo =  uni.getStorageSync("pcUserInfo")
+			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: () => {}
+					})
+				}
+			})
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数