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

# Conflicts:
#	config/index.js

components/master-keyboard/master-keyboard.scss

@@ -18,6 +18,17 @@
 			height: 48rpx;
 		}
 	}
+	.number_next{
+		width: 100%;
+		height: 80rpx;
+		margin-top: 10rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		text-align: center;
+		line-height: 80rpx;
+		box-sizing: border-box;
+		display: block;
+	}
 	.kerboard_number{
 		width: 100%;
 		display: flex;

components/master-keyboard/master-keyboard.vue

@@ -25,6 +25,10 @@
 					</block>
 				</view>
 			</view>
+			<view class="next-btn">
+				<view class='number_next' @click="nextBtnClick(0)">上一项</view>
+				<view class='number_next' @click="nextBtnClick(1)">下一项</view>
+			</view>
 		</block>
 		<block v-else-if="keyboardtype == 'car'">
 			<view class="keyboard_car">
@@ -92,6 +96,10 @@
 	export default {
 		name: "master-keyboard",
 		props: {
+		fatherMethod: {
+				type: Function,
+				default: null
+			  },
 			keyboardtype: {
 				type: String,
 				default: 'number' // number=数字键盘 digit=带小数点的数字键盘  idcard=身份证号键盘  car=车牌号键盘
@@ -166,6 +174,12 @@
 		},
 		onLoad() {},
 		methods: {
+			nextBtnClick(type){debugger
+				let that = this
+				if (this.fatherMethod) {
+				          this.fatherMethod(type);
+					}
+			},
 			formatCarProvinceFirst(value) {
 				const list = ['使', '领', '警', '学', '港', '澳', ]
 				return list.indexOf(value)
@@ -303,4 +317,12 @@
 
 <style scoped lang="scss">
 	@import './master-keyboard.scss';
+	.next-btn{
+		display: flex;
+		justify-content: space-evenly;
+		.number_next{
+			width: 45%;
+		}
+		
+		}
 </style>

config/index.js

@@ -1,7 +1,6 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrlNew: 'http://api1.eliangeyun.com/',
-	// baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages.json

@@ -1041,7 +1041,23 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		}, 
+		{
+			"path": "pages/task/audit/tradeServices_audit",
+			"style": {
+				"navigationBarTitleText": "贸易服务审核",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/task/audit/tradeServices_audit_approval",
+			"style": {
+				"navigationBarTitleText": "贸易服务详情",
+				"enablePullDownRefresh": false
+			}
+		
+		},{
 			"path": "pages/task/audit/freight_settlement_approval",
 			"style": {
 				"navigationBarTitleText": "运费结算审核",

pages/erp/exWarehousing/exWarehousing.vue

@@ -454,7 +454,14 @@
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				if (this.detailData.inOutType == '销售出库') {
-					this.detailData.tips = '买方' + this.contractNoList[i].buyer
+					if(this.detailData.tips = '买方' + this.contractNoList[i].buyer){
+						this.detailData.tips = '买方' + this.contractNoList[i].buyer+
+						'（ ' +
+						this.contractNoList[i].unitContractPrice +
+						'元/吨）'
+					}else{
+						this.detailData.tips = '买方' + this.contractNoList[i].buyer
+					}
 				} else if (this.detailData.inOutType == '移库出库') {
 					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
 				}

pages/erp/warehousing/warehousing.vue

@@ -473,7 +473,15 @@
 					for (var i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 							if (this.detailData.inOutType == '采购入库') {
-								this.detailData.tips = '卖方' + this.contractNoList[i].seller
+								if(this.contractNoList[i].unitContractPrice){
+									this.detailData.tips = '卖方' + this.contractNoList[i].seller+
+              '（ ' +
+              this.contractNoList[i].unitContractPrice +
+              '元/吨）'
+								}else{
+									this.detailData.tips = '卖方' + this.contractNoList[i].seller
+								}
+								
 							} else if (this.detailData.inOutType == '移库入库') {
 								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
 							} else if (this.detailData.inOutType == '退库') {

pages/erpbusiness/acquisitionInformation.vue

@@ -11,16 +11,19 @@
 			<view class="content-item">
 				<view class="left">收购信息</view>
 				<view class='row'>
-				<textarea placeholder="请输入仓库信息" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<textarea placeholder="输入收购信息,不超过2000个字" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<view class="textarea-left">
+					<view  class="clear" @click="clear()">清除全部</view>
+				</view>
 				<view class="textarea-bottom">{{textareaValue?textareaValue.length:'0'}}/2000字</view>
-			</view>
-			<view class='row row_css'>
-				显示在易粮易运收购信息中
-				<!-- <u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox> -->
-				<view class="right">
-					<u-switch v-model="value" active-color="#19be6b" inactive-color="#eee" size='40' @change="checkBoxChange"></u-switch>
 				</view>
-			</view>
+				<view class='row row_css'>
+					显示在易粮易运收购信息中
+					<!-- <u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox> -->
+					<view class="right">
+						<u-switch v-model="value" active-color="#19be6b" inactive-color="#eee" size='40' @change="checkBoxChange"></u-switch>
+					</view>
+				</view>
 			</view>
 			
 		</view>
@@ -122,40 +125,11 @@
 		},
 		methods: {
 			init() {
-				let _obj = {
-					commonId: this.sgId,
-					warehouseName:uni.getStorageSync("depotAcquisition_warehouseName")
-				}
-				this.$api.doRequest('get', '/acquisitionInfo/getInfo', _obj).then(res => {
-					if (res.data.code == 200) {
-						if (res.data.data) {
-							this.isEdit = true
-							this.value = res.data.data.checkFlag == '0' ? false : true
-							console.log(this.value)
-							this.warehouseName = res.data.data.warehouseName
-							this.textareaValue = res.data.data.acquisitionInformation
-							this.id = res.data.data.id
-						} else {
-							this.textareaValue = ''
-							this.isEdit = false
-							this.value = false
-						}
-					}
-				})
-
-
-
-				switch (this.status) {
-					case '已隐藏':
-						break;
-					case '显示中':
-
-						break;
-				}
+				var that = this
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
 					compId: uni.getStorageSync('pcUserInfo').compId,
 				}).then(res => {
-					if (res.data.data.length != 0) {
+					if (res.data.data.length > 0) {
 						uni.hideLoading()
 						// let _showData = uni.getStorageSync("erpSelectWarehous")
 						// let _showCWData = uni.getStorageSync("erpSelectWarehousCW")
@@ -165,12 +139,39 @@
 							this.warehouseName = _storangewarehouseName
 						} else {
 							this.warehouseName = res.data.data[0].warehouseName
+							uni.setStorageSync("depotAcquisition_warehouseName", this.warehouseName)
 						}
+						that.$api.doRequest('get', '/acquisitionInfo/getInfo', {
+					commonId: uni.getStorageSync("userInfo").id,
+					warehouseName:uni.getStorageSync("depotAcquisition_warehouseName")
+				}).then(res1 => {
+							if (res1.data.code == 200) {
+								if (res1.data.data) {
+									that.isEdit = true
+									that.value = res1.data.data.checkFlag == '0' ? false : true
+									console.log(that.value)
+									that.warehouseName = res1.data.data.warehouseName
+									that.textareaValue = res1.data.data.acquisitionInformation
+									that.id = res1.data.data.id
+								} else {
+									that.textareaValue = ''
+									that.isEdit = false
+									that.value = false
+								}
+							}
+						})
 					} else {
 						this.warehouseList = []
 						this.warehouseName = '暂无仓库'
 					}
 				})
+				// switch (this.status) {
+				// 	case '已隐藏':
+				// 		break;
+				// 	case '显示中':
+
+				// 		break;
+				// }
 			},
 			warehousechange(e) {
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
@@ -208,6 +209,10 @@
 				} else {
 					_flag = 0
 				}
+				if(!this.textareaValue){
+					this.$api.msg('收购信息不能为空！')
+					return
+				}
 				let _obj = {
 					warehouseName: this.warehouseName,
 					acquisitionInformation: this.textareaValue,
@@ -240,6 +245,9 @@
 				
 				// this.$api.msg('提交成功')
 				// this.$api.msg('提交失败')
+			},
+			clear(){
+				this.textareaValue=''
 			}
 		}
 	}
@@ -311,12 +319,17 @@
 		padding-bottom: 20rpx;
 		color: #AFB3BF ;
 	}
-
+    .textarea-left{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		color: #606266;
+	}
 	.textarea-bottom {
 		position: absolute;
 		bottom: 20rpx;
 		right: 20rpx;
-		color: #606266;
+		color: #AFB3BF;
 	}
 
 	.submit {
@@ -324,6 +337,15 @@
 		background: #22C572;
 		border-radius: 50rpx;
 	}
+	.clear {
+		/* width: 90%; */
+		background: #ffffff;
+		color: #22C572;
+		border:1px solid  #22C572;
+		border-radius: 50rpx;
+		font-size: 28rpx;
+		padding: 9rpx 24rpx;
+	}
 
 	.bottom-btn {
 		position: fixed;

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -61,12 +61,14 @@
 			return {
 				detailData: {
 					tare: 0,
-					buckleMiscellaneous: 0
+					buckleMiscellaneous: 0,
+					qualityInspectionManagement:{}
 				},
 				purchasePriceList: []
 			}
 		},
 		onShow() {
+			
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.detailData.warehouseId
 			}).then(res => {

pages/erpbusiness/add_quality_testing.vue

@@ -14,6 +14,15 @@
 					{{gridList.qualityNo}}
 				</view>
 			</view>
+			<view class="c-row ">
+				<view class="title">货名</view>
+				<view class="con-list">
+					<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 ">
 				<view class="title">客户</view>
 				<view class="con-list">
@@ -68,15 +77,6 @@
 					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row ">
-				<view class="title">货名</view>
-				<view class="con-list">
-					<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 ">
 				<view class="title">类型</view>
 				<view v-if="!edit" class="con-list">
@@ -320,20 +320,6 @@
 			}
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
-			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
-					})
-				}
-			})
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
 			}).then(res => {
@@ -350,6 +336,14 @@
 						} else {
 							that.edit = false
 						}
+						this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+							warehouseId: this.cangid,
+							goodsName: that.gridList.goodsName
+						}).then(res => {
+							if (res.data.data) {
+								uni.hideLoading()
+							}
+						})
 						uni.setStorageSync('purchasePriceList', that.goodsList)
 						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
 						that.waterContentChange()
