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

# Conflicts:
#	config/index.js

config/index.js

@@ -3,6 +3,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageA/freightTransport/addsendgoods.vue

@@ -216,6 +216,7 @@
 
 	.center {
 		overflow-y: hidden;
+		padding-bottom: 200rpx;
 	}
 
 	.c-row {
@@ -639,6 +640,7 @@
 		bottom: 0;
 		width: 100%;
 		padding: 20px 0;
+		z-index: 999;
 	}
 
 	.btn {

pageD/identity/companyIdentity.vue

@@ -50,7 +50,7 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input  type='number' placeholder="请填写身份证号" name="input"
+					<input placeholder="请填写身份证号" name="input"
 						v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>

pageD/identity/companyIdentityEdit.vue

@@ -44,7 +44,7 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input type='number' placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>
@@ -114,7 +114,7 @@
 				<view class="c-row b-b">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input type='number' placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>

pageD/identity/companyIdentityThree.vue

@@ -48,7 +48,7 @@
 		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 1">
 			<text class="tit">收款人身份证号</text>
 			<view class="con-list">
-				<input type='number' placeholder="请填写收款人身份证号" name="input"
+				<input placeholder="请填写收款人身份证号" name="input"
 					v-model="identityAuthenticationInfo.payeeNumberCard"></input>
 			</view>
 		</view>

pageD/identity/companyIdentityTwo.vue

@@ -22,7 +22,7 @@
 		<view class="c-row b-b">
 			<text class="tit">身份证号</text>
 			<view class="con-list">
-				<input type='number' placeholder="请填写身份证号" name="input"
+				<input  placeholder="请填写身份证号" name="input"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
 		</view>

pageD/identity/driverIdentity.vue

@@ -22,7 +22,7 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input type='number' placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+					<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">

pageD/identity/driverIdentityEdit.vue

@@ -30,7 +30,7 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input type='number' placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+						<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -193,7 +193,7 @@
 			<view class="c-row ">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input type='number' placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
+					<input placeholder="请输入收款人身份证号" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>
 		</view>

pageD/identity/driverIdentityTwo.vue

@@ -141,7 +141,7 @@
 			<view class="c-row " v-if="items.accountType == '个人账户'">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input type='number' placeholder="请输入收款人身份证号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeNumberCard"></input>
+					<input placeholder="请输入收款人身份证号"placeholder-style="font-size: 14px;color:#AFB3BF;" name="input" v-model="items.payeeNumberCard"></input>
 				</view>
 			</view>	
 			<view class="c-row " v-if="items.accountType == '企业账户'">

pages.json

@@ -819,6 +819,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erpbusiness/acquisitionInspection/add_check_the_weight",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "皮重检斤",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 		{
 		    "path" : "pages/erpbusiness/acquisitionInspection/selectContractNo",

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -7,10 +7,10 @@
 					<view>{{warehouseName}}</view>
 					<u-icon name="arrow-down" color=""></u-icon>
 				</view>
-				<view class="right">
+				<!-- <view class="right">
 					<u-icon name="checkmark-circle-fill" color="#22C572"></u-icon>
 					<view class="default">默认</view>
-				</view>
+				</view> -->
 			</view>
 			<u-select v-model="isShowWarehouse" :default-value='[0]' :list="warehouseList" @confirm="confirmWarehouse">
 			</u-select>
@@ -58,6 +58,9 @@
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 	</view>
 </template>
 
@@ -69,7 +72,11 @@
 				warehouseName: '',
 				isShowWarehouse: false,
 				warehouseList: [],
-				dataList: []
+				isContent:false,
+				loadStatus:'noMore',
+				dataList: [],
+				pageSize:10,
+				currentPage:1,
 			}
 		},
 		onShow() {
@@ -104,10 +111,20 @@
 					}
 				});
 		},