@@ -452,8 +446,7 @@
 			},
 			gocustomer() {
 				uni.navigateTo({
-					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList
-						.warehouseName
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList.warehouseName + '&goodsName=' + this.gridList.goodsName
 				})
 			},
 			getdate() {
@@ -568,7 +561,6 @@
 												that.gridList.goodsName == that.purchasePriceList[i]
 												.goodsName
 											) {
-												debugger
 												let count = (that.purchasePriceList[i].saleLimit -
 													response.data.data / 1000).toFixed(2)
 													console.log(count,that.purchasePriceList[i].saleLimit,
@@ -610,6 +602,7 @@
 				this.waterContentChange()
 			},
 			setGoodName(e) {
+				uni.showLoading({title: '加载中',mask:true})
 				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				if (this.goodsList[e[0]].goodsName == '玉米') {
@@ -622,7 +615,23 @@
 					this.gridList.type = '干粮'
 					this.edit = false
 				}
+				var that = this
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
+				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+					warehouseId: this.cangid,
+					goodsName: this.gridList.goodsName
+				}).then(res => {
+					if (res.data.data) {
+						uni.hideLoading()
+						// 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
+						})
+					}
+				})
 				uni.setStorageSync('goodsName', this.gridList.goodsName)
 				if (this.gridList.type == "干粮" && this.gridList.goodsName) {
 					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
@@ -630,6 +639,7 @@
 						goodsName: this.gridList.goodsName
 					}).then(res => {
 						this.gridList.dryGrainPrice = res.data.data
+						
 					})
 				}
 				this.waterContentChange()

pages/erpbusiness/customer.vue

@@ -116,6 +116,7 @@
 		onLoad(options) {
 			this.cangid = options.cangid
 			this.warehouseName = options.warehouseName
+			this.goodsName = options.goodsName
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
 			}).then(res => {
@@ -362,6 +363,10 @@
 				this.show = true
 				this.gridList = []
 				this.currentPage = 1
+				uni.showLoading({
+					title: '正在加载',
+					mask:true
+				})
 				this.getList()
 			},
 			getList() {
@@ -371,8 +376,8 @@
 				if (this.searchKeyWord.length > 0) {
 					url = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
 					data = {
-						compId: '',
-						authenticationStatusKey: 7,
+						warehouseId: that.cangid,
+						goodsName: that.goodsName,
 						searchKeyWord: this.searchKeyWord
 					}
 				} else {
@@ -386,6 +391,7 @@
 				}
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.data) {
+							uni.hideLoading()
 						let data = res.data.data.records ? res.data.data.records : res.data.data
 						//采购信息
 						if (data.length > 0) {

pages/erpbusiness/edit_quality_testing.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view ref="all-input">
 		<view @click='hidden' class='wrap'>
 			<view class='title_b'>基本信息</view>
 			<view class="c-row ">
@@ -65,14 +65,14 @@
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
+					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
 						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
-					<view v-if="flag == '1'">
+					<view v-if="flag == '1'||flag == '0'">
 						{{gridList.goodsName}}
 					</view>
 					<view @click='goodsName = true' v-if="flag == '2'">{{gridList.goodsName}}</view>
@@ -111,8 +111,6 @@
 					<view class='title_b'>化验信息</view>
 					<u-switch v-if='flag!=1' v-model="value" @change="change"></u-switch>
 				</view>
-				
-
 				<view class="c-row ">
 					<view class="title">等级</view>
 					<view class="con-list">
@@ -164,8 +162,10 @@
 				<view class="c-row ">
 					<view class="title">热损伤（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-							name="input"></input>
+						<!-- <input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+							name="input"></input> -->
+							<input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input>
+							<master-keyboard :fatherMethod="focusConfig" ref="keyboard1" keyboardtype="digit" :randomNumber="true" :newCar="false" :defaultValue="gridList.jiaorenli" @keyboardClick="handleClick1"></master-keyboard>
 					</view>
 				</view>
 			</view>
@@ -331,6 +331,13 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
+			focusConfig(type){
+				console.log('childclick',type)
+				// 0是上一项
+				if(type==0){
+					
+				}else{}
+			},
 			hidden(){
 				this.$refs.keyboard.open(false)
 			},
@@ -343,9 +350,21 @@
 					}
 				}
 			},
+			handleShowKeyboard1(){
+				if(this.flag==0){
+					if(this.$refs.keyboard1.open){
+						this.$refs.keyboard1.open(true)//true 键盘显示 false 键盘隐藏
+					}else{
+						this.$refs.keyboard1[0].open(true)
+					}
+				}
+			},
 			handleClick(e){
 				this.gridList.carNumber = e.value //键盘输入值
 			},