+		onPullDownRefresh() {
+			this.currentPage=1
+			this.gridList=[]
+			this.getList()
+		},
+		 onReachBottom() {
+			 this.currentPage+=1
+		    this.getList()
+			// this.getMoreNews()
+		},
 		methods: {
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: this.compId
+					compId: ''
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
@@ -125,15 +142,18 @@
 			//获取列表
 			getList() {
 				this.$api.doRequest('get', '/weighingManagement/selectWeighingManagement', {
-					compId: this.compId,
-					currentPage: 1,
-					pageSize: 10,
+					compId: '',
+					currentPage: this.currentPage,
+					pageSize:this.pageSize,
 					searchKeyWord: this.inputKeyword,
 					warehouseName: this.warehouseName,
 					managementType: 1,
 				}).then(res => {
 					this.dataList = res.data.data.records
 					console.log(res.data.data.records)
+					if(res.data.data.records.length==0){
+						this.isContent=true
+					}
 					console.log("--------------------------------")
 					console.log("this.dataList",this.dataList)
 				})

pages/erpbusiness/acquisitionInspection/add_check_the_weight.vue

@@ -0,0 +1,255 @@
+<template>
+	<view class="warp">
+		<view class="content">
+			<view class="title">
+				基本信息
+			</view>
+			<view class="row">
+				<view class="left">仓库</view>
+				<view class="right">{{detailData.warehouseName}}</view>
+			</view>
+			<view class="row">
+				<view class="left">合同编号</view>
+				<view @click='show=true'>{{detailData.contractNo?detailData.contractNo:'请选择合同编号'}}</view>
+				<u-picker :range="contractNoList" range-key="contractNo" @confirm='contractNopicker($event)' v-model="show" mode="selector" >
+				</u-picker>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">{{detailData.goodsName}}</view>
+			</view>
+			<view class="row" style="text-align: right;">
+				<view class="left">车牌号</view>
+				<input v-model='detailData.carNumber' class="right-bottom" placeholder="输入车牌号"></input>
+			</view>
+			<view class="row">
+				<view class="left">仓位号</view>
+				<view @click='show1=true'>{{detailData.binNumber?detailData.binNumber:'请选择仓位号'}}</view>
+				<u-picker :range="positionList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show1" mode="selector" >
+				</u-picker>
+			</view>
+			<view class="row" style="text-align: right;">
+				<view class="left">囤位号</view>
+				<input class="right-bottom" v-model='detailData.storageNumber' placeholder="输入囤位号"></input>
+			</view>
+			<view class="row row-bottom" @click="issueTypeClick">
+				<view class="left">出库类型</view>
+				<view class="right">{{issueTypeVal}}></view>
+			</view>
+		</view>
+		<div class="content1">
+			<view class="title">
+				检斤信息
+			</view>
+			<view class="row row-bottom">
+				<view class="left">皮重（公斤）</view>
+				<input class="right-bottom" placeholder="输入皮重"></input>
+			</view>
+		</div>
+		<!-- <u-select v-model="isShowContractNo" :list="contractNoList" @confirm="confirmContractNo"></u-select> -->
+		<u-select v-model="isShowBinNo" :list="binNoList" @confirm="confirmBinNo"></u-select>
+		<u-select v-model="isShowIssueType" :list="issueTypeList" @confirm="confirmIssueTypeNo"></u-select>
+		
+		<view class='footer'>
+			<u-button type="primary" class="submit" @click="submit">提交</u-button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import helper from '@/common/helper.js'; 
+	export default {
+		data() {
+			return {
+				// isShowContractNo: false,
+				isShowBinNo: false,
+				isShowIssueType: false,
+				issueTypeVal: "销售出库",
+				detailData: {},
+				id:'',
+				cangId:'',
+				show1:false,
+				show:false,
+				contractNoList: [],
+				positionList:[],
+				binNoList: [],
+				issueTypeList: [{
+						value: '1',
+						label: '销售出库'
+					},
+					{
+						value: '2',
+						label: '移库出库'
+					},
+					{
+						value: '3',
+						label: '暂存出库'
+					},
+					{
+						value: '4',
+						label: '贸易服务出库'
+					},
+				]
+			}
+		},
+		onShow() {},
+		onLoad(options) {
+			this.cangId = options.cangId
+			this.detailData.warehouseName = options.warehouseName
+			this.getWeighingManagement()
+		},
+		methods: {
+			contractNopicker(e){
+				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
+				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
+			},
+			binNumberpicker(e){
+				this.detailData.binNumber=this.positionList[e[0]].binNumber
+			},
+			getWeighingManagement(){
+					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
+					{id: this.cangId}).then(res => {
+						if(res.data.code==200){
+						this.positionList = res.data.data.warehousePositionInfoList
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
+						compId: '',
+						flag:5
+						}).then(res => {
+						if(res.data.code==200){
+						this.contractNoList = res.data.data
+						}
+					})
+			},
+			contractNoClick() {
+				uni.navigateTo({
+					url:"selectContractNo?compId="+this.detailData.compId
+				})
+			},
+			issueTypeClick() {
+				this.isShowIssueType = true
+			},
+			confirmContractNo(e) {},
+			confirmBinNo(e) {},
+			confirmIssueTypeNo(e) {
+				console.log(e)
+				this.detailData.inOutType=e[0].label
+				this.issueTypeVal = e[0].label
+			},
+			submit(){
+				if (!this.detailData.contractNo) {
+					this.$api.msg('合同编号不能为空')
+					return
+				}
+				if (!this.detailData.binNumber) {
+					this.$api.msg('仓位号不能为空')
+					return
+				}
+				if (!this.detailData.storageNumber) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (
+					this.detailData.storageNumber.length < 1 ||
+					this.detailData.storageNumber.length > 10
+				) {
+					this.$api.msg('囤位号不超过10个字符！')
+					return
+				}
+				if (!this.detailData.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.detailData.carNumber.length != 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.detailData.inOutType) {
+					this.$api.msg('出库类型不能为空')
+					return
+				}
+				var that = this
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success(res) {
+						if(res.confirm){
+							that.$api.doRequest('post', '/weighingManagement/api/editTareOut',
+							that.detailData).then(res => {
+								if(res.data.code==200){
+								that.$api.msg('提交成功')
+								uni.navigateBack()
+								}
+							})
+						}
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.warp {
+		margin: 20rpx;
+	}
+
+	.content,
+	.content1 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 31rpx 0;
+
+			.right {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+			border: 0;
+
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
+	}
+	.footer{
+		position: fixed;
+		bottom:0;
+		width:100%;
+		padding:10px;
+		background:#fff;
+		.submit {
+			width: 90%;
+			background: #22C572;
+			border-radius: 50rpx;
+		}
+	}
+	
+	.row input{
+		font-size:14px;
+	}
+</style>

pages/erpbusiness/acquisitionInspection/grossWeightDetail1.vue

@@ -6,35 +6,35 @@
 				</view>
 			<view class="row">
 				<view class="left">仓库</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.warehouseName}}</view>
 			</view>
 			<view class="row">
 				<view class="left">合同编号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.contractNo}}</view>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.goodsName}}</view>
 			</view>
 			<view class="row">
 				<view class="left">车牌号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view  class="right">{{detailData.qualityInspectionManagement.carNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">仓位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.binNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">囤位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.storageNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">出库类型</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.inOutType}}</view>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.goodsName}}</view>
 			</view>
 		</view>
 		<view class="content1">
@@ -43,19 +43,19 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（公斤）</view>
-				<input class="right-bottom" placeholder="输入皮重"></input>
+				{{detailData.tare}}
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（公斤）</view>
-				<input class="right-bottom" placeholder="输入毛重"></input>
+				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
 				<view class="left">净重（公斤）</view>
-				<input class="right-bottom" disabled placeholder="自动计算"></input>
+				<input v-model='detailData.netWeight' class="right-bottom" disabled placeholder="自动计算"></input>
 			</view>
 		</view>
 		<view class="content2">
-			<view class="left">上传榜单</view>
+			<view class="left">上传磅单</view>
 			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 				:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
@@ -79,13 +79,17 @@
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				detailData: {
-					name: ""
+					name: "",
+					qualityInspectionManagement:{}
 				}
 			}
 		},
-		onShow() {},
 		onLoad(options) {
-			// this.detailData = JSON.parse(options.detailData)
+			this.id = options.id
+			this.cangId = options.cangId
+		},
+		onShow() {
+			this.getWeighingManagement()
 		},
 		methods: {
 			filterFileType(index, lists) {
@@ -100,7 +104,11 @@
 					this.isAdd = false;
 				}
 			},
+			calculate(){
+				this.detailData.netWeight=this.detailData.grossWeight-this.detailData.tare
+			},
 			getImgUrl(res) {
+				this.detailData.addressUrl=res
 				console.log(res)
 				console.log('------------res-----------')
 			},
@@ -109,19 +117,70 @@
 				console.log('------------error-----------')
 				console.log(error)
 			},
+			contractNopicker(e){
+				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
+				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
+			},
+			binNumberpicker(e){
+				this.detailData.binNumber=this.positionList[e[0]].binNumber
+			},
+			getWeighingManagement(){
+					this.$api.doRequest('get', '/weighingManagement/getWeighingManagement',
+					{id: this.id}).then(res => {
+						if(res.data.code==200){
+						console.log(res)
+						this.detailData = res.data.data
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
+					{id: this.cangId}).then(res => {
+						if(res.data.code==200){
+						this.positionList = res.data.data.warehousePositionInfoList
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
+						compId: '',
+						flag:5
+						}).then(res => {
+						if(res.data.code==200){
+						this.contractNoList = res.data.data
+						}
+					})
+			},
 			onProgress(e) {
 				console.log(e)
 			},
 			onRemove(index) {},
 			submit(){
+				if (!this.detailData.grossWeight) {
+					this.$api.msg('毛重不能为空')
+					return
+				}
+				if (isNaN(this.detailData.grossWeight) ||
+					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
+					String(this.detailData.grossWeight).length -
+					(String(this.detailData.grossWeight).indexOf('.') + 1) >
+					1) ||
+					this.detailData.grossWeight < 1 ||
+					this.detailData.grossWeight > 100000
+				) {
+					this.$api.msg('毛重输入错误！')
+					return
+				}
 				let that = this
 				uni.showModal({
 					content:"确定提交检斤信息?",
-					success() {
-						that.$refs.uToast.show({
-						title: '提交成功',
-						type: 'success',
-					})
+					success(res) {
+						if(res.confirm){
+							that.$api.doRequest('post', '/weighingManagement/api/editGrossWeight',
+							that.detailData).then(res => {
+								if(res.data.code==200){
+								that.$api.msg('提交成功')
+								uni.navigateBack()
+								}
+							})
+						}
+						
 					}
 				})
 			}
@@ -157,9 +216,8 @@
 			border-bottom: 1px solid #EEEEEE;
 			padding: 21rpx 0;
 
-			.right {
+			.right,input {
 				font-size: 28rpx;
-				font-weight: 600;
 				color: #333333;
 			}
 		}

pages/erpbusiness/acquisitionInspection/selectContractNo.vue

@@ -47,12 +47,8 @@
 		},
 		methods: {
 			confirm(item){
-				uni.navigateTo({
-					url:'tareDetail1',
-					  success: function(res) {
-					   helper.selectContractNo = item
-					  }
-				})
+				uni.setStorageSync('ContractNo', item);
+				uni.navigateBack({})
 			},
 			getContractNoList() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {

pages/erpbusiness/acquisitionInspection/tareDetail1.vue

@@ -8,25 +8,27 @@
 				<view class="left">仓库</view>
 				<view class="right">{{detailData.warehouseName}}</view>
 			</view>
-			<view class="row" @click="contractNoClick">
+			<view class="row">
 				<view class="left">合同编号</view>
-				<view class="right">仓库仓库仓库仓库仓库1></view>
+				<view @click='slectcontractNo'>{{detailData.contractNo}}</view>
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.goodsName}}</view>
 			</view>
 			<view class="row" style="text-align: right;">
 				<view class="left">车牌号</view>
-				<input class="right-bottom" placeholder="输入车牌号"></input>
+				<input v-model='detailData.carNumber' class="right-bottom" placeholder="输入车牌号"></input>
 			</view>
-			<view class="row" @click="binNoClick">
+			<view class="row">
 				<view class="left">仓位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1></view>
+				<view @click='show1=true'>{{detailData.binNumber}}</view>
+				<u-picker :range="positionList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show1" mode="selector" >
+				</u-picker>
 			</view>
-			<view class="row">
+			<view class="row" style="text-align: right;">
 				<view class="left">囤位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<input class="right-bottom" v-model='detailData.storageNumber' placeholder="输入囤位号"></input>
 			</view>
 			<view class="row row-bottom" @click="issueTypeClick">
 				<view class="left">出库类型</view>
@@ -39,13 +41,16 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（公斤）</view>
-				<input class="right-bottom" placeholder="输入毛重"></input>
+				<input v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
 			</view>
 		</div>
 		<!-- <u-select v-model="isShowContractNo" :list="contractNoList" @confirm="confirmContractNo"></u-select> -->
 		<u-select v-model="isShowBinNo" :list="binNoList" @confirm="confirmBinNo"></u-select>
 		<u-select v-model="isShowIssueType" :list="issueTypeList" @confirm="confirmIssueTypeNo"></u-select>
-		<u-button type="primary" class="submit" @click="submit">提交</u-button>
+		
+		<view class='footer'>
+			<u-button type="primary" class="submit" @click="submit">提交</u-button>
+		</view>
 
 	</view>
 </template>
@@ -61,7 +66,11 @@
 				issueTypeVal: "销售出库",
 				detailData: {},
 				id:'',
+				cangId:'',
+				show1:false,
+				show:false,
 				contractNoList: [],
+				positionList:[],
 				binNoList: [],
 				issueTypeList: [{
 						value: '1',
@@ -82,16 +91,30 @@
 				]
 			}
 		},
-		onShow() {},
+		
 		onLoad(options) {
-			console.log(helper.detailData); 
-			if(helper.selectContractNo){
-				
-			}
-			this.id = helper.detailData.id
+			this.id = options.id
+			this.cangId = options.cangId
 			this.getWeighingManagement()
 		},
+		onShow() {
+			if(uni.getStorageSync('ContractNo')){
+				this.detailData.contractNo=uni.getStorageSync('ContractNo').contractNo
+			}
+		},
 		methods: {
+			contractNopicker(e){
+				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
+				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
+			},
+			slectcontractNo(){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/acquisitionInspection/selectContractNo'
+				})
+			},
+			binNumberpicker(e){
+				this.detailData.binNumber=this.positionList[e[0]].binNumber
+			},
 			getWeighingManagement(){
 					this.$api.doRequest('get', '/weighingManagement/getWeighingManagement',
 					{id: this.id}).then(res => {
@@ -100,15 +123,26 @@
 						this.detailData = res.data.data
 						}
 					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
+					{id: this.cangId}).then(res => {
+						if(res.data.code==200){
+						this.positionList = res.data.data.warehousePositionInfoList
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
+						compId: '',
+						flag:5
+						}).then(res => {
+						if(res.data.code==200){
+						this.contractNoList = res.data.data
+						}
+					})
 			},
 			contractNoClick() {
 				uni.navigateTo({
 					url:"selectContractNo?compId="+this.detailData.compId
 				})
 			},
-			binNoClick() {
-				this.isShowBinNo = true
-			},
 			issueTypeClick() {
 				this.isShowIssueType = true
 			},
@@ -116,13 +150,55 @@
 			confirmBinNo(e) {},
 			confirmIssueTypeNo(e) {
 				console.log(e)
+				this.detailData.inOutType=e[0].label
 				this.issueTypeVal = e[0].label
 			},
 			submit(){
+				if (!this.detailData.contractNo) {
+					this.$api.msg('合同编号不能为空')
+					return
+				}
+				if (!this.detailData.binNumber) {
+					this.$api.msg('仓位号不能为空')
+					return
+				}
+				if (!this.detailData.storageNumber) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (
+					this.detailData.storageNumber.length < 1 ||
+					this.detailData.storageNumber.length > 10
+				) {
+					this.$api.msg('囤位号不超过10个字符！')
+					return
+				}
+				if (!this.detailData.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.detailData.carNumber.length != 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.detailData.inOutType) {
+					this.$api.msg('出库类型不能为空')
+					return
+				}
+				var that = this
 				uni.showModal({
 					content:"确定提交检斤信息?",
-					success() {
-						console.log("提交")
+					success(res) {
+						if(res.confirm){
+							that.$api.doRequest('post', '/weighingManagement/api/editTareOut',
+							that.detailData).then(res => {
+								if(res.data.code==200){
+									uni.setStorageSync('ContractNo','')
+								that.$api.msg('提交成功')
+								uni.navigateBack()
+								}
+							})
+						}
 					}
 				})
 			}
@@ -159,7 +235,6 @@
 
 			.right {
 				font-size: 28rpx;
-				font-weight: 600;
 				color: #333333;
 			}
 		}
@@ -177,13 +252,20 @@
 	.content1 {
 		margin-top: 20rpx;
 	}
-
-	.submit {
+	.footer{
 		position: fixed;
-		bottom: 40rpx;
-		width: 90%;
-		background: #22C572;
-		border-radius: 50rpx;
-
+		bottom:0;
+		width:100%;
+		padding:10px;
+		background:#fff;
+		.submit {
+			width: 90%;
+			background: #22C572;
+			border-radius: 50rpx;
+		}
+	}
+	
+	.row input{
+		font-size:14px;
 	}
 </style>

pages/erpbusiness/acquisitionInspection/tareDetail2.vue

@@ -1,133 +1,260 @@
 <template>
 	<view class="warp">
 		<view class="content">
-				<view class="title">
-					基本信息
-				</view>
+			<view class="title">
+				基本信息
+			</view>
 			<view class="row">
 				<view class="left">仓库</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.warehouseName}}</view>
 			</view>
 			<view class="row">
 				<view class="left">合同编号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.contractNo}}</view>