+			handleClick1(e){
+				this.gridList.jiaorenli = e.value //键盘输入值
+			},
 			change(e){
 				if(e){
 					this.gridList.supplementaryRecording=1

pages/erpbusiness/index.vue

@@ -14,7 +14,8 @@
 			<!-- 检斤员权限 -->
 			<!-- isShowAcquisitionInfo -->
 			<!-- 获取当前用户负责的仓库，如果无仓库隐藏收购信息 -->
-			<view class="content2" v-if="isShowAcquisitionInfo&&sgId">
+			<!-- &&sgId -->
+			<view class="content2" v-if="isShowAcquisitionInfo">
 				<view>收购信息</view>
 				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}>
 				</view>

pages/erpbusiness/sm/sm.vue

@@ -27,16 +27,40 @@
 						</view>
 					</view>
 				</view>
-
 				<view class="nolist" v-if="grainMerchantList.length==0">
 					<image class="img" :src="img2" alt=""></image>
 					<view class="text">您还未认证个人粮商身份</view>
 				</view>
-				<button v-if="grainMerchantList.length>0" :class="flag?'':'custom-style'" @click="submit">{{btnVal}}</button>
-				<button v-if="grainMerchantList.length==0" class="custom-style" @click="toGrainMerchantCertification()">接受并去认证</button>
+				<button v-if="grainMerchantList.length>0" :class="flag?'':'custom-style'"
+					@click="submit">{{btnVal}}</button>
+				<button v-if="grainMerchantList.length==0" class="custom-style"
+					@click="toGrainMerchantCertification()">接受并去认证</button>
 			</div>
 		</u-popup>
+		<u-toast ref="warning" />
+		<u-popup v-model="show1" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
+			<view class="buns_item">
+				<view class="but_css" @click="skip(1)" v-if="getRoles('acquisitionQuality.initial') && status == '已初检'">
+					去初检
+				</view>
+				<view class="but_css" @click="skip(2)"
+					v-if="getRoles('acquisitionQuality.again') && (status == '已初检'|| status == '已复检')">去复检</view>
+				<view class="but_css" @click="skip(3)"
+					v-if="getRoles('acquisitionWeight.mao') && weightStatus != '已称皮重' && (weightStatus == '已质检'|| weightStatus == '已称毛重')">
+					去称毛重</view>
+				<view class="but_css" @click="skip(4)"
+					v-if="getRoles('acquisitionWeight.weight') && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
+					去称皮重
+				</view>
+				<view class="but_css" @click="skip(5)"
+					v-if="getRoles('acquisitionQuality.con') && confirm != '1' && status == '已复检'">
+					去确认质检
+				</view>
+				<view class="but_css" @click="close">返回</view>
+			</view>
+		</u-popup>
 	</view>
+
 </template>
 
 <script>
@@ -46,9 +70,10 @@
 	export default {
 		data() {
 			return {
-				img1:require("../../../static/img/select.png"),
-				img2:require("../../../static/img/nolist.png"),
-				show: true,
+				img1: require("../../../static/img/select.png"),
+				img2: require("../../../static/img/nolist.png"),
+				show: false,
+				show1: true,
 				identityAuthenticationInfo: {},
 				grainMerchantList: [],
 				selectID: "",
@@ -57,32 +82,155 @@
 					title: '',
 					companyId: ''
 				},
-				isAllselect:false,
-				flag : true
+				isAllselect: false,
+				flag: true,
+				cangid: "", //仓库id
+				managementType: 1,
+				warehouseName: "", //仓库名
+				status: "", //质检状态
+				weightStatus: "", //检斤状态
+				qualityNo: "",
+				confirm: "", //确认初检确认状态
+				detailData: {},
+				userName: "", //仓库负责人
+				companyId: "",
+				decide: false
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
-			  //#ifdef APP-PLUS
-			  this.user.title = options.data.split(',')[2]
-			  this.user.companyId = options.data.split(',')[1]
-			  //#endif
+			//#ifdef APP-PLUS
+			this.user.title = options.data.split(',')[2]
+			this.user.companyId = options.data.split(',')[1]
+			this.compId = options.data.split(',')[1]
+			this.qualityNo = options.data.split(',')[2]
+			this.cangid = options.data.split(',')[3]
+			//#endif
 		},
 		onShow() {
-			this.getList()
+			// this.qualityNo = "SGRK202112140060004"
+			// this.cangid = "374a8a02ecfe40dc9abdcd902dd564f5"
+			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
+			console.log(this.qualityNo,this.cangid,this.compId)
+			if (this.cangid) { //判断是在哪扫码进入的
+				this.show = false
+				this.show1 = true
+				this.companyId = uni.getStorageSync('pcUserInfo').compId
+				this.userName = uni.getStorageSync('userInfo').userName.split("-")[1]
+				if (this.companyId == this.compId) {
+					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+						id: this.cangid
+					}).then(res => {
+						let cangList = res.data.data
+						let person = cangList.otherPersonCharge.split(",")
+						person.push(cangList.personCharge)
+						for (let i = 0; i < person.length; i++) {
+							if (person[i].indexOf(uni.getStorageSync('userInfo').userName.split("-")[1]) != -1) {
+								this.decide = true
+								this.getShow()
+								return
+							}
+						}
+						if (!this.decide) {
+							this.$refs.warning.show({
+								title: '当前身份不可操作',
+								type: "error",
+								icon: false
+							})
+						}
+					}).catch(res => {});
+				}
+			} else {//邀请客户
+				this.show = true
+				this.show1 = false
+				this.getList()
+			}
+			// this.getShow()
 		},
 		methods: {
+			//查看权限
+			getRoles: function(role) {
+				let _roles = uni.getStorageSync('rolesList')
+				for (let i = 0; i < _roles.length; i++) {
+					if (_roles[i] == role) {
+						return true
+					}
+				}
+				return false
+			},
+			getShow() {
+				let tmp = {
+					compId: this.compId,
+					number: this.qualityNo,
+					warehouseId: this.cangid
+				}
+				this.$api.doRequest('get', '/weighingManagement/getQRcode', tmp).then(res => {
+						this.detailData = res.data.data
+						this.status = this.detailData.qualityInspectionManagement.status
+						this.confirm = this.detailData.qualityInspectionManagement.confirm
+						this.weightStatus = this.detailData.status
+					})
+					.catch(res => {
+						if (res.message) {
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "请稍后再试!",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			},
+			//跳转
+			skip(val) {
+				if (val == 1) {
+					uni.navigateTo({
+						url: '/pages/erpbusiness/edit_quality_testing?id=' + this.detailData
+							.qualityInspectionManagement.id + '&managementType=' + this
+							.managementType + '&cangid=' + this.cangid + '&flag=' + '0'
+					})
+				} else if (val == 2) {
+					uni.navigateTo({
+						url: '/pages/erpbusiness/edit_quality_testing?id=' + this.detailData
+							.qualityInspectionManagement.id + '&managementType=' + this
+							.managementType + '&cangid=' + this.cangid + '&flag=' + '1'
+					})
+				} else if (val == 3) {
+					this.detailData.warehouseId = this.cangid
+					uni.navigateTo({
+						url: '/pages/erpbusiness/acquisitionInspection/grossWeightDetail?detailData=' +
+							JSON.stringify(this.detailData)
+					})
+				} else if (val == 4) {
+					this.detailData.warehouseId = this.cangid
+					uni.navigateTo({
+						url: '/pages/erpbusiness/acquisitionInspection/tareDetail??detailData=' + JSON
+							.stringify(this.detailData)
+					})
+				} else if (val == 5) {
+					uni.navigateTo({
+						url: '/pages/erpbusiness/edit_quality_testing?id=' + this.detailData
+							.qualityInspectionManagement.id + '&managementType=' + this
+							.managementType + '&cangid=' + this.cangid + '&flag=' + '2'
+					})
+				}
+			},
 			selectItem(item) {
-				if(item.authenticationStatus=="已接受") return
+				if (item.authenticationStatus == "已接受") return
 				for (let i = 0; i < this.grainMerchantList.length; i++) {
 					if (this.grainMerchantList[i].id == item.id) {
 						this.grainMerchantList[i].check = !this.grainMerchantList[i].check
 						if (this.grainMerchantList[i].check) {
 							this.selectID = this.grainMerchantList[i].id
 						}
-					} 
+					}
 				}
 			},
 			//查询粮商身份
@@ -90,14 +238,14 @@
 				//
 			},
 			//粮商认证
-			toGrainMerchantCertification(){
+			toGrainMerchantCertification() {
 				var that = this
 				// url: `/pageA/product/list?keywords=${key}&TabCur=${TabCur}`
 				uni.navigateTo({
-					url:`/pageD/identity/companyIdentity?status=1&compId=${that.user.companyId}&ids=${that.user.title}` ,
+					url: `/pageD/identity/companyIdentity?status=1&compId=${that.user.companyId}&ids=${that.user.title}`,
 				})
 			},
-			
+
 			getList() {
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.grainMerchantList = []
@@ -105,7 +253,7 @@
 						pageSize: 100,
 						currentPage: 1,
 						commonId: this.userInfo.id,
-						compId:this.user.companyId,
+						compId: this.user.companyId,
 						flag: 3
 					}, 'application/json;charset=UTF-8').then(res => {
 						for (var i = 0; i < res.data.data.records.length; i++) {
@@ -116,8 +264,7 @@
 						}
 						var data = res.data.data.records
 						for (var i = 0; i < data.length; i++) {
-							if(data[i].authenticationStatus == "未通过")
-							{
+							if (data[i].authenticationStatus == "未通过") {
 								continue
 							}
 							if (data[i].customerTypeFlag == 2) {
@@ -130,12 +277,12 @@
 								this.isAllselect = true
 							} else {
 								data[i].check = false
-								this.isAllselect = false								
+								this.isAllselect = false
 								this.flag = false
 							}
 							this.grainMerchantList.push(data[i])
 						}
-						if(this.flag){
+						if (this.flag) {
 							this.btnVal = "已接受"
 						}
 					})
@@ -156,7 +303,7 @@
 					});
 			},
 			submit() {
-				if(this.flag) return
+				if (this.flag) return
 				let _isAllCheck = false
 				for (let i = 0; i < this.grainMerchantList.length; i++) {
 					if (this.grainMerchantList[i].check) {
@@ -172,7 +319,7 @@
 				}
 				this.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
 						id: this.selectID,
-						compId:this.user.companyId,
+						compId: this.user.companyId,
 					}, 'application/json;charset=UTF-8').then(res => {
 						console.log(res);
 						if (res.data.code == 200) {
@@ -344,4 +491,18 @@
 			color: #8E93A3;
 		}
 	}
+
+	.but_css {
+		width: 200rpx;
+		height: 80rpx;
+		background-color: #22C572;
+		margin: 20rpx auto;
+		color: #FFFFFF;
+		line-height: 80rpx;
+		border-radius: 20rpx;
+		text-align: center;
+	}
+	.buns_item{
+		margin: 100rpx;
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -571,7 +571,12 @@
 		font-size: 28rpx;
 		padding: 10px;
 	}
-
+	.textCss {
+		display: flex;
+		justify-content: flex-end;
+		width: 100%;
+		text-align: right;
+	}
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;

pages/task/audit/tradeServices_audit.vue

@@ -0,0 +1,388 @@
+<template>
+	<view class="container">
+		<u-form ref="uForm">
+			<view class="form_item">
+				<view class="title">申请信息</view>
+				<!-- <u-divider ></u-divider> -->
+				<u-form-item label-width='260' label="业务编号" :borderBottom="false">
+					<u-input v-model="tradeList.billNo" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="名头" :borderBottom="false">
+					<u-input v-model="tradeList.renown" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="仓库名称" :borderBottom="false">
+					<u-input v-model="tradeList.warehouseName" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="仓位号" :borderBottom="false">
+					<u-input v-model="tradeList.warehouseNo" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="仓库地址" :borderBottom="false">
+					<u-input v-model="tradeList.warehouseAddress" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="货名" :borderBottom="false">
+					<u-input v-model="tradeList.goodsName" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="品级" :borderBottom="false">
+					<u-input v-model="tradeList.grade" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="现有储量（吨）" :borderBottom="false">
+					<u-input v-model="tradeList.nowWeight" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="可用储量（吨）" :borderBottom="false">
+					<u-input v-model="tradeList.useWeight" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="本单重量（吨)" :borderBottom="false">
+					<u-input v-model="tradeList.weight" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="单价（元/吨）" :borderBottom="false">
+					<u-input v-model="tradeList.unitPrice" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="总价值（元）" :borderBottom="false">
+					<u-input v-model="tradeList.totalValue" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="申请比例（%）" :borderBottom="false">
+					<u-input v-model="tradeList.applicationProportion" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="申请金额（元）" :borderBottom="false">
+					<u-input v-model="tradeList.interest" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+			</view>
+			<view class="form_item">
+				<view class="title">附件</view>
+				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="0"
+					:file-list="imgUrl" :size-type="['compressed']" @on-success="getImgUrl" :deletable="false"
+					:showProgress="false" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+					@on-progress="onProgress"></upload>
+			</view>
+			<view class="form_item">
+				<view class="title">外审部门</view>
+				<u-form-item label-width='260' label="银行" :borderBottom="false">
+					<u-input v-model="tradeList.bank" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+				<u-form-item label-width='260' label="第三方" :borderBottom="false">
+					<u-input v-model="tradeList.interest" input-align="right" placeholder="暂无" disabled />
+				</u-form-item>
+			</view>
+		</u-form>
+		<view class="form_item flex">
+			<view class="auditInfo flex" @click="auditInfo">
+				<view class="title1">审核记录</view>
+				<view class="img">
+					<image src="../../../static/img/myimg/gengduo1@3x.png"
+						style="width: 16rpx; height: 30rpx;top: 20rpx;margin-right: 0rpx;"></image>
+				</view>
+			</view>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='pass' type="success" class="btn2">通过</u-button>
+		</view>
+		<!-- <u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal> -->
+			<view v-if="show" class="shade">
+				<view class="wrap">
+					<view class="alert-top">
+						<view class="titleAudit">
+							{{title}}
+						</view>
+						<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+					</view>
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/100个字
+						</view>
+						<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+							maxlength="100" />
+					</view>
+					<view @click='close()' class="cancel">取消</view>
+					<view @click='passSubmit()' class="confirm">确定</view>
+				</view>
+			</view>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				id: "",
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				btnLoading: false, //防止重复点击
+				imgUrl: [],
+				tradeList: {},
+				isShowAlert:false,
+				show:false,
+				content:"",
+				title:"",
+				auditMind:"",//审核意见
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		onshow() {
+
+		},
+		methods: {
+			getList() {
+				var that = this
+				that.$api.doRequest('get', '/tradeWarehouseReceiptAppl/getTrageInfo', {
+					id: that.id
+				}).then(res => {
+					that.tradeList = res.data.data
+					//通过图片id找到地址
+					that.$api.doRequest('get', '/appendix/query/getFileList', {
+							appendixIds: that.tradeList.appendix
+						}).then(res => {
+							for (let i = 0; i < res.data.data.length; i++) {
+								that.imgUrl.push({
+									url: res.data.data[i].appendixPath
+								})
+							}
+						}).catch(res => {
+							if (res.errmsg) {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						});
+				})
+			},
+			reject(){
+				this.show = true
+				this.title = "驳回原因（驳回）"
+			},
+			pass(){
+				this.show = true
+				this.title = "审核意见（通过）"
+			},
+			close(){
+				this.show = false
+			},
+			passSubmit(){
+				if(this.title = "驳回原因（驳回）"){
+					if(!this.auditMind){
+						this.$api.msg('驳回意见不能为空')
+						return
+					}
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: this.tradeList.taskId,
+						approved: false,
+						auditMind: this.auditMind,
+						needReapply: true,
+					}).then(res => {
+						if(res.data.code == 200){
+							uni.showToast({
+								title: "审核成功",
+								icon: 'none',
+								duration: 2000
+							})
+							uni.navigateBack()
+						}
+					}).catch(res => {
+								if (res.errmsg) {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							});
+					// }
+				}else{
+					this.$api.doRequest('post', '/workflow/api/handle', {
+					taskId: this.tradeList.taskId,
+					approved: true,
+					auditMind: this.auditMind ? this.auditMind : "审核通过",
+					needReapply: false,
+				}).then(res => {
+					if(res.data.code == 200){
+						uni.showToast({
+							title: "审核成功",
+							icon: 'none',
+							duration: 2000
+						})
+						uni.navigateBack()
+					}
+				}).catch(res => {
+							if (res.errmsg) {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						});
+				}
+				
+			},
+			auditInfo(){
+				// uni.navigateTo({
+				// 	url: '/pages/task/procurement_close_details?id=' + item.businessId + "&isShowbtn=true"
+				// })
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif' &&
+					lists[index].fileType != 'jpeg') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 20rpx 12rpx 250rpx 12rpx;
+	}
+
+	.title {
+		font-size: 34rpx;
+		font-weight: 600;
+		margin-top: 20rpx;
+		line-height: 70rpx;
+		border-bottom: 2rpx solid #EEEEEE;
+	}
+
+	.form_item {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 20rpx 30rpx;
+		// width: 100%;
+	}
+
+	.u-form-item {
+		padding: 12rpx 0 !important;
+	}
+
+	.auditInfo {
+		width: 100%;
+
+		.title1 {
+			width: 99%;
+			font-size: 34rpx;
+			font-weight: 600;
+			// margin-top: 20rpx;
+			line-height: 70rpx;
+		}
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+	
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+	
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
+	}
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+	
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+	
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+	
+			.titleAudit {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+	
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
+	}
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+	
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
+	/deep/.u-list-item {
+		margin: 4rpx !important;
+	}
+</style>

pages/task/audit/tradeServices_audit_approval.vue

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

pages/task/my_task.vue

@@ -85,6 +85,7 @@
 				uni.switchTab({
 				    url: '/pages/user/user'
 				});
+				return true
 			}
 		},
 		watch: {
@@ -157,6 +158,12 @@
 						} else {
 							item.itemUrl = `/pages/task/audit/acquisition_information_details?id=` + item.businessId
 						}
+					}else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {//贸易服务
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/tradeServices_audit?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/tradeServices_audit_approval?id=` + item.businessId
+						}
 					}
 					if (item.taskType == "入库任务") {
 
@@ -363,9 +370,9 @@
 							} else {
 								_str.showRow = true;
 							}
-							if(_str.businessType=='TRADE'){
-								_str.showRow = false
-							}
+							// if(_str.businessType=='TRADE'){
+							// 	_str.showRow = false
+							// }
 							this.taskInfo[i].department = this.taskInfo[i].messageContent.split(' ')[0]
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
@@ -412,6 +419,10 @@
 								if (this.taskInfo[i].businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
 									this.taskInfo[i].messageTitle = '收购信息审核'
 								}
+							}else if (this.taskInfo[i].businessType == 'TRADE') {
+								if (this.taskInfo[i].businessCode == 'TRADE-WAREHOUSE-REPORT') {
+									this.taskInfo[i].messageTitle = '贸易服务审核'
+								}
 							}
 						}
 						if (res.data.data.records.length == 0) {
@@ -564,6 +575,16 @@
 							url: `/pages/task/audit/acquisition_information_details?id=` + item.businessId + "&isShowbtn=true"
 						})
 					}
+				}else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/tradeServices_audit?id=` + item.businessId 
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/task/audit/tradeServices_audit_approval?id=` + item.businessId
+						})
+					}
 				}
 				if (item.taskType == "入库任务") {
 

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -18,7 +18,7 @@
 						</view>
 						<view class="car-list">
 							<view v-for="(item2,index) in item1.carList" class="number">
-								{{item1.carNo}}
+								{{item2}}
 							</view>
 						</view>
 					</view>
@@ -124,10 +124,9 @@
 								}()
 								let _carNumberList=[]
 								for (var q = 0; q < _data.shippingInformationList.length; q++) {
-									console.log(_data.shippingInformationList[q])
+									console.log(_data.shippingInformationList[q].carNo.split(','))
 									_data.shippingInformationList[q].carList = _data.shippingInformationList[q].carNo.split(',')
 								}
-								
 								let __obj = {
 									warehouseName: _data.warehouseName,
 									id: _data.id,
@@ -145,6 +144,7 @@
 								this.mescroll.endBySize(curPageData.length, res.data.data
 									.total); //必传参数(当前页的数据个数, 总数据量)
 							}
+							console.log(curPageData)
 							this.dataList = this.dataList.concat(curPageData);
 						}
 					})

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -3,7 +3,7 @@
 		<view class="content1">
 			<view class="row1">
 				<view class="title">{{dataList.warehouseName}}</view>
-				<view class="validityDate"> {{dataList.validityDate}} 0时前有效期</view>
+				<view class="validityDate"> {{dataList.validityDate}} 0时前有效</view>
 			</view>
 			<view class="row2">
 				<view class="start-time">{{startDate}}创建</view>
@@ -18,15 +18,15 @@
 				<view class="left">货名</view>
 				<view class="flex" @click='showgoodsName'>
 					<view>{{goodsName}}</view>
-					<u-picker @confirm="goodsnameConfirm" range-key='goodsName' mode="selector"
-						v-model="goodsNameshow" :range="goodsnameList"></u-picker>
+					<u-picker @confirm="goodsnameConfirm" range-key='goodsName' mode="selector" v-model="goodsNameshow"
+						:range="goodsnameList"></u-picker>
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
 		</view>
 		<view class="content2">
 			<view v-if='!status'>
-				<view  class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
+				<view class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
 					<view class="row1 row">
 						<!-- -{{item.customerName}} -->
 						<view class="customerName">货主-{{index+1}}</view>
@@ -52,32 +52,37 @@
 							车牌号-{{index1+1}}
 						</view>
 						<view class="right">
-							<input v-model='item1.carNo' @click.stop="handleShowKeyboard(index,index1)":disabled="true" placeholder="输入7位车牌号" name="input"></input>
-							
+							<input class="car-uumber" v-model='item1.carNo'
+								@click.stop="handleShowKeyboard(index,index1)" :disabled="true" placeholder="输入7位车牌号"
+								name="input"></input>
+
 							<!-- <u-input v-model="item1.carNo" placeholder="输入7位车牌号" /> -->
 							<view class="btn">
 								<view @click="addCarNumber(item.carNumberList)" style="margin-right: 20rpx;">
 									<image class='row4-img'
-										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jia%402x.png"></image>
+										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jia%402x.png">
+									</image>
 								</view>
 								<view @click="delCarNumber(item.carNumberList,index1)">
 									<image class='row4-img'
-										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jian%402x.png"></image>
+										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jian%402x.png">
+									</image>
 								</view>
 							</view>
 						</view>
-				
+
 					</view>
-					
+
 				</view>
 			</view>
-			<view  v-if='!status' class='add-good-people' @click='addGoodPeople'>
+			<view v-if='!status' class='add-good-people' @click='addGoodPeople'>
 				<image class="img"
 					src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/ic_join_dialing_norm%402x.png"
 					@click="reduceBtn(index)"></image>增加货主
 			</view>
 		</view>
-		<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="carNo" @keyboardClick="handleClick"></master-keyboard>
+		<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="carNo"
+			@keyboardClick="handleClick"></master-keyboard>
 		<u-button class='submit' @click='submit'>提交</u-button>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
@@ -101,8 +106,8 @@
 			return {
 				isShowAlert: false,
 				isShowAlert1: false,
-				index:0,
-				index1:0,
+				index: 0,
+				index1: 0,
 				content: '当前登入信息验证失败，是否重新登录？',
 				content1: '确定提交送粮信息？',
 				// show: false,
@@ -111,11 +116,11 @@
 					name: '123'
 				}],
 				nameList: [],
-				carNo:'',
+				carNo: '',
 				warehouseNameAddress: '',
 				startDate: "",
-				goodsName:'',
-				status:false,
+				goodsName: '',
+				status: false,
 				dataList: {
 					warehouseName: "",
 					validityDate: '',
@@ -131,17 +136,17 @@
 						}]
 					}]
 				},
-				goodsnameList:[],
+				goodsnameList: [],
 				selectObj: {},
-				goodsNameshow:false,
+				goodsNameshow: false,
 				nameListCopy: []
 			}
 		},
 
 		onLoad(options) {
-			
+
 			let _pageToData = JSON.parse(options.itemValue)
-			this.warehouseId=_pageToData.warehouseId
+			this.warehouseId = _pageToData.warehouseId
 			this.dataList.warehouseName = _pageToData.warehouseName
 			this.startDate = this.getTime()[0]
 			this.dataList.validityDate = this.getTime()[1]
@@ -163,51 +168,51 @@
 				warehouseId: this.warehouseId
 			}).then(res => {
 				if (res.data.code == 200) {
-					this.goodsName=res.data.data[0].goodsName
+					this.goodsName = res.data.data[0]?res.data.data[0].goodsName:''
 					this.goodsnameList = res.data.data
 				}
 			})
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
-			goodsnameConfirm(e){
-				this.goodsName=this.goodsnameList[e[0]].goodsName
+			goodsnameConfirm(e) {
+				this.goodsName = this.goodsnameList[e[0]].goodsName
 				this.getCustomer()
 			},
-			showgoodsName(){
-				this.goodsNameshow=true
+			showgoodsName() {
+				this.goodsNameshow = true
 			},
-			hidden(){
-				this.carNo=''
-				if(this.$refs.keyboard.open){
-					this.$refs.keyboard.open(false)//true 键盘显示 false 键盘隐藏
-				}else{
+			hidden() {
+				this.carNo = ''
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
+				} else {
 					this.$refs.keyboard[0].open(false)
 				}
 			},
-			handleShowKeyboard(index,index1){
-				if(this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo==''){
-					this.carNo=''
-					
-				}else{
-					this.carNo=this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo
+			handleShowKeyboard(index, index1) {
+				if (this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo == '') {
+					this.carNo = ''
+
+				} else {
+					this.carNo = this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo
 				}
-				if(this.$refs.keyboard.open){
-						this.$refs.keyboard.open(false)//true 键盘显示 false 键盘隐藏
-					}else{
-						this.$refs.keyboard[0].open(false)
-					}
-				this.index=index
-				this.index1=index1
-				if(this.$refs.keyboard.open){
-					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
-				}else{
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
+				} else {
+					this.$refs.keyboard[0].open(false)
+				}
+				this.index = index
+				this.index1 = index1
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(true) //true 键盘显示 false 键盘隐藏
+				} else {
 					this.$refs.keyboard[0].open(true)
 				}
-				
+
 			},
-			handleClick(e){
-				this.carNo=e.value
+			handleClick(e) {
+				this.carNo = e.value
 				this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo = e.value //键盘输入值
 			},
 			showCustomerName(value, index) {
@@ -216,25 +221,26 @@
 				value.showCustomerName = true
 			},
 			getCustomer() {
-				var that=this
+				var that = this
 				let _data = {
 					commonId: uni.getStorageSync("userInfo").id,
-					warehouseId:this.warehouseId,
-					goodsName:this.goodsName
+					warehouseId: this.warehouseId,
+					goodsName: this.goodsName
 				}
 				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoUser', _data).then(
 					res => {
 						if (res.data.code == 200) {
 							this.nameList = res.data.data
-							if(res.data.data.length>0){
-							that.status=false
+							if (res.data.data.length > 0) {
+								that.status = false
 								this.dataList.shippingInformationList[0].identityId = res.data.data[0].id
 								this.dataList.shippingInformationList[0].shipperName = res.data.data[0].customerName
-								this.dataList.shippingInformationList[0].supplier = res.data.data[0].supplier ? res.data
+								this.dataList.shippingInformationList[0].supplier = res.data.data[0].supplier ? res
+									.data
 									.data[0].supplier : '无'
-							}else{
-								that.status=true
-								this.$api.msg('当前客户的'+this.goodsName+'送粮量达到上限')
+							} else {
+								that.status = true
+								this.$api.msg('当前客户的' + this.goodsName + '送粮量达到上限')
 							}
 						}
 					})
@@ -242,7 +248,7 @@
 			getTime() {
 				let _startTime = new Date().format("yyyy-MM-dd");
 				var _endTime = new Date();
-				_endTime.setDate(_endTime.getDate() + 2);
+				_endTime.setDate(_endTime.getDate() + 3);
 				_endTime = _endTime.format("yyyy-MM-dd");
 				return [_startTime, _endTime]
 			},
@@ -339,8 +345,8 @@
 				this.isShowAlert1 = false
 			},
 			addGoodPeople() {
-				if(this.status==true){
-					this.$api.msg('当前客户的'+this.goodsName+'送粮量达到上限')
+				if (this.status == true) {
+					this.$api.msg('当前客户的' + this.goodsName + '送粮量达到上限')
 					return
 				}
 				// 判断是否还有剩余的货主
@@ -437,25 +443,33 @@
 			.start-time {
 				font-size: 24rpx;
 				color: #878C9C;
-				margin: 6rpx 0;
+				margin: 10rpx 0;
 			}
 		}
+
+		.row3 {
+			margin-bottom: 10rpx;
+		}
 	}
 
 	.content2 {
 		.row {
-			margin: 20rpx 0;
+			padding: 28rpx 0;
+			border-bottom: 1px solid #EEEEEE;
 		}
 
 		.row1 {
 			display: flex;
 			justify-content: space-between;
+			padding-top: 0rpx;
 
 			image {
 				width: 32rpx;
 				height: 32rpx;
 			}
 
+			border: none;
+
 			.customerName {
 				font-size: 28rpx;
 				font-weight: 700;
@@ -473,6 +487,11 @@
 				display: flex;
 			}
 		}
+
+		.row4:last-child {
+			padding-bottom: 0;
+			border: none;
+		}
 	}
 
 	.row4 {
@@ -528,4 +547,8 @@
 	.content {
 		padding-bottom: 200rpx;
 	}
+
+	.car-uumber {
+		font-size: 28rpx;
+	}
 </style>

pages/user/user.vue

@@ -445,7 +445,6 @@
 						}
 					});
 				}
-
 			},
 			fankui() {
 				uni.navigateTo({