+				
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.goodsName}}</view>
 			</view>
 			<view class="row">
 				<view class="left">车牌号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.carNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">仓位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.binNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">囤位号</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.storageNumber}}</view>
 			</view>
-			<view class="row row-bottom">
+			<view class="row">
 				<view class="left">出库类型</view>
-				<view class="right-bottom">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{issueTypeVal}}</view>
 			</view>
 		</view>
-		<view class="content1">
+		<div class="content1">
 			<view class="title">
 				检斤信息
 			</view>
-			<view class="row">
-				<view class="left">毛重（公斤）</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
-			</view>
-			<view class="row">
+			<view class="row row-bottom">
 				<view class="left">皮重（公斤）</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+				<view class="right">{{detailData.tare}}</view>
 			</view>
-			<view class="row row-bottom" style="border: 0;">
-				<view class="left">净重（公斤）</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
+			<view class="row row-bottom">
+				<view class="left">毛重（公斤）</view>
+				<view v-if='detailData.grossWeight' class="right">{{detailData.grossWeight}}</view>
+				<view v-else class="right">未称重</view>
 			</view>
-		</view>
-		<view class="content2">
-			<view class="title">
-				磅单照片
+			<view v-if='detailData.grossWeight' class="row row-bottom">
+				<view class="left">净重（公斤）</view>
+				<view class="right">{{detailData.netWeight}}</view>
 			</view>
-			<view>
-				<image class="img" src="../../../static/img/authentication/cert-personal@3x.png" mode=""></image>
+			<view v-if='detailData.grossWeight' class="content2">
+				<view class="left">上传磅单</view>
+				<image style='width:100px;height:100px;' :src="detailData.addressUrl" mode=""></image>
 			</view>
-		</view>
+		</div>
+		<!-- <u-select v-model="isShowContractNo" :list="contractNoList" @confirm="confirmContractNo"></u-select> -->
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js'; 
 	export default {
 		data() {
 			return {
-				detailData: {
-					name: ""
-				}
+				// isShowContractNo: false,
+				isShowBinNo: false,
+				isShowIssueType: false,
+				issueTypeVal: "销售出库",
+				detailData: {},
+				id:'',
+				cangId:'',
+				show1:false,
+				show:false,
+				contractNoList: [],
+				positionList:[],
+				binNoList: [],
+				issueTypeList: [{
+						value: '1',
+						label: '销售出库'
+					},
+					{
+						value: '2',
+						label: '移库出库'
+					},
+					{
+						value: '3',
+						label: '暂存出库'
+					},
+					{
+						value: '4',
+						label: '贸易服务出库'
+					},
+				]
 			}
 		},
 		onShow() {},
 		onLoad(options) {
-			// this.detailData = JSON.parse(options.detailData)
+			this.id = options.id
+			this.cangId = options.cangId
+			this.getWeighingManagement()
 		},
 		methods: {
-
-		}
+			contractNopicker(e){
+				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
+				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
+			},
+			binNumberpicker(e){
+				this.detailData.binNumber=this.positionList[e[0]].binNumber
+			},
+			getWeighingManagement(){
+					this.$api.doRequest('get', '/weighingManagement/getWeighingManagement',
+					{id: this.id}).then(res => {
+						if(res.data.code==200){
+						console.log(res)
+						this.detailData = res.data.data
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
+					{id: this.cangId}).then(res => {
+						if(res.data.code==200){
+						this.positionList = res.data.data.warehousePositionInfoList
+						}
+					})
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
+						compId: '',
+						flag:5
+						}).then(res => {
+						if(res.data.code==200){
+						this.contractNoList = res.data.data
+						}
+					})
+			},
+			contractNoClick() {
+				uni.navigateTo({
+					url:"selectContractNo?compId="+this.detailData.compId
+				})
+			},
+			issueTypeClick() {
+				this.isShowIssueType = true
+			},
+			confirmContractNo(e) {},
+			confirmBinNo(e) {},
+			submit(){
+				if (!this.detailData.contractNo) {
+					this.$api.msg('合同编号不能为空')
+					return
+				}
+				if (!this.detailData.binNumber) {
+					this.$api.msg('仓位号不能为空')
+					return
+				}
+				if (!this.detailData.storageNumber) {
+					this.$api.msg('囤位号不能为空')
+					return
+				}
+				if (
+					this.detailData.storageNumber.length < 1 ||
+					this.detailData.storageNumber.length > 10
+				) {
+					this.$api.msg('囤位号不超过10个字符！')
+					return
+				}
+				if (!this.detailData.carNumber) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.detailData.carNumber.length != 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (!this.detailData.inOutType) {
+					this.$api.msg('出库类型不能为空')
+					return
+				}
+				var that = this
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success(res) {
+						if(res.confirm){
+							that.$api.doRequest('post', '/weighingManagement/api/editTareOut',
+							that.detailData).then(res => {
+								if(res.data.code==200){
+								that.$api.msg('提交成功')
+								uni.navigateBack()
+								}
+							})
+						}
+					}
+				})
+			}
+		},
 	}
 </script>
 
 <style scoped lang="scss">
-	uni-page-body{
+	uni-page-body {
 		overflow: hidden;
 	}
-	.warp{
+
+	.warp {
 		margin: 20rpx;
 	}
-.content,.content1,.content2{
-	border-radius: 20rpx;
-	background: white;
-	padding: 20rpx;
-	.title{
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333333;
-	}
-	.row{
-		display: flex;
-		justify-content: space-between;
-		border-bottom: 1px solid #EEEEEE;
-		padding:21rpx 0;
-		.right{
+
+	.content,
+	.content1 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 		}
-	}
-	.row-bottom{
-		border: 0;
-		.right-bottom{
-			width: 300rpx;
-			text-align: right;
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 31rpx 0;
+
+			.right {
+				font-size: 28rpx;
+				color: #333333;
+			}
 		}
+
+		.row-bottom {
+			border: 0;
+
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
 	}
-}
-.content1,.content2{
-	margin-top: 10rpx;
-}
-.img{
-	width: 282rpx;
-	height: 282rpx;
-}
-.submit{
+	.footer{
 		position: fixed;
-		bottom:40rpx;
-		width: 90%;
-		background: #22C572;
-		border-radius: 50rpx;
-		
+		bottom:0;
+		width:100%;
+		padding:10px;
+		background:#fff;
+		.submit {
+			width: 90%;
+			background: #22C572;
+			border-radius: 50rpx;
+		}
+	}
+	
+	.row input{
+		font-size:14px;
 	}
 </style>

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -7,15 +7,15 @@
 					<view>{{warehouseName}}</view>
 					<u-icon name="arrow-down" color=""></u-icon>
 				</view>
-				<view class="right">
+				<!-- <view class="right">
 					<u-icon name="checkmark-circle-fill" color="#22C572"></u-icon>
 					<view class="default">默认</view>
-				</view>
+				</view> -->
 			</view>
 			<u-select v-model="isShowWarehouse" :list="warehouseList" @confirm="confirmWarehouse"></u-select>
 		</view>
 		<view class="middle">
-			<view class="item-style" v-for="(item,index) in dataList" :key="index" @click="toDetail">
+			<view class="item-style" v-for="(item,index) in dataList" :key="index" @click="toDetail(item)">
 				<view class="row1">
 					<view class="row1-left">
 						<view class="left status1" v-if="item.status=='已质检'">检</view>
@@ -58,7 +58,13 @@
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 		<u-toast ref="uToast" />
+		<view class="footer">
+			<view @click='add' class="button">新增</view>
+		</view>
 	</view>
 </template>
 
@@ -71,7 +77,12 @@
 				warehouseName: '',
 				isShowWarehouse: false,
 				warehouseList: [],
-				dataList: []
+				isContent:false,
+				loadStatus:'noMore',
+				dataList: [],
+				pageSize:10,
+				currentPage:1,
+				cangId:''
 			}
 		},
 		onShow() {
@@ -106,10 +117,25 @@
 					}
 				});
 		},
+		onPullDownRefresh() {
+			this.currentPage=1
+			this.gridList=[]
+			this.getList()
+		},
+		 onReachBottom() {
+			 this.currentPage+=1
+		    this.getList()
+			// this.getMoreNews()
+		},
 		methods: {
+			add(){
+				uni.navigateTo({
+					url:'/pages/erpbusiness/acquisitionInspection/add_check_the_weight?cangId='+this.cangId+'&warehouseName='+this.warehouseName
+				})
+			},
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: this.compId
+					compId: ''
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
@@ -121,21 +147,25 @@
 						this.warehouseList.push(_obj)
 					}
 					this.warehouseName = this.warehouseList[0].label
+					this.cangId = this.warehouseList[0].value
 					this.getList()
 				})
 			},
 			//获取列表
 			getList() {
 				this.$api.doRequest('get', '/weighingManagement/selectWeighingManagement', {
-					compId: this.compId,
-					currentPage: 1,
-					pageSize: 10,
+					compId: '',
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
 					searchKeyWord: this.inputKeyword,
 					warehouseName: this.warehouseName,
 					managementType: 3,
 				}).then(res => {
 					this.dataList = res.data.data.records
 					console.log(res.data.data.records)
+					if(res.data.data.records.length==0){
+						this.isContent=true
+					}
 					// console.log("--------------------------------")
 					// console.log("this.dataList",this.dataList)
 				})
@@ -146,19 +176,20 @@
 			confirmWarehouse(e) {
 				console.log(e)
 				this.warehouseName = e[0].label
+				this.cangId = e[0].value
 			},
 			//毛重
-			grossWeightClick(val) {
-				if (val.status == "已质检") return;
-				console.log(val)
+			grossWeightClick(item) {
+				if (item.status == "已质检") return;
+				console.log(item)
 				uni.navigateTo({
-					url: './grossWeightDetail1?detailData=' + JSON.stringify(val)
+					url: './grossWeightDetail1?id=' + item.id+'&cangId='+this.cangId
 				})
 			},
-			tareClick(val) {debugger
-				helper.detailData = val
+			tareClick(item) {
+				// debugger
 				uni.navigateTo({
-					url: './tareDetail1?detailData=' + JSON.stringify(val)
+					url: './tareDetail1?id=' + item.id+'&cangId='+this.cangId
 				})
 			},
 			delClick(val) {
@@ -188,15 +219,15 @@
 						} else if (res.cancel) {
 							console.log('用户点击取消');
 						}
-						debugger
+						// debugger
 
 					}
 				})
 
 			},
-			toDetail(val) {
+			toDetail(item) {
 				uni.navigateTo({
-					url: './tareDetail2?detailData=' + JSON.stringify(val)
+					url: './tareDetail2?id=' + item.id+'&cangId='+this.cangId
 				})
 			}
 		}
@@ -329,4 +360,21 @@
 	}
 
 	.gray {}
+	.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/add_quality_testing.vue

@@ -49,7 +49,7 @@
 			<view class="c-row b-b">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<view @click='show=true'>{{gridList.binNumber}}</view>
+					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
 					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
 					</u-picker>
 				</view>
@@ -64,13 +64,17 @@
 			<view class="c-row b-b">
 				<view class="title">货名</view>
 				<view class="con-list">
-					{{gridList.goodsName}}
+					<view @click='show2=true'>{{gridList.goodsName}}</view>
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2" mode="selector" >
+					</u-picker>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">类型</view>
 				<view class="con-list">
-					{{gridList.type}}
+					<view @click='show3=true'>{{gridList.type}}</view>
+					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector" >
+					</u-picker>
 				</view>
 			</view>
 			<view class="c-row">
@@ -126,7 +130,7 @@
 					 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="请输入热损伤占比"
@@ -174,12 +178,19 @@
 				carInfo: [],
 				gridCol: 4,
 				pageSize:10,
+				show3:false,
+				show2:false,
+				goodsList:[],
 				currentPage:1,
 				gridBorder: false,
 				headUrl:"../../static/img/myimg/YongHu@3x.png",
 				userphone:"",
 				username:"请更改昵称",
-				gridList: {},
+				gridList: {
+					natureOfGrainPurchase:'贸易粮',
+					type:'潮粮'
+				},
+				typeList:['潮粮','干粮'],
 				managementType:'',
 				warehouseName: '',
 				warehouseList:[],
@@ -228,7 +239,7 @@
 			}
 		},
 		onLoad(options){
-			console.log(options)
+			
 			this.commonWarehouseNo=options.commonWarehouseNo
 			this.warehouseCount=options.warehouseCount
 			 let number = '000' + this.warehouseCount
@@ -240,6 +251,10 @@
 			this.managementType=options.managementType
 		},
 		onShow() {
+			if(uni.getStorageSync('checkcustomer')){
+				this.gridList.customerName=uni.getStorageSync('checkcustomer').customerName
+				this.gridList.customerPhone=uni.getStorageSync('checkcustomer').customerPhone
+			}
 			var that = this
 				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
 					compId:'',
@@ -255,6 +270,21 @@
 						})
 					}
 				})
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName',{
+					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)
+							}
+					}
+				})
 		},
 		methods: {
 			gocustomer(){
@@ -363,11 +393,13 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/addQualityInspection',that.gridList).then(res => {
 								if(res.data.code==200){
-									that.$api.msg('编辑质检成功')
+									that.$api.msg('提交成功')
 									uni.navigateBack({
 									})
+								}else{
+									hat.$api.msg('提交失败')
 								}
 							})
 						}
@@ -380,6 +412,15 @@
 				this.gridList.grade=this.gradeList[e[0]].value
 				this.gridList.gradeKey=this.gradeList[e[0]].key
 			},
+			goodspicker(e){
+				console.log(e)
+				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
+				this.gridList.goodsName=this.goodsList[e[0]].goodsName
+				uni.setStorageSync('goodsName',this.gridList.goodsName)
+			},
+			typepicker(e){
+				this.gridList.type=this.typeList[e[0]]
+			},
 			binNumberpicker(e){
 				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
 			},

pages/erpbusiness/customer.vue

@@ -4,7 +4,7 @@
 			<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 @input='searchinput' type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()"
 						 placeholder="输入客户姓名或手机号" confirm-type="search"></input>
 				</view>
 				<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
@@ -13,11 +13,11 @@
 			</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)'>
+			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
+			<view v-if='searchKeyWord.length>0&&show==true' 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 @click='recentcustomer(item)' class='wrap' v-else>{{item.searchContent}}</view>
 		</view>
 		
 		<view v-show="isContent">
@@ -71,6 +71,8 @@
 				showTran: true,
 				companyId: 1,
 				current: 4,
+				customerList:[],
+				purchasePriceList:[],
 				warehouseCount:'',
 				commonWarehouseNo:'',
 				cangid:''
@@ -111,60 +113,167 @@
 			}
 		},
 		onLoad(options){
-			this.managementType=options.managementType
+			this.purchasePriceList=uni.getStorageSync('purchasePriceList')
 		},
 		onShow() {
 			this.gridList=[]
 			this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo',{
-				compId:'',
-				authenticationStatusKey:7,
+				pageSize:this.pageSize,
+				currentPage:this.currentPage,
+				functionType:"3",
+				commonId:this.userInfo.id
 			}).then(res => {
 				if(res.data.data){
 					this.gridList=res.data.data.records
 				}
 			})
+			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
+				compId:'',
+				authenticationStatusKey:7,
+			}).then(res => {
+				if(res.data.data){
+					this.customerList=res.data.data
+					}
+			})
 		},
 		methods: {
+			searchinput(e){
+				if(this.searchKeyWord.length==0){
+					this.show=false
+					this.getList()
+				}
+				
+			},
 			checkcustomer(item){
-				this.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
-					commonId:this.userInfo.id,
-					searchContent:item.customerName,
-					functionType:3
-				}).then(res => {
-				})
+				var that = this
+				var count=''
+				uni.showLoading({title: '加载中',mask:true})
+				if(item.authenticationStatus=='已认证'){
+
+					this.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
+						compId:'',
+						customerName: item.customerName,
+						goodsName: uni.getStorageSync('goodsName'),
+					}).then(res => {
+						if(res.data.code==200){
+							count=res.data.data
+							
+						}
+					})
+					that.$api.doRequest('get', '/paymentManagement/cumulant',{
+						compId:'',
+						customerName: item.customerName,
+						goodsName: uni.getStorageSync('goodsName'),
+					}).then(res => {
+						for (let i = 0; i < 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}吨。`)
+								}else{
+										that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
+										commonId:that.userInfo.id,
+										searchContent:item.customerName+'('+item.customerPhone+')',
+										functionType:3
+									}).then(res => {
+										uni.hideLoading()
+										uni.setStorageSync('checkcustomer',item)
+										uni.navigateBack()
+									})
+								}
+							}
+						}
+					})
+					
+				}else{
+					this.$api.msg('客户身份不可用')
+				}
+				
+			},
+			recentcustomer(item){
+				var count=''
+				var that = this
+				var name=item.searchContent.split('(')[0]
+				
+				for(var i=0;i<this.customerList.length;i++){
+					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
+					if(this.customerList[i].customerName==name){
+						uni.showLoading({title: '加载中',mask:true})
+							this.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
+								compId:'',
+								customerName: this.customerList[i].customerName,
+								goodsName: uni.getStorageSync('goodsName'),
+							}).then(res => {
+								if(res.data.code==200){
+									count=res.data.data
+									
+								}
+							})
+							that.$api.doRequest('get', '/paymentManagement/cumulant',{
+								compId:'',
+								customerName: this.customerList[i].customerName,
+								goodsName: uni.getStorageSync('goodsName'),
+							}).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}吨。`)
+										}else{
+												that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
+												commonId:that.userInfo.id,
+												searchContent:this.customerList[i].customerName+'('+this.customerList[i].customerPhone+')',
+												functionType:3
+											}).then(res => {
+												uni.hideLoading()
+												uni.setStorageSync('checkcustomer',this.customerList[i])
+												uni.navigateBack()
+											})
+										}
+									}
+								}
+							})
+							
+					}
+				}
 			},
 			emptysearch(){
+				this.show=false
 				this.searchKeyWord=''
 				this.gridList=[]
 				this.currentPage=1
 				this.getList()
 			},
 			doSearch(){
+				this.show=true
 				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 => {
+				var url=''
+				var data={}
+				if(this.searchKeyWord.length>0){
+					url='/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
+					data={
+						compId:'',
+						authenticationStatusKey:7,
+						searchKeyWord:this.searchKeyWord
+					}
+				}else{
+					url='/searchRecordsInfo/selectSearchRecordsInfo'
+					data={
+						pageSize:this.pageSize,
+						currentPage:this.currentPage,
+						functionType:"3",
+						commonId:this.userInfo.id
+					}
+				}
+				this.$api.doRequest('get', url,data).then(res => {
 					if(res.data.data){
-						let data = res.data.data
+						let data = res.data.data.records?res.data.data.records:res.data.data
 						//采购信息
 						if (data.length > 0) {
-								that.gridList = that.gridList.concat(data)
+								that.gridList = data
 						}else{
 							if(this.currentPage==1){
 								that.gridList=[]
@@ -172,7 +281,6 @@
 							this.isContent=true
 						}
 					}
-					// console.log(that.gridList)
 				})
 			},
 			edit(item){

pages/erpbusiness/examine_quality_testing.vue

@@ -8,31 +8,43 @@
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==1' class="c-row b-b">
 				<view class="title">编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==3' class="c-row b-b">
+				<view class="title">合同编号</view>
+				<view class="con-list">
+					{{gridList.contractNo}}
+				</view>
+			</view>
+			<view v-if='managementType==1' class="c-row b-b">
 				<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 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.carNumber}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==1' class="c-row b-b">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					{{gridList.buckleWeightRatio}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==1' class="c-row b-b">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					{{gridList.natureOfGrainPurchase}}
@@ -50,19 +62,19 @@
 					{{gridList.storageTagNo}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==1' class="c-row b-b">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
 				</view>
 			</view>
-			<view class="c-row b-b">
+			<view v-if='managementType==1' class="c-row b-b">
 				<view class="title">类型</view>
 				<view class="con-list">
 					{{gridList.type}}
 				</view>
 			</view>
-			<view class="c-row">
+			<view v-if='managementType==1' class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					{{gridList.tidalGrainPrice}}
@@ -217,6 +229,7 @@
 			console.log(options)
 			this.id=options.id
 			this.cangid=options.cangid
+			this.managementType=options.managementType
 		},
 		onShow() {
 			var that = this

pages/erpbusiness/quality_testing.vue

@@ -1,6 +1,13 @@
 <template>
 	<view>
+		<view class='navbar' style='position:fixed;background:#fff;top:0;width:100%;z-index:3;'>
+			<view class="back-btn cuIcon-back" @click="navBack"></view>
+				<view class='header-content' v-if='managementType==3'>出库质检</view>
+				<view class='header-content' v-if='managementType==1'>收购质检</view>
+		</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>
@@ -54,7 +61,7 @@
 		<view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
-		<view class="footer">
+		<view v-if='managementType==1' class="footer">
 			<view @click='add' class="button">新增</view>
 		</view>
 	</view>
@@ -144,6 +151,16 @@
 				}
 			}
 		},
+		onPullDownRefresh() {
+			this.currentPage=1
+			this.gridList=[]
+			this.getList()
+		},
+		 onReachBottom() {
+			 this.currentPage+=1
+		    this.getList()
+			// this.getMoreNews()
+		},
 		onLoad(options){
 			this.managementType=options.managementType
 		},
@@ -317,10 +334,8 @@
 				this.inputStatus = 'none'
 				this.genderShow = false
 			},
-			myAccount() {
-				uni.navigateTo({
-					url: `/pageA/pages/contract`
-				})
+			navBack() {
+				uni.navigateBack();
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
@@ -334,12 +349,6 @@
 					url
 				})
 			},
-			mycarClick(carNo) {
-				this.modalName = null
-				uni.navigateTo({
-					url: `/pageB/car/mycar_detail?carNo=${carNo}`
-				})
-			},
 			scanCode() {
 				uni.scanCode({
 					success: function(res) {
@@ -700,6 +709,28 @@
 	.cu-list>.cu-item:after{
 		border:none;
 	}
+	.back-btn {
+		position: fixed;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 30upx;
+		font-size: 36upx;
+		color: $font-color-dark;
+	}
+	.navbar{
+		height:50px;
+	}
+	.header-content {
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 30upx;
+		font-size: 36upx;
+		color: $font-color-dark;
+	}
 	.sign{
 		width: 40px;
 		height: 40px;
@@ -764,11 +795,9 @@
 	}
 	.header{
 		background:#fff;
+		margin-top:60px;
 		border-radius:0px 0px 16px 16px;
 	}
-	.content{
-		margin-bottom:100px;
-	}
 	.footer{
 		background:#fff;
 		position:fixed;

pages/grain_pulse/distribution/distribution.nvue

@@ -105,8 +105,8 @@
 		},
 		methods: {
 			coordinate(item){
-				this.nowLocation.latitude = item.latitude
-				this.nowLocation.longitude = item.longitude
+				// this.nowLocation.latitude = item.latitude
+				// this.nowLocation.longitude = item.longitude
 				this.getList()
 			},
 			getList(val) {
@@ -370,7 +370,8 @@
 	}
 	.left {
 		flex-direction: row;
-		flex:2;
+		flex:3;
+
 	}
 
 	.left-img {

pages/sale/information.vue

@@ -32,7 +32,7 @@
 				<view class='Regular' style='color:#B2B3BB;' @click='more("/pages/sale/plant")'>更多</view>
 			</view>
 			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500" :circular="true"
-				:acceleration="true" style="min-height: 650rpx;">
+				:acceleration="true" style="min-height: 700rpx;">
 				<swiper-item class="" v-for="(item1,index) in factoryPriceData.list" :key="index">
 					<view class=' guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
 						<view class='factory'>{{item.factory}}</view>