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

components/MyNumberInput.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="uni-input Numberinput" :class="{'inputdis':Isedit}" @click="maskShow" :id="'input_'+myevent">
-			<text>{{myvalue}}</text><text class="myfous" v-if="IsShow"></text>
+			<text class="myfous" v-if="IsShow"></text><text>{{myvalue}}</text>
 			
 		</view>
 
@@ -118,7 +118,7 @@
 	.Numberinput {
 		display: flex;
 		align-items: center;
-		/* flex-direction: row-reverse; */
+		flex-direction: row-reverse;
 	}
 
 	.myfous {

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
@@ -16,7 +16,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages.json

@@ -535,6 +535,12 @@
 				"navigationBarTitleText": "选择客户"
 			}
 		},
+		{
+			"path": "pages/erpbusiness/customercar",
+			"style": {
+				"navigationBarTitleText": "选择车牌号"
+			}
+		},
 		{
 			"path": "pages/attestation/indexTwo",
 			"style": {
@@ -1354,30 +1360,19 @@
 				"navigationBarTitleText": "库点收购",
 				"enablePullDownRefresh": true,
 				"app-plus": {
-					"softinputNavBar": "none",
-					"scrollIndicator": "none",
-					"softinputMode": "adjustPan",
 					"titleNView": {
-						"autoBackButton": false,
-						"backgroundColor": "#fff",
 						"buttons": [{
-								"fontSrc": "/pageC/static/car/iconfont.ttf",
-								"float": "right",
-								"text": "\ue639",
-								"fontSize": "18px"
-							},
-							{
-								"fontSrc": "pageC/static/iconfont/iconfont.ttf",
-								"float": "left",
-								"text": "\ue6f2",
-								"fontSize": "20px"
-							}
-						]
+							"float": "right",
+							"text": "记录",
+							// "color": "#18b566",
+							"fontSize": "15"
+						}]
 					}
 				}
 			}
 
-		}, {
+		},
+		{
 			"path": "pages/user/depotAcquisition/grainDeliveryRegistration",
 			"style": {
 				"navigationBarTitleText": "送粮登记",
@@ -1391,13 +1386,31 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		}, 
+		{
+			"path": "pages/user/depotAcquisition/grainDeliveryRegistration1",
+			"style": {
+				"navigationBarTitleText": "贸易粮叫号",
+				"enablePullDownRefresh": false
+				
+			}
+		
+		},
+		{
 			"path": "pages/user/depotAcquisition/grainDeliveryRecord",
 			"style": {
 				"navigationBarTitleText": "送粮记录",
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/user/depotAcquisition/grainDeliveryRecord1",
+			"style": {
+				"navigationBarTitleText": "叫号记录",
+				"enablePullDownRefresh": false
+			}
+		
 		},
 		{
 			"path": "pages/user/depotAcquisition/selectCity",

pages/erp/exWarehousing/exWarehousing.vue

@@ -727,7 +727,8 @@
 				}
 			},
 			getImgUrl(res) {
-				this.detailData.addressUrl = res
+				console.log(res)
+				this.detailData.addressUrl = res.data.appendixPath
 			},
 			onError(error) {
 				console.log('------------error-----------')

pages/erpbusiness/acquisitionInformation.vue

@@ -333,7 +333,7 @@
 	}
 
 	.submit {
-		/* width: 90%; */
+		width: 90%;
 		background: #22C572;
 		border-radius: 50rpx;
 	}
@@ -349,7 +349,9 @@
 
 	.bottom-btn {
 		position: fixed;
-		bottom: 30rpx;
-		width: 90%;
+		bottom: 0rpx;
+		left:0;
+		width: 100%;
+		padding:20rpx;
 	}
 </style>

pages/erpbusiness/add_quality_testing.vue

@@ -23,18 +23,31 @@
 			<view class="c-row ">
 				<view class="title">任务编号</view>
 				<view class="con-list">
-					<view @click='show4=true'>{{gridList.inOutTaskNo1?gridList.inOutTaskNo1:'请选择任务编号'}}</view>
+					<view @click='show4=true'>{{gridList.inOutTaskNo?gridList.inOutTaskNo:'请选择任务编号'}}</view>
 					<u-picker :range="taskNolist" range-key="inOutTaskNo1" @confirm='tasknopicker($event)'
 						v-model="show4" mode="selector">
 					</u-picker>
 				</view>
 			</view>
+			<view  style=' align-items: flex-start;' class="c-row ">
+				<view class="title">任务提示</view>
+				<view class="con-list">
+					{{gridList.taskFlag?gridList.taskFlag:'自动获取，不可编辑'}}
+				</view>
+			</view>
 			<view v-show='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
 				</view>
 			</view>
+			<view  style=' align-items: flex-start;' class="c-row ">
+				<view class="title">合同提示</view>
+				<view class="con-list">
+					{{gridList.pointOut?gridList.pointOut:'自动获取，不可编辑'}}
+				</view>
+			</view>
+			
 			<view v-show='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
 				<view class="title">移库编号</view>
 				<view class="con-list">
@@ -48,7 +61,7 @@
 				</view>
 			</view> -->
 			<view v-show='typevalue==1' style=' align-items: flex-start;' class="c-row ">
-				<view class="title">提示</view>
+				<view class="title"></view>
 				<view class="con-list">
 					{{gridList.tips?gridList.tips:'自动获取，不可编辑'}}
 				</view>
@@ -157,20 +170,20 @@
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list"
-					v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
+					v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"&&deliverType!=1'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
 				<view class="con-list"
-					v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
+					v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"&&deliverType==1||gridList.tranTaskFlag=="1"&&deliverType==1'>
 					<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 					<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 						v-model="show9" mode="selector">
 					</u-picker>
-
 				</view>
+				<button v-show="deliverType!=1" class='cu-btn bg-green shadow' @click="carchange">选择</button>
 			</view>
 			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓位号</view>
@@ -491,6 +504,84 @@
 							placeholder="请输入干粮单价" name="input" type="digit"></input>
 					</view>
 				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">规格（公斤）</view>
+					<view class="con-list">
+						<u-radio-group active-color='#22C572' v-model="gridList.specifications" @change="radioGroupChange">
+							<u-radio class='radio' name="850">850</u-radio>
+							<u-radio name="830">830</u-radio>
+						</u-radio-group>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">工厂</view>
+					<view class="con-list">
+						<input v-model='gridList.factory' :disabled='disabled1'  maxlength="30"
+							placeholder="请输入工厂" name="input" type="text"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">生产日期</view>
+					<view class="con-list">
+						<u-calendar v-model="show3" @change="change1" :mode="mode"></u-calendar>
+						<view :style='gridList.produceDate?"color:#000;":"color:#999;"' @click="show3 = true">{{gridList.produceDate?gridList.produceDate:'选择生产日期'}}</view>
+						<!-- <input v-model='gridList.factory' :disabled='disabled1'  maxlength="30"
+							placeholder="请输入工厂" name="input" type="digit"></input> -->
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">污染件数</view>
+					<view class="con-list">
+						<input v-model='gridList.polluteNum' :disabled='disabled1'
+							placeholder="请输入污染件数" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"  style='padding:20rpx 30rpx;'>
+					<view class="title">污染附件</view>
+					<view class="con-list">
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :action="action" :show-progress='false' :show-tips="false" :max-size="maxSize" :max-count="9"
+							:size-type="['compressed']" @on-success="getImgUrl($event,0)" @on-error="onError"
+							@on-remove="onRemove($event,0)" @on-uploaded="isAdd = true"
+							:limitType="['png', 'jpg', 'jpeg', 'webp', 'gif']" @on-progress="onProgress">
+							<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover"
+								hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../static/img/liangmai/xiangji-2.png"
+									mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">破损件数</view>
+					<view class="con-list">
+						<input v-model='gridList.wornNum' :disabled='disabled1'
+							placeholder="请输入破损件数" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" style='padding:20rpx 30rpx;'>
+					<view class="title">破损附件</view>
+					<view class="con-list">
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :action="action" :show-progress='false' :show-tips="false" :max-size="maxSize" :max-count="9"
+							:size-type="['compressed']" @on-success="getImgUrl($event,1)" @on-error="onError"
+							@on-remove="onRemove($event,1)" @on-uploaded="isAdd = true"
+							:limitType="['png', 'jpg', 'jpeg', 'webp', 'gif']" @on-progress="onProgress">
+							<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover"
+								hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../static/img/liangmai/xiangji-2.png"
+									mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -536,6 +627,7 @@
 			return {
 				isQY: false,
 				isZJ: false,
+				deliverType:'',
 				redstatus: false,
 				isShowPrint: false,
 				isShowAlert: false,
@@ -550,6 +642,9 @@
 				Data: {
 					ktv: '111111'
 				},
+				action: this.$uploadUrl,
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				maxSize: 50 * 1024 * 1024,
 				Isedit: false,
 				MykeywordShow: false,
 				InputEvent: '',
@@ -599,6 +694,7 @@
 				show3: false,
 				show2: false,
 				goodsList: [],
+				mode: 'date',
 				currentPage: 1,
 				value: false,
 				gridBorder: false,
@@ -635,6 +731,7 @@
 					buckleWeightRatio: 0,
 					buckleMiscellaneous: 0,
 					paramType: 1,
+					specifications:830,
 					warehouseInOutDetail: {
 						grade: '',
 						reGrade: '',
@@ -754,6 +851,7 @@
 				managementType: '',
 				flag: 2,
 				warehouseName: '',
+				compName:'',
 				warehouseList: [],
 				warehouseCount: '',
 				commonWarehouseNo: '',
@@ -813,7 +911,9 @@
 					value: '正常'
 				}, {
 					value: '异常'
-				}]
+				}],
+				imglist:[],
+				imglist1:[],
 			}
 		},
 		// #ifndef MP
@@ -848,7 +948,7 @@
 		},
 		onLoad(options) {
 			that = this
-			console.log(that)
+			var date = new Date()
 			console.log(this.cangid)
 			this.commonWarehouseNo = options.commonWarehouseNo
 			this.warehouseCount = Number(options.warehouseCount) + 1
@@ -870,6 +970,7 @@
 			this.gridList.person = options.personCharge
 			this.gridList.personPhone = options.personPhone
 			this.gridList.qualityInspector = uni.getStorageSync("userInfo").userName
+			this.gridList.produceDate = date.getFullYear()+'-'+((date.getMonth()+1)>=10?(date.getMonth()+1):'0'+(date.getMonth()+1))+'-'+((date.getDate())>=10?date.getDate():'0'+date.getDate())
 			// this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 			// 	warehouseId: this.cangid
 			// }).then(res => {
@@ -923,16 +1024,26 @@
 			this.gridListInit = this.gridList
 		},
 		async onShow() {
+			var that = this
+			if(uni.getStorageSync('compName1')){
+				that.compName = uni.getStorageSync('compName1').company
+				if(that.compName=='辽宁佳屹农商贸有限公司'){
+					this.typevalue = '1'
+					this.contractFlag = 7
+				}
+			}
 			this.isQY = this.utils.getCurrectRoles('acquisitionQuality.qview')
 			this.isZJ = this.utils.getCurrectRoles('acquisitionQuality.initial')
-
-			if (this.isZJ && !this.isQY) {
-				this.typevalue = '1'
-				this.contractFlag = 7
-			} else {
-				this.typevalue = '3'
-				this.contractFlag = 10
+			if(!uni.getStorageSync('gridList')&&that.compName!='辽宁佳屹农商贸有限公司'){
+				if (this.isZJ && !this.isQY) {
+					this.typevalue = '1'
+					this.contractFlag = 7
+				} else {
+					this.typevalue = '3'
+					this.contractFlag = 10
+				}
 			}
+			
 			uni.showLoading({
 				title: '加载中',
 				mask: true
@@ -947,13 +1058,11 @@
 				flag: this.flag,
 				warehouseName: this.gridList.warehouseName
 			}).then(res => {
-				console.log(1)
-				console.log(res)
 				for (let i = 0; i < res.data.data.length; i++) {
 					this.$set(res.data.data[i], 'inOutTaskNo1', res.data.data[i].inOutTaskNo + (res.data.data[
 						i].taskFlag ? '（' + res.data.data[i].taskFlag + '）' : ''))
 				}
-				console.log(res.data.data, 22222)
+				// console.log(res.data.data, 22222)
 				this.taskNolist = res.data.data
 			})
 			this.multiSelector1 = [{
@@ -964,7 +1073,7 @@
 				warehouseName: this.gridList.warehouseName
 			}).then(res => {
 				uni.hideLoading();
-				console.log(2)
+				// console.log(2)
 				// console.log(res)
 				if (res.data.data.contractManagementInfoList) {
 					for (let i = 0; i < res.data.data.contractManagementInfoList.length; i++) {
@@ -981,7 +1090,7 @@
 				}
 				// this.taskNolist=res.data.data
 			})
-			if (uni.getStorageSync('checkcustomer')) {
+			if (uni.getStorageSync('checkcustomer')&&this.typevalue==3) {
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id
@@ -1030,8 +1139,71 @@
 					})
 				}
 			}
+			if(uni.getStorageSync('gridList')&&this.typevalue==1){
+				
+				if(uni.getStorageSync('typevalue')){
+					this.typevalue=uni.getStorageSync('typevalue')
+				}
+				this.gridList=uni.getStorageSync('gridList')
+				if(uni.getStorageSync('carNo')){
+					this.gridList.carNumber=uni.getStorageSync('carNo')
+					this.gridList.shipId=uni.getStorageSync('checkcustomer').shipId
+				}
+			}
 		},
 		methods: {
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			radioGroupChange(e){
+				console.log(e)
+				this.gridList.specifications=e
+			},
+			change1(e) {
+				this.gridList.produceDate=e.result
+				console.log(e);
+			},
+			onRemove(index,i) {
+				console.log(index,i)
+				if(i==0){
+					this.imglist.splice(index, 1)
+					this.gridList.polluteUrl=this.imglist.toString()
+				}else{
+					this.imglist1.splice(index, 1)
+					this.gridList.wornUrl=this.imglist1.toString()
+				}
+				console.log(this.imglist,this.imglist1)
+			},
+			carchange(){
+				uni.setStorageSync('typevalue', this.typevalue)
+				uni.setStorageSync('gridList', this.gridList)
+				uni.navigateTo({
+					url: '/pages/erpbusiness/customercar?cangid=' + this.cangid + '&warehouseName=' + this.gridList
+						.warehouseName + '&goodsName=' + this.gridList.goodsName
+				})
+			},
+			getImgUrl(res,status) {
+				var that = this
+				this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
+					newAppendixs: [res.data],
+					oldAppendixIds: ""
+				}).then(res1 => {
+					if(status==0){
+						that.imglist.push(res1.data.data[0])
+						that.gridList.polluteUrl=that.imglist.toString()
+					}else{
+						that.imglist1.push(res1.data.data[0])
+						that.gridList.wornUrl=that.imglist1.toString()
+					}
+					
+					console.log(res)
+				})
+			},
 			colorLustreClick(e) {
 				this.gridList.colorLustre = this.colorLustreList[e[0]].value
 			},
@@ -1317,6 +1489,7 @@
 				console.log("切换任务编号", e)
 				this.gridList.inOutTaskNo = this.taskNolist[e[0]].inOutTaskNo
 				this.gridList.inOutTaskNo1 = this.taskNolist[e[0]].inOutTaskNo1
+				this.gridList.taskFlag = this.taskNolist[e[0]].taskFlag
 				var data = this.taskNolist[e[0]]
 				this.gridList.donecount = data.completedQuantity + '/' + data.weight
 				if (this.taskNolist[e[0]].inOutType == '收购入库') {
@@ -1347,6 +1520,7 @@
 					compId: uni.getStorageSync('pcUserInfo').compId
 				}).then(res => {
 					this.contractNolist = res.data.data
+					this.gridList.pointOut =this.contractNolist.pointOut
 					if (this.typevalue == 3) {
 						var gooddata = this.goodsList.filter((item) => {
 							return item.goodsName == this.contractNolist.goodsName
@@ -1420,6 +1594,7 @@
 							}
 						}
 					}
+					this.deliverType=this.contractNolist.deliverType
 					this.gridList.goodsNameKey = this.contractNolist.goodsNameKey
 					this.gridList.grade = this.gradeList[1].value
 					this.gridList.gradeKey = this.gradeList[1].key
@@ -1719,6 +1894,8 @@
 									this.gridList.compId = uni.getStorageSync(
 										'pcUserInfo').compId
 									uni.setStorageSync("quality_print", this.gridList)
+									uni.setStorageSync('typevalue', 3)
+									uni.setStorageSync('gridList', {})
 									if (this.isZJ) {
 										this.isShowPrint = true
 									} else {
@@ -1762,6 +1939,8 @@
 									uni.setStorageSync(
 										'checkcustomer', {}
 									)
+									uni.setStorageSync('typevalue', 3)
+									uni.setStorageSync('gridList', {})
 									console.log('that.gridList', this.gridList)
 									// uni.navigateBack({})
 								} else if(res.data.message == '货物种类与类型不符，请确认！'){
@@ -2304,4 +2483,20 @@
 	/deep/.u-radio-group {
 		flex-direction: row-reverse;
 	}
+	/deep/.u-upload .u-list-item {
+		background: #fff;
+		border: 1px dashed #ccc;
+		border-radius: 10rpx;
+		height: 190rpx !important;
+		width: 190rpx !important;
+		margin: 10rpx;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
+	/deep/.radio .u-radio__label{
+		margin-right:0;
+	}
 </style>

pages/erpbusiness/customer.vue

@@ -34,11 +34,13 @@
 			<view class="dj-customer" v-for="(item,index) in registeredCustomer"
 				@click="registeredCustomerClick(item,item1)">
 				<view class="left">{{item.carNo}}</view>
-				<view class="right">
-					<view class="span1">{{item.shipperName}}（货）</view>
+				<view v-if='item.callFlag==1' class="right">
+					<view class="span1">{{item.shipperName}}（自产）</view>
 					<view class="">{{item.supplier}}（商）</view>
 				</view>
-
+				<view v-if='item.callFlag==2' class="right">
+					<view class="span1">{{item.shipperName}}（贸易）</view>
+				</view>
 			</view>
 			<!-- </view> -->
 		</view>

pages/erpbusiness/customercar.vue

@@ -0,0 +1,1062 @@
+<template>
+	<view>
+		<view class="header">
+			<view style='background:#fff;display:flex;' class="cu-bar search">
+				<view style='flex:6;' class="search-form round Medium">
+					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
+					<input @input='searchinput' type="text" maxlength="20" :focus="true" v-model="searchKeyWord"
+						@confirm="doSearch(1)" placeholder=" 输入客户姓名、客户手机号或供应商姓名" confirm-type="search"></input>
+				</view>
+				<view @click='doSearch(1)' class="Regular" style="width:4%;flex:1;">搜索</view>
+				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34"
+					name="close-circle-fill" color="#D6D9E0"></u-icon>
+				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
+			</view>
+		</view>
+		 <view class="content">
+			<!-- <view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view> -->
+			<view v-for='item in gridList'>
+				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
+					<view v-if="item.supplier"> {{item.customerName}}({{item.bankCard}})-{{item.supplier}} </view>
+					<view v-else> {{item.customerName}}({{item.bankCard}}) </view>
+				</view>
+			</view>
+			<!-- <view v-for='item in recentCustomers' style='display:inline-block;'>
+				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>
+					{{item.customerName}}({{item.bankCard}})
+				</view>
+			</view> -->
+		</view> 
+		<view class="content content1">
+			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' >登记客户</view>
+
+			<!-- <view v-for='item in registeredCustomer'> -->
+			<view class="dj-customer" v-for="(item,index) in registeredCustomer"
+				@click="registeredCustomerClick(item,item.carNo)">
+				<view class="left">{{item.carNo}}</view>
+				<view v-if='item.callFlag==1' class="right">
+					<view class="span1">{{item.shipperName}}（自产）</view>
+					<view class="">{{item.supplier}}（商）</view>
+				</view>
+				<view v-if='item.callFlag==2' class="right">
+					<view class="span1">{{item.shipperName}}（贸易）</view>
+				</view>
+
+			</view>
+			<!-- </view> -->
+		</view>
+
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+	</view>
+</template>
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				params: {},
+				selector: [],
+				isContent: false,
+				loadStatus: 'noMore',
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				searchKeyWord: '',
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				show: false,
+				pageSize: 10,
+				currentPage: 1,
+				gridBorder: false,
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
+				username: "请更改昵称",
+				gridList: [],
+				managementType: '',
+				warehouseName: '',
+				showTran: true,
+				companyId: 1,
+				current: 4,
+				customerList: [],
+				purchasePriceList: [],
+				warehouseCount: '',
+				commonWarehouseNo: '',
+				cangid: '',
+				recentCustomers: [],
+				registeredCustomer: []
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+			// 手机号中间4位加*
+			starUserphone() {
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if (this.userphone) {
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options) {
+			this.cangid = options.cangid
+			this.warehouseName = options.warehouseName
+			this.goodsName = options.goodsName
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.cangid
+			}).then(res => {
+				if (res.data.data) {
+					uni.setStorageSync('purchasePriceList', res.data.data)
+					this.purchasePriceList = uni.getStorageSync('purchasePriceList')
+				}
+			})
+		},
+		onShow() {
+			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
+			let _data = uni.getStorageSync('recentCustomers')
+			if (_data) {
+				this.recentCustomers = _data
+				for (let i = 0; i < _data.length; i++) {
+					if (_data[i].shipperName) {
+						this.recentCustomers[i].customerName = _data[i].shipperName
+						this.recentCustomers[i].customerPhone = _data[i].shipperPhone
+					}
+				}
+
+			} else {
+				this.recentCustomers = []
+			}
+
+			this.$api.doRequest('get', '/shippingInformation/selectShippingInformation', {
+				warehouseName: this.warehouseName,
+				compId: uni.getStorageSync('pcUserInfo').compId,
+			}).then(res => {
+				if (res.data.data) {
+					let _endTime = Date.parse(new Date());
+					let _startTime = ""
+					for (let i = 0; i < res.data.data.length; i++) {
+						_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+						if (_endTime - _startTime <= 0) {
+							this.registeredCustomer.push(res.data.data[i])
+						}
+						// let _carList = res.data.data[i].shippingInformationList
+						// for (let k = 0; k < _carList.length; k++) {
+						// 	//判断是记录是否失效
+						// 	_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+						// 	if (_endTime - _startTime <= 0) {
+						// 		let _ecarList = _carList[k].carNo.split(',')
+						// 			_carList[k].carList = _ecarList
+						// 			this.registeredCustomer.push(_carList[k])
+						// 	}
+						// }
+					}
+					console.log(this.registeredCustomer)
+				}
+			})
+			// this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo', {
+			// 	pageSize: this.pageSize,
+			// 	currentPage: this.currentPage,
+			// 	functionType: "3",
+			// 	commonId: this.userInfo.id
+			// }).then(res => {
+			// 	if (res.data.data) {
+			// 		this.gridList = res.data.data.records
+			// 		console.log(this.gridList)
+			// 	}
+			// })
+			// this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+			// 	compId: uni.getStorageSync('pcUserInfo').compId,
+			// 	authenticationStatusKey: 7,
+			// 	searchKeyWord:''
+			// }).then(res => {
+			// 	if (res.data.data) {
+			// 		this.customerList = res.data.data
+			// 	}
+			// })
+		},
+		methods: {
+			searchinput(e) {
+				if (this.searchKeyWord.length == 0) {
+					this.show = false
+					this.isContent=false
+					this.getList()
+				}
+
+			},
+			registeredCustomerClick(item, item1) {
+				uni.setStorageSync('isClick', true)
+				uni.setStorageSync('carNo', item1)
+				uni.setStorageSync('checkcustomer', item)
+				if (this.recentCustomers.length == 0) {
+					this.recentCustomers.push(item)
+					uni.setStorageSync('recentCustomers', this.recentCustomers)
+				} else {
+					let _copyList = this.$u.deepClone(this.recentCustomers)
+					for (let i = 0; i < this.recentCustomers.length; i++) {
+						if (this.recentCustomers[i].customerPhone != item.shipperPhone) {
+							_copyList.push(item)
+							uni.setStorageSync('recentCustomers', _copyList)
+						}
+					}
+				}
+
+				uni.navigateBack()
+			},
+			checkcustomer(item) {
+				uni.setStorageSync('isClick', true)
+				var that = this
+				var count = ''
+				if (item.authenticationStatus == '已认证') {
+					// uni.showLoading({
+					// 	title: '加载中'
+					// })
+
+					uni.setStorageSync('checkcustomer', item)
+					if (this.recentCustomers.length == 0) {
+						this.recentCustomers.push(item)
+						uni.setStorageSync('recentCustomers', this.recentCustomers)
+					} else {
+						let _isDel = false
+						for (let i = 0; i < this.recentCustomers.length; i++) {
+							if (this.recentCustomers[i].customerPhone == item.customerPhone) {
+								_isDel = true
+							}
+						}
+						if (!_isDel) {
+							let _data = uni.getStorageSync('recentCustomers')
+							_data.push(item)
+							uni.setStorageSync('recentCustomers', _data)
+						}
+					}
+					// uni.hideLoading()
+					uni.navigateBack()
+					// that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+					// 		commonId: that.userInfo.id,
+					// 		searchContent: item.customerName + '(' + item.customerPhone + ')',
+					// 		functionType: 3
+					// 	}).then(res => {
+
+					// 		uni.setStorageSync('checkcustomer', item)
+					// 		that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+					// 			compId: '',
+					// 			customerName: item.customerName,
+					// 			goodsName: uni.getStorageSync('goodsName'),
+					// 		}).then(res => {
+					// 			if (res.data.code == 200) {
+					// 				count = res.data.data
+					// 				that.$api.doRequest('get', '/paymentManagement/cumulant', {
+					// 					compId: '',
+					// 					customerName: item.customerName,
+					// 					goodsName: uni.getStorageSync('goodsName'),
+					// 				}).then(res => {
+					// 					for (let i = 0; i < that.purchasePriceList.length; i++) {
+					// 						var data = res.data.data / 1000
+					// 						if (that.purchasePriceList[i].goodsName == uni
+					// 							.getStorageSync('goodsName')) {
+					// 							if (that.purchasePriceList[i].saleLimit - data < 50 ||
+					// 								count > 0) {
+					// 								that.$api.msg(
+					// 									`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`
+					// 									)
+					// 							}
+					// 						}
+					// 					}
+					// 					that.show = false
+					// 					uni.hideLoading()
+					// 					uni.navigateBack()
+					// 				})
+					// 			}
+					// 		})
+					// 	})
+					// 	.catch(res => {
+					// 		uni.showToast({
+					// 			title: '系统异常，请联系管理员',
+					// 			icon: 'none',
+					// 			duration: 2000
+					// 		})
+					// 		uni.hideLoading()
+					// 	})
+				} else {
+					this.$api.msg('客户身份不可用')
+				}
+
+			},
+			recentcustomer(item) {
+				uni.setStorageSync('isClick', true)
+				uni.setStorageSync('checkcustomer', item)
+				uni.navigateBack()
+				// var count = ''
+				// var that = this
+				// var name = item.searchContent.split('(')[0]
+				// var phone = item.searchContent.split('(')[1]
+				// phone = phone.substring(0, phone.length - 1)
+				// for (var i = 0; i < this.customerList.length; i++) {
+				// 	// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
+				// 	if (this.customerList[i].customerPhone == phone) {
+				// 		var tmpName = this.customerList[i].customerName
+				// 		uni.setStorageSync('checkcustomer', this.customerList[i])
+				// 		uni.showLoading({
+				// 			title: '加载中'
+				// 		})
+				// 		that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+				// 				commonId: that.userInfo.id,
+				// 				searchContent: this.customerList[i].customerName + '(' + this.customerList[i]
+				// 					.customerPhone + ')',
+				// 				functionType: 3
+				// 			}).then(res => {
+				// 				that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+				// 					compId: '',
+				// 					customerName: tmpName,
+				// 					goodsName: uni.getStorageSync('goodsName'),
+				// 				}).then(res => {
+				// 					if (res.data.code == 200) {
+				// 						count = res.data.data
+				// 						that.$api.doRequest('get', '/paymentManagement/cumulant', {
+				// 							compId: '',
+				// 							customerName: tmpName,
+				// 							goodsName: uni.getStorageSync('goodsName'),
+				// 						}).then(res => {
+				// 							for (let i = 0; i < that.purchasePriceList.length; i++) {
+				// 								if (that.purchasePriceList[i].goodsName == uni
+				// 									.getStorageSync('goodsName')) {
+				// 									var data = res.data.data / 1000
+				// 									if (that.purchasePriceList[i].saleLimit - data <
+				// 										50 || count > 0) {
+				// 										that.$api.msg(
+				// 											`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨，最高可售${that.purchasePriceList[i].saleLimit}吨。`
+				// 											)
+				// 									}
+				// 								}
+				// 							}
+				// 							that.show = false
+				// 							uni.hideLoading()
+				// 							uni.navigateBack()
+				// 						})
+				// 					}
+				// 				})
+				// 			})
+				// 			.catch(res => {
+				// 				uni.showToast({
+				// 					title: '系统异常，请联系管理员',
+				// 					icon: 'none',
+				// 					duration: 2000
+				// 				})
+				// 				uni.hideLoading()
+				// 			})
+				// 	}
+				// }
+			},
+			emptysearch() {
+				this.show = false
+				this.searchKeyWord = ''
+				this.gridList = []
+				this.currentPage = 1
+				this.getList()
+			},
+			doSearch(status) {
+				if(this.searchKeyWord.length == 0){
+					this.$api.msg('请输入内容后再进行搜索')
+					return
+				}
+				this.show = true
+				this.gridList = []
+				this.currentPage = 1
+				uni.showLoading({
+					title: '正在加载',
+					mask: true
+				})
+				this.getList(status)
+			},
+			getList() {
+				
+				var that = this
+				var url = ''
+				var data = {}
+				this.$api.doRequest('get', '/shippingInformation/selectShippingInformation', {
+					warehouseName: this.warehouseName,
+					compId: uni.getStorageSync('pcUserInfo').compId,
+				}).then(res => {
+					if (res.data.data) {
+						uni.hideLoading()
+						if (res.data.data) {
+							let _endTime = Date.parse(new Date());
+							let _startTime = ""
+							for (let i = 0; i < res.data.data.length; i++) {
+								_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+								if (_endTime - _startTime <= 0) {
+									this.registeredCustomer.push(res.data.data[i])
+								}
+								// let _carList = res.data.data[i].shippingInformationList
+								// for (let k = 0; k < _carList.length; k++) {
+								// 	//判断是记录是否失效
+								// 	_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+								// 	if (_endTime - _startTime <= 0) {
+								// 		let _ecarList = _carList[k].carNo.split(',')
+								// 			_carList[k].carList = _ecarList
+								// 			this.registeredCustomer.push(_carList[k])
+								// 	}
+								// }
+							}
+							console.log(this.registeredCustomer)
+						}
+					}
+				})
+			},
+			edit(item) {
+				uni.navigateTo({
+					url: '/pages/erpbusiness/edit_quality_testing?id=' + item.id + '&managementType=' + this
+						.managementType + '&cangid=' + this.cangid
+				})
+			},
+			add() {
+				uni.navigateTo({
+					url: '/pages/erpbusiness/add_quality_testing?managementType=' + this.managementType +
+						'&cangid=' + this.cangid + '&warehouseCount=' + this.warehouseCount +
+						'&commonWarehouseNo=' + this.commonWarehouseNo + '&warehouseName=' + this.warehouseName
+				})
+			},
+			del(item) {
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/deleteQualityInspection', {
+					id: item.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.$api.msg('删除成功')
+						this.gridList = []
+						this.getList()
+					} else {
+						this.$api.msg('系统异常，请联系管理员')
+					}
+				})
+			},
+			fankui() {
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.container {
+		padding-top: 85px;
+		padding-top: 35px;
+		background-color: #F5F6FA;
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: url('~@/static/img/login/bg_slices/bg@3x.png');
+		background-size: 100% 100%;
+		margin: 0 auto;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.path {
+		color: #007aff;
+		display: inline-block;
+		text-align: center;
+	}
+
+	.icon {
+		margin-right: 10rpx;
+	}
+
+	.portrait-box {
+		margin-top: 20rpx;
+	}
+
+	.qr-wrap {
+		margin-top: 20upx;
+		color: #fff;
+		font-size: 32rpx;
+	}
+
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1)
+		}
+
+		50% {
+			transform: translateX(-25%) translateZ(0) scaleY(0.55)
+		}
+
+		100% {
+			transform: translateX(-50%) translateZ(0) scaleY(1)
+		}
+	}
+
+	.bg {
+		position: relative;
+		height: 300rpx;
+		/* background: linear-gradient(to bottom, #56ccf2, #2f80ed); */
+		/*background: linear-gradient(to bottom, #0be9fe, #4bb0fe); */
+		background: linear-gradient(to bottom, #d5f8ff, #56ccf2);
+
+	}
+
+	.bg_ware {
+		position: absolute;
+		left: 0;
+		bottom: -2rpx;
+		width: 100%;
+		mix-blend-mode: screen;
+		height: 224rpx;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10upx;
+	}
+
+	.cuIcon {
+		position: absolute;
+		right: 80px;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		/* position: relative;
+ */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.image {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.text {
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.user-section {
+		height: 520upx;
+		padding: 100upx 30upx 0;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			filter: blur(1px);
+			box-shadow: 0px 1px 8px #ccc;
+			/* background:linear-gradient(#0eb0c9,#126bae); */
+			/* opacity: .7; */
+		}
+	}
+
+	.cover-container {
+		padding: 1px 10px;
+		padding-bottom: 200upx;
+
+		/* background-color: #F5F6FA; */
+		/* 	border-radius: 20px; */
+		margin-top: 60upx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34upx;
+			width: 100%;
+			height: 36upx;
+		}
+	}
+
+	.tj-sction {
+		@extend %section;
+
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 140upx;
+			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8upx;
+		}
+	}
+
+	.order-section {
+		@extend %section;
+		padding: 28upx 0;
+		margin-top: 20upx;
+
+		.order-item {
+			@extend %flex-center;
+			width: 120upx;
+			height: 120upx;
+			border-radius: 10upx;
+			font-size: $font-sm;
+			color: $font-color-dark;
+		}
+
+		.yticon {
+			font-size: 48upx;
+			margin-bottom: 18upx;
+			color: #fa436a;
+		}
+
+		.icon-shouhoutuikuan {
+			font-size: 44upx;
+		}
+	}
+
+	.history-section {
+		padding: 30upx 0 0;
+		margin-top: 20upx;
+		background: #fff;
+		border-radius: 10upx;
+
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 40upx;
+			margin-left: 30upx;
+
+			.yticon {
+				font-size: 44upx;
+				color: #5eba8f;
+				margin-right: 16upx;
+				line-height: 40upx;
+			}
+		}
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30upx 30upx 0;
+
+			image {
+				display: inline-block;
+				width: 160upx;
+				height: 160upx;
+				margin-right: 20upx;
+				border-radius: 10upx;
+			}
+		}
+	}
+
+	.search-form {
+		background: #F5F6F9;
+	}
+
+	.search-box {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+		padding: 15upx 2.5%;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.search-box .mSearch-input-box {
+		width: 100%;
+	}
+
+	.search-box .input-box {
+		width: 85%;
+		flex-shrink: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.search-box .search-btn {
+		width: 15%;
+		margin: 0 0 0 2%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		font-size: 28upx;
+		color: #fff;
+		background: linear-gradient(to right, #ff9801, #ff570a);
+		border-radius: 60upx;
+	}
+
+	.search-box .input-box>input {
+		width: 100%;
+		height: 60upx;
+		font-size: 32upx;
+		border: 0;
+		border-radius: 60upx;
+		-webkit-appearance: none;
+		-moz-appearance: none;
+		appearance: none;
+		padding: 0 3%;
+		margin: 0;
+		background-color: #ffffff;
+	}
+
+	.placeholder-class {
+		color: #9e9e9e;
+	}
+
+	.search-keyword {
+		width: 100%;
+		background-color: rgb(242, 242, 242);
+	}
+
+	.grid {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+
+		/* border-top: 2upx solid rgba(172,172,172,.2); */
+		.grid-item-3 {
+			box-sizing: border-box;
+			width: calc(100% / 3);
+			border-bottom: 2upx solid rgba(172, 172, 172, .2);
+			border-right: 2upx solid rgba(172, 172, 172, .2);
+			text-align: center;
+			padding: 40upx 0;
+			position: relative;
+
+			/* view{
+				font-size: $font-sm;
+				margin-top: 16upx;
+				color: $font-color-dark;
+			} */
+			.grid_icon {
+				font-size: 48upx;
+				margin-bottom: 18upx;
+				color: #fa436a;
+			}
+
+			.tip_text {
+				display: block;
+				padding: 4upx 8upx;
+				text-align: center;
+				border-radius: 36upx;
+				font-size: 24upx;
+				background-color: #fa436a;
+				color: rgba(255, 255, 255, 1);
+				position: absolute;
+				right: 6upx;
+				top: 6upx;
+			}
+		}
+
+		.grid-item-3:nth-child(3n + 3),
+		.grid-item-4:nth-child(4n + 4) {
+			border-right: none;
+		}
+	}
+
+	.headPortrait {
+		width: 75px;
+		height: 75px;
+		border-radius: 40px;
+		border: 2px solid #ffffff;
+	}
+
+	.information {
+		font-size: 15px;
+		font-weight: 600;
+		height: 36px;
+	}
+
+	.cu-list>.cu-item:after {
+		border: none;
+	}
+
+	.sign {
+		width: 40px;
+		height: 40px;
+		top: 4px;
+		margin-right: 6px;
+	}
+
+	.indexUp {
+		padding: 0 20px;
+		align-items: center;
+	}
+
+	.wrap {
+		background: #F5F6F9;
+		margin: 5px 10px;
+		border-radius: 20px;
+		width: 92%;
+		display: inline-block;
+		padding: 10px;
+	}
+
+	.searchwrap {
+		border-top: 1px solid #eee;
+		padding: 10px 20px;
+	}
+
+	.searchwrap:last-child {
+		border-bottom: 1px solid #eee;
+	}
+
+	.qualityNo {
+		font-size: 16px;
+	}
+
+	.type {
+		font-size: 12px;
+		color: #fff;
+		padding: 3px 5px;
+		border-radius: 50%;
+		line-height: 16px;
+	}
+
+	.type-zhi {
+		background: #22C572;
+	}
+
+	.type-mao {
+		background: #3296FA;
+	}
+
+	.type-pi {
+		background: #FD714F;
+	}
+
+	.time {
+		font-size: 12px;
+		color: #878C9C;
+	}
+
+	.qualityInspector {
+		font-size: 14px;
+	}
+
+	.customerinformation {
+		background: #F9F9FA;
+		padding: 7px;
+		margin: 20px 0;
+		border-radius: 10px;
+		color: #9698A2;
+	}
+
+	.buttons {
+		flex-direction: row-reverse;
+	}
+
+	.button {
+		padding: 13rpx 30rpx;
+		border: 1px solid #CDCDCD;
+		border-radius: 15px;
+		margin: 0 10px;
+	}
+
+	.changewarehouse {
+		padding: 10px 20px;
+	}
+
+	.header {
+		background: #fff;
+		border-radius: 0px 0px 16px 16px;
+	}
+
+	.content {
+		background: #fff;
+		/* height: 85.5vh; */
+	}
+
+	.footer {
+		background: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 20px 10px;
+		z-index: 10;
+
+		.button {
+			background: #22C572;
+			width: 90%;
+			margin: 0 auto;
+			padding: 10px;
+			color: #fff;
+			text-align: center;
+			border-radius: 30px;
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
+		padding: 20rpx 0;
+
+		.row {
+			display: flex;
+			padding: 20rpx 30rpx;
+
+			.row-item {
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.dj-customer {
+		background: #F5F6F9;
+		display: flex;
+		width: 75%;
+		justify-content: space-between;
+		align-items: center;
+		margin: 20rpx;
+		border-radius: 30rpx;
+		padding: 10rpx 20rpx;
+
+		.right {
+			display: flex;
+
+			.span1 {
+				margin-right: 20rpx;
+			}
+		}
+
+		;
+	}
+</style>

pages/erpbusiness/edit_quality_testing.vue

@@ -521,6 +521,84 @@
 					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
 					</view>
 				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">规格（公斤）</view>
+					<view class="con-list">
+						<u-radio-group active-color='#22C572' v-model="gridList.specifications" @change="radioGroupChange">
+							<u-radio name="850">850</u-radio>
+							<u-radio name="830">830</u-radio>
+						</u-radio-group>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">工厂</view>
+					<view class="con-list">
+						<input v-model='gridList.factory' :disabled='disabled1'  maxlength="30"
+							placeholder="请输入工厂" name="input"  type="text"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">生产日期</view>
+					<view class="con-list">
+						<u-calendar v-model="show3" @change="change1" :mode="mode"></u-calendar>
+						<view :style='gridList.produceDate?"color:#000;":"color:#999;"' @click="show3 = true">{{gridList.produceDate?gridList.produceDate:'选择生产日期'}}</view>
+						<!-- <input v-model='gridList.factory' :disabled='disabled1'  maxlength="30"
+							placeholder="请输入工厂" name="input" type="digit"></input> -->
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">污染件数</view>
+					<view class="con-list">
+						<input v-model='gridList.polluteNum' :disabled='disabled1'
+							placeholder="请输入污染件数" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"  style='padding:20rpx 30rpx;'>
+					<view class="title">污染附件</view>
+					<view class="con-list">
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :file-list="fileList" :action="action" :show-progress='false' :show-tips="false" :max-size="maxSize" :max-count="9"
+							:size-type="['compressed']" @on-success="getImgUrl($event,0)" @on-error="onError"
+							@on-remove="onRemove($event,0)" @on-uploaded="isAdd = true"
+							:limitType="['png', 'jpg', 'jpeg', 'webp', 'gif']" @on-progress="onProgress">
+							<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover"
+								hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../static/img/liangmai/xiangji-2.png"
+									mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">破损件数</view>
+					<view class="con-list">
+						<input v-model='gridList.wornNum' :disabled='disabled1'
+							placeholder="请输入破损件数" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" style='padding:20rpx 30rpx;'>
+					<view class="title">破损附件</view>
+					<view class="con-list">
+						<u-upload :custom-btn='true' :file-list="fileList1" class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :action="action" :show-progress='false' :show-tips="false" :max-size="maxSize" :max-count="9"
+							:size-type="['compressed']" @on-success="getImgUrl($event,1)" @on-error="onError"
+							@on-remove="onRemove($event,1)" @on-uploaded="isAdd = true"
+							:limitType="['png', 'jpg', 'jpeg', 'webp', 'gif']" @on-progress="onProgress">
+							<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover"
+								hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../static/img/liangmai/xiangji-2.png"
+									mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -634,8 +712,12 @@
 					dryGrainPrice: '',
 					carNumber: '',
 					carModel: '',
-					serviceManagementType:'3'
+					serviceManagementType:'3',
+					specifications:830
 				},
+				action: this.$uploadUrl,
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				maxSize: 50 * 1024 * 1024,
 				managementType: '',
 				warehouseName: '',
 				warehouseList: [],
@@ -675,7 +757,12 @@
 				transgeneShow:false,
 				transgeneList:[{value:'非转基因'},{value:'转基因'}],
 				colorLustreShow : false,
-				colorLustreList:[{value:'正常'},{value:'异常'}]
+				colorLustreList:[{value:'正常'},{value:'异常'}],
+				imglist:[],
+				imglist1:[],
+				fileList:[],
+				fileList1:[],
+				compName: "",
 			}
 		},
 		// #ifndef MP
@@ -721,6 +808,7 @@
 			uni.showLoading({
 				title:"加载中"
 			})
+			var that = this
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
 				id: this.id
 			}).then(res => {
@@ -732,6 +820,28 @@
 					} else {
 						that.value = false
 					}
+					if(data.polluteUrl){
+						this.imglist=data.polluteUrl.split(',')
+						this.$api.doRequest('get', 'appendix/query/getFileList', {
+							appendixIds: data.polluteUrl
+						}).then(res1 => {
+							for (var i = 0; i < res1.data.data.length; i++) {
+								res1.data.data[i].url=res1.data.data[i].appendixPath
+							}
+							this.fileList=res1.data.data
+						})
+					}
+					if(data.wornUrl){
+						this.imglist1=data.wornUrl.split(',')
+						this.$api.doRequest('get', 'appendix/query/getFileList', {
+							appendixIds: data.wornUrl
+						}).then(res1 => {
+							for (var i = 0; i < res1.data.data.length; i++) {
+								res1.data.data[i].url=res1.data.data[i].appendixPath
+							}
+							this.fileList1=res1.data.data
+						})
+					}
 					that.gridList = data
 					
 					if(that.gridList.type=='干粮'){
@@ -856,6 +966,10 @@
 			this.gridList.gradeKey = this.gradeList[2].key
 		},
 		onShow() {
+			var that = this
+			if(uni.getStorageSync('compName1')){
+				that.compName = uni.getStorageSync('compName1').company
+			}
 			this.multiSelector1=[{name:'他运',value:'他运'}]
 			this.$api.doRequest('get', '/inOutWarehouseTask/getContractNo', {
 				warehouseName:this.warehouseName
@@ -901,6 +1015,49 @@
 			}
 		},
 		methods: {
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			radioGroupChange(e){
+				console.log(e)
+				this.gridList.specifications=e
+			},
+			change1(e) {
+				this.gridList.produceDate=e.result
+				console.log(e);
+			},
+			onRemove(index,i) {
+				console.log(index,i)
+				if(i==0){
+					this.imglist.splice(index, 1)
+					this.gridList.polluteUrl=this.imglist.toString()
+				}else{
+					this.imglist1.splice(index, 1)
+					this.gridList.wornUrl=this.imglist1.toString()
+				}
+			},
+			getImgUrl(res,status) {
+				var that = this
+				this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
+					newAppendixs: [res.data],
+					oldAppendixIds: ""
+				}).then(res1 => {
+					if(status==0){
+						that.imglist.push(res1.data.data[0])
+						that.gridList.polluteUrl=that.imglist.toString()
+					}else{
+						that.imglist1.push(res1.data.data[0])
+						that.gridList.wornUrl=that.imglist1.toString()
+					}
+					
+					console.log(res)
+				})
+			},
 			colorLustreClick(e){
 				this.gridList.colorLustre = this.colorLustreList[e[0]].value
 			},
@@ -1738,4 +1895,20 @@
 		text-align: center;
 		border-radius: 20rpx;
 	}
+	/deep/.u-radio-group {
+		flex-direction: row-reverse;
+	}
+	/deep/.u-upload .u-list-item {
+		background: #fff;
+		border: 1px dashed #ccc;
+		border-radius: 10rpx;
+		height: 190rpx !important;
+		width: 190rpx !important;
+		margin: 10rpx;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

pages/erpbusiness/examine_quality_testing.vue

@@ -157,7 +157,7 @@
 					{{gridList.titleNoOther}}
 				</view>
 			</view>
-			<view class="c-row-fj" v-if="statusShow == '已复检'">
+			<view class="c-row-fj">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="暂无复检备注信息!" maxlength="300" disabled ></textarea>
 			</view>
@@ -287,6 +287,82 @@
 						{{gridList.dryGrainPrice}}
 					</view>
 				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">规格（公斤）</view>
+					<view class="con-list">
+						{{gridList.specifications}}
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">工厂</view>
+					<view class="con-list">
+						{{gridList.factory}}
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'"
+					class="c-row">
+					<view class="title">生产日期</view>
+					<view class="con-list">
+						{{gridList.produceDate}}
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">污染件数</view>
+					<view class="con-list">
+						{{gridList.polluteNum}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">污染附件</view>
+				</view>
+				<view>
+					<view style='display: flex;flex-wrap: wrap;' v-if='fileList.length>0&&compName=="辽宁佳屹农商贸有限公司"'>
+						<view style="margin: 10rpx;" v-for='item in fileList'>
+							<image
+								v-if="item.type == 'pdf'"
+								style="width: 100px; height: 100px;" src="../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								style="width: 100px; height: 100px;" src="../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								style="width: 100px; height: 100px;" src="../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else @click='lookImg(item.appendixPath)' style="width: 100px; height: 100px;" :src="item.appendixPath" mode="">
+							</image>
+						</view>
+					</view>
+				</view>
+				<view v-show="compName=='辽宁佳屹农商贸有限公司'" class="c-row">
+					<view class="title">破损件数</view>
+					<view class="con-list">
+						{{gridList.wornNum}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">破损附件</view>
+				</view>
+				<view>
+					<view style='display: flex;flex-wrap: wrap;' v-if='fileList1.length>0&&compName=="辽宁佳屹农商贸有限公司"'>
+						<view style="margin: 10rpx;" v-for='item in fileList1'>
+									<image
+										v-if="item.type == 'pdf'"
+										style="width: 100px; height: 100px;" src="../../static/img/oa_office/pdf3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+										style="width: 100px; height: 100px;" src="../../static/img/oa_office/excle3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+										style="width: 100px; height: 100px;" src="../../static/img/oa_office/word3.png"
+										mode=""></image>
+									<image v-else @click='lookImg(item.appendixPath)' style="width: 100px; height: 100px;" :src="item.appendixPath" mode="">
+									</image>
+								
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -360,6 +436,12 @@
 				],
 				cangid: '',
 				statusShow:"",
+				action: this.$uploadUrl,
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				maxSize: 50 * 1024 * 1024,
+				compName: "",
+				fileList:[],
+				fileList1:[],
 			}
 		},
 		// #ifndef MP
@@ -401,11 +483,38 @@
 		},
 		onShow() {
 			var that = this
+			if(uni.getStorageSync('compName1')){
+				that.compName = uni.getStorageSync('compName1').company
+			}
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
 				id: this.id
 			}).then(res => {
 				if (res.data.data) {
 					let data = res.data.data
+					if(data.polluteUrl){
+						this.$api.doRequest('get', 'appendix/query/getFileList', {
+							appendixIds: data.polluteUrl
+						}).then(res1 => {
+							for (var i = 0; i < res1.data.data.length; i++) {
+								if (res1.data.data[i].appendixName) {
+									res1.data.data[i].type = res1.data.data[i].appendixName.split(".")[1]
+								}
+							}
+							this.fileList=res1.data.data
+						})
+					}
+					if(data.wornUrl){
+						this.$api.doRequest('get', 'appendix/query/getFileList', {
+							appendixIds: data.wornUrl
+						}).then(res1 => {
+							for (var i = 0; i < res1.data.data.length; i++) {
+								if (res1.data.data[i].appendixName) {
+									res1.data.data[i].type = res1.data.data[i].appendixName.split(".")[1]
+								}
+							}
+							this.fileList1=res1.data.data
+						})
+					}
 					that.gridList = data
 					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 						id: this.cangid
@@ -416,6 +525,33 @@
 			})
 		},
 		methods: {
+			openDocument(src) {
+				uni.downloadFile({
+					url: src.appendixPath,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			lookImg(item){
+				uni.previewImage({
+				    current: 0,
+					urls: [item],
+					success: function(data) {
+						console.log('预览成功');
+					},
+					fail: function(err) {
+						console.log('预览失败+'+err.errMsg);
+					}	
+				});
+			},
 			gradepicker(e) {
 				console.log(e)
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
@@ -633,4 +769,16 @@
 	.c-row-fj{
 		padding:20rpx
 	}
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

pages/erpbusiness/index.vue

@@ -4,7 +4,8 @@
 			<!-- <view class='title'>收购业务管理</view> -->
 			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
 				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
-					v-if="index<gridCol*2 && item.show">
+					v-show="index<gridCol*2 && item.show">
+
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 						<image :src="item.src" class="sign"></image>
 					</view>
@@ -325,15 +326,15 @@
 				return false
 			},
 			isShow() {
-				for (let i = 0; i < this.gridList.length; i++) {
-					if (i == 1) {
-						this.gridList[i].show = this.getRoles('acquisitionQuality.view')
-					} else if (i == 2) {
-						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
-					} else if (i == 3) {
-						this.gridList[i].show = this.utils.getRoles('acquisitionInfor.view')
-					}
-				}
+				// for (let i = 0; i < this.gridList.length; i++) {
+				// 	if (i == 1) {
+				// 		this.gridList[i].show = this.getRoles('acquisitionQuality.view')
+				// 	} else if (i == 2) {
+				// 		this.gridList[i].show = this.getRoles('acquisitionWeight.view')
+				// 	} else if (i == 3) {
+				// 		this.gridList[i].show = this.utils.getRoles('acquisitionInfor.view')
+				// 	}
+				// }
 				for (let k = 0; k < this.gridList1.length; k++) {
 					if (k == 0) {
 						this.gridList1[k].show = this.getRoles('acquisitionWeightOut.view')

pages/erpbusiness/quality_testing.vue

@@ -1188,11 +1188,13 @@
 	/* 	position: fixed; */
 		right: 0;
 		/* top: 17.5%; */
-		background: url('../../static/img/qiyebeijing.png') no-repeat;
-		background-size: 100% 100%;
-		width: 60%;
+		background: linear-gradient(to right,#EFEEF6, #DCDAEA);
+		/* background: url('../../static/img/qiyebeijing.png') no-repeat; */
+		/* background-size: 100% 100%; */
+		/* width: 60%; */
 		font-size: 11px;
 		padding-bottom: 5px;
+		padding-left:10px;
 		padding-right: 10px;
 		text-align:right;
 		border-radius: 40rpx 0 0 40rpx;

pages/reimbursement/the_reimbursement.vue

@@ -41,9 +41,9 @@
 					<!-- <view class="wenzi1 audit" v-if="!item.approveStatus && item.status =='已驳回' "  @click="rejecttext(item)">驳回原因</view> -->
 					<view class="wenzi1 audit"v-if="item.approveStatus && item.approveStatus !='发起人撤回' " @click="withdraw(item)">撤回</view>
 					<view class="wenzi1 audit" @click="deleExpense(item)"
-						v-if="item.status=='已驳回'">删除</view>
+						v-if="item.status=='已驳回'||item.approveStatus=='发起人撤回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
-						v-if="item.status=='已驳回'">编辑</view>
+						v-if="item.status=='已驳回'||item.approveStatus=='发起人撤回'">编辑</view>
 						<view class="wenzi1 audit" @click="gofujian(item)">补充附件</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
@@ -116,6 +116,7 @@
 				
 			},
 			withdraw(val){
+				
 				var that = this
 				uni.showModal({
 					content: "撤回成功后，可再次提交，确定撤回吗？",
@@ -123,14 +124,20 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/stopInstance', {
 								businessKey: val.id,
 								workflowId: val.workflowId,
 							}).then(res => {
 								if (res.data.code == 200) {
+									uni.hideLoading()
 									that.$api.msg('撤回成功')
 									that.getList()
 								} else {
+									uni.hideLoading()
 									that.$api.msg('撤回成功')
 								}
 							})

pages/task/audit/daichu_details.vue

@@ -7,16 +7,16 @@
 			<u-form-item label-width='260' label="运输方式">
 				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="买方">
+			<u-form-item label-width='260' label="库方">
 				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
+			<u-form-item label-width='260' label="库方电话">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方">
+			<u-form-item label-width='260' label="承租方">
 				<u-input v-model="list.seller" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
+			<u-form-item label-width='260' label="承租方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="结算方式">
@@ -82,9 +82,9 @@
 			<u-form-item label-width='300' label="代储费预计终止日期">
 				<u-input v-model="list.storageFeeEnddate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）">
+			<!-- <u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
-			</u-form-item>
+			</u-form-item> -->
 			<u-form-item label-width='260' label="货名">
 				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>

pages/task/audit/warehouse_details.vue

@@ -151,7 +151,6 @@
 		},
 		methods: {
 			getStatus(val) {
-				console.log(11111)
 				if (val == 200) this.getData()
 			},
 			showcontent(item) {

pages/user/depotAcquisition/depotAcquisition.vue

@@ -36,12 +36,33 @@
 			</view>
 			<view class="row4">
 				<view class="time">{{item.updateDate}}</view>
-				<view class="btn"
-					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?warehouseName="+item.warehouseName+"&warehouseId="+item.warehouseId+"&warehousePrivate="+item.warehousePrivate+"&warehouseCity="+item.warehouseCity+"&warehouseArea="+item.warehouseArea+"&detailedAddress="+item.detailedAddress)'>
-					我要送粮
+				
+			</view>
+			<view class="row4">
+				<view></view>
+				<view class='flex'>
+					<view class="btn"
+						@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration1?warehouseName="+item.warehouseName+"&warehouseId="+item.warehouseId+"&warehousePrivate="+item.warehousePrivate+"&warehouseCity="+item.warehouseCity+"&warehouseArea="+item.warehouseArea+"&detailedAddress="+item.detailedAddress+"&compId="+item.compId)'>
+						贸易粮叫号
+					</view>
+					<view class="btn"
+						@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?warehouseName="+item.warehouseName+"&warehouseId="+item.warehouseId+"&warehousePrivate="+item.warehousePrivate+"&warehouseCity="+item.warehouseCity+"&warehouseArea="+item.warehouseArea+"&detailedAddress="+item.detailedAddress+"&compId="+item.compId)'>
+						自产粮叫号
+					</view>
+					
 				</view>
+				
+				
 			</view>
 		</view>
+		<u-modal confirm-color='#22C572' @confirm="confirm" show-cancel-button='false' class='radio' title='查看叫号记录' v-model="show" >
+			<view class="slot-content ">
+					<u-radio-group active-color='#22C572' v-model="value" @change="radioGroupChange">
+						<u-radio name="贸易粮叫号记录">贸易粮叫号记录</u-radio>
+						<u-radio name="自产粮叫号记录">自产粮叫号记录</u-radio>
+					</u-radio-group>
+			</view>
+		</u-modal>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
@@ -58,6 +79,8 @@
 		},
 		data() {
 			return {
+				show:false,
+				value:'贸易粮叫号记录',
 				isShowAlert: false,
 				content: '当前登入信息验证失败，是否重新登录？',
 				currentCityName: '',
@@ -84,8 +107,7 @@
 			if (index == 1) {
 				uni.navigateBack()
 			} else {
-
-				this.naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")
+				this.show=true
 			}
 		},
 		// #endif
@@ -129,6 +151,13 @@
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
+			confirm(){
+				if(this.value=='自产粮叫号记录') this.naviageToPage("/pages/user/depotAcquisition/grainDeliveryRecord")
+				else uni.navigateTo({url:'/pages/user/depotAcquisition/grainDeliveryRecord1'})
+			},
+			radioGroupChange(e){
+				this.value=e
+			},
 			getListData() {
 				if (this.currentCityName == '全国') this.currentCityName = ''
 				this.$api.doRequest('get', '/acquisitionInfo/selectAcquisitionPage', {
@@ -301,6 +330,7 @@
 			font-weight: 400;
 			color: #FFFFFF;
 			padding: 10rpx 30rpx;
+			margin:10rpx;
 		}
 
 		.time {
@@ -349,4 +379,9 @@
 			}
 		}
 	}
+	.slot-content{
+		text-align:center;
+		height:120rpx;
+		line-height: 120rpx;
+	}
 </style>

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -105,7 +105,8 @@
 		methods: {
 			getData(size, page, type) {
 				let _obj = {
-					commonId: uni.getStorageSync("userInfo").id
+					commonId: uni.getStorageSync("userInfo").id,
+					callFlag:1
 				}
 				this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration', _obj)
 					.then(res => {

pages/user/depotAcquisition/grainDeliveryRecord1.vue

@@ -0,0 +1,287 @@
+<template>
+	<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<view class="content">
+			<view class="content1" v-for="(item,index) in dataList" :key="index">
+				<view class="top">
+					<view class="left">{{item.currectDate}}</view>
+				</view>
+				<view v-for="(item1,index) in item.carList">
+					<view class="flex justify-between">
+						<view class="hz-name">
+							{{item1.shipperName}}
+						</view>
+						<view class="car">
+							{{item1.carNo}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
+				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
+				title='提示' :showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick">
+			</u-modal>
+			<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
+				title='提示' :showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
+			</u-modal>
+		</view>
+	</mescroll-body>
+</template>
+<script>
+	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components: {
+
+		},
+		data() {
+			return {
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
+				},
+				dataList: [],
+				validityDate: '',
+				id: '',
+				warehouseName: '',
+				isShowAlert: false,
+				isShowAlert1: false,
+				content: '当前登入信息验证失败，是否重新登录？',
+				content1: '确定删除送粮记录？',
+				dataList: []
+			}
+		},
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					this.isShowAlert = true;
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			getData(size, page, type) {
+				let _obj = {
+					commonId: uni.getStorageSync("userInfo").id,
+					callFlag:2
+				}
+				this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration', _obj)
+					.then(res => {
+						if (res.data.code == 200) {
+							for (let i = 0; i < res.data.data.length; i++) {
+								let _data = res.data.data[i];
+								let date = new Date(_data.createDate)
+								_data.currectDate = date.getFullYear()+'-'+((date.getMonth()+1)>=10?(date.getMonth()+1):'0'+(date.getMonth()+1))+'-'+(date.getDate()>=10?date.getDate():'0'+date.getDate())
+								for (var q = 0; q < _data.shippingInformationList.length; q++) {
+									console.log(_data.shippingInformationList[q].carNo.split(','))
+									var carArr=_data.shippingInformationList[q].carNo.split(',')
+									_data.shippingInformationList[q].carList = carArr.map(item=>{return {carNo:item,shipperName:_data.shippingInformationList[q].shipperName}})
+								}
+							}
+							let newList = res.data.data.map(item=>{return {currectDate:item.currectDate,carList:[]}})
+							let hash={};
+							newList = newList.reduce((item,next)=>{
+								console.log(item,next,11111)
+								hash[next.currectDate]?"":hash[next.currectDate]=true && item.push(next)
+								return item
+							},[])
+							// console.log(newList)
+							res.data.data.forEach((item,index)=>{
+								for(let i in newList){
+									if(item.currectDate==newList[i].currectDate){
+										newList[i].carList.push(...item.shippingInformationList[0].carList)
+									}
+								}
+							})
+							console.log(newList)
+							// let _carNumberList=[]
+							// for (var q = 0; q < _data.shippingInformationList.length; 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,
+							// 	shipperName: _data.shipperName,
+							// 	shippingInformationList: _data.shippingInformationList,
+							// 	validityDate: _data.validityDate,
+							// 	createDate:_data.createDate
+							
+							// }
+							// curPageData.push(__obj)
+							if (type == 'down') {
+								this.mescroll.endSuccess();
+								this.dataList = []
+							} else {
+								this.mescroll.endBySize(newList.length, newList.length); //必传参数(当前页的数据个数, 总数据量)
+							}
+							console.log(newList)
+							this.dataList = this.dataList.concat(newList);
+						}
+					})
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
+				this.getData(10, 1, 'down')
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				//联网加载数据
+				this.getData(page.size, page.num, 'up')
+			},
+			del(row) {
+				this.isShowAlert1 = true
+				this.id = row.id
+				// 删除成功后删除页面当前行
+			},
+
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				this.$api.doRequest('post', '/grainDeliveryRegistration/api/deleteInfo', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						for (let i = 0; i < this.dataList.length; i++) {
+							if (this.id == this.dataList[i].id) {
+								this.$api.msg('删除成功！')
+								this.dataList.splice(i, 1)
+							}
+						}
+					} else {
+						this.$api.msg('删除失败！')
+					}
+				})
+
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+
+	.content1 {
+		background: white;
+		margin: 20rpx;
+		padding: 20rpx;
+		border-radius: 20rpx;
+
+		.top {
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				font-size: 32rpx;
+				font-weight: 700;
+			}
+
+			.right {
+				font-size: 28rpx;
+				color: #FD714F;
+			}
+		}
+
+		.hz-content {
+			background: #F5F6FA;
+			margin-top: 20rpx;
+			padding: 20rpx;
+
+			.row1 {
+				display: flex;
+				align-items: center;
+				margin-bottom: 30rpx;
+
+				.hz-name {
+					font-size: 36rpx;
+					font-weight: 700;
+					margin-right: 4rpx;
+				}
+
+				.car {
+					font-size: 24rpx;
+					color: #676E80;
+
+				}
+			}
+
+			.car-list {
+				.number {
+					display: inline-block;
+					width: 25%;
+					background: #FFFFFF;
+					border-radius: 23px;
+					font-size: 24rpx;
+					color: #676E80;
+					padding: 10rpx 20rpx;
+					margin: 1%;
+					text-align: center;
+					box-sizing: border-box;
+				}
+			}
+
+		}
+
+		.del-row {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 20rpx;
+
+			.del {
+				background: #FFFFFF;
+				border-radius: 33px;
+				border: 1px solid #CDCDCD;
+				font-size: 28rpx;
+				color: #333333;
+				margin: 0;
+				padding: 10rpx 30rpx;
+				height: 100%;
+			}
+
+			/deep/.uni-button {}
+		}
+
+	}
+</style>

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -121,6 +121,7 @@
 					warehouseName: "",
 					validityDate: '',
 					commonId: uni.getStorageSync("userInfo").id,
+					compId:'',
 					shippingInformationList: [{
 						identityId: '',
 						shipperName: '',
@@ -143,6 +144,7 @@
 		onLoad(options) {
 			this.warehouseId = options.warehouseId
 			this.dataList.warehouseName = options.warehouseName
+			this.dataList.compId=options.compId
 			this.startDate = this.getTime()[0]
 			this.dataList.validityDate = this.getTime()[1]
 			this.warehouseNameAddress = options.warehousePrivate + options.warehouseCity + options
@@ -292,6 +294,7 @@
 				if (_isCanSubmit) {
 					// 处理车牌号数据
 					for (let i = 0; i < this.dataList.shippingInformationList.length; i++) {
+						this.dataList.shippingInformationList[i].compId= this.dataList.compId
 						let _data = this.dataList.shippingInformationList[i]
 						let _index = 0
 						for (let k = 0; k < _data.carNumberList.length; k++) {

pages/user/depotAcquisition/grainDeliveryRegistration1.vue

@@ -0,0 +1,536 @@
+<template>
+	<view @click='hidden' class="content">
+
+		<view class="content2">
+			<view v-if='!status'>
+				<view v-for='(item,index1) in dataList.shippingInformationList' class="wrap wrap1"  >
+					<view class="row1 row">
+						<!-- -{{item.customerName}} -->
+						<view class="customerName">交易信息</view>
+					</view>
+					<view class="row4 row">
+						<view class="left">
+							货主
+						</view>
+						<view class="right" >
+							<input  style='text-align:right;' class="car-uumber" v-model='item.shipperName'
+								 placeholder="输入货主姓名"
+								name="input"></input>
+						<!-- 	<view>{{item.shipperName}}</view>
+							<u-picker @confirm="nameConfirm" range-key='customerName' mode="selector"
+									v-model="item.showCustomerName" :range="nameList"></u-picker>
+							<u-icon name="arrow-right"></u-icon> -->
+						</view>
+					</view>
+					<view class="row4 row" v-for="(item1,index1) in item.carNumberList" :key='index1'>
+						<view class="left">
+							车牌号-{{index1+1}}
+						</view>
+						<view class="right">
+							<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>
+								</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>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :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='提示'
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			:showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
+	export default {
+		components: {
+			keyboard
+		},
+		data() {
+			return {
+				isShowAlert: false,
+				isShowAlert1: false,
+				index: 0,
+				index1: 0,
+				content: '当前登入信息验证失败，是否重新登录？',
+				content1: '确定提交送粮信息？',
+				// show: false,
+				show1: false,
+				cargoOwner: [{
+					name: '123'
+				}],
+				nameList: [],
+				carNo: '',
+				warehouseNameAddress: '',
+				startDate: "",
+				goodsName: '',
+				status: false,
+				dataList: {
+					warehouseName: "",
+					commonId:uni.getStorageSync("userInfo").id,
+					compId:'',
+					shippingInformationList:[{
+						identityId:'',
+						shipperName:'',
+						supplier:'',
+						carNo:'',
+						compId:uni.getStorageSync('pcUserInfo').compId,
+						carNumberList: [{
+						carNo: ''
+						}]
+					}]
+					
+				},
+				goodsnameList: [],
+				selectObj: {},
+				goodsNameshow: false,
+				nameListCopy: [],
+				keyShow:false,
+			}
+		},
+
+		onLoad(options) {
+			this.warehouseId = options.warehouseId
+			this.dataList.warehouseName = options.warehouseName
+			this.dataList.compId=options.compId
+			this.startDate = this.getTime()[0]
+			this.dataList.validityDate = this.getTime()[1]
+			this.warehouseNameAddress = options.warehousePrivate + options.warehouseCity + options
+				.warehouseArea + options.detailedAddress
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.warehouseId
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.goodsName = res.data.data[0]?res.data.data[0].goodsName:''
+					this.goodsnameList = res.data.data
+				}
+				this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+					console.log("checkSession", res)
+					if (res.data.data == "INVALID") {
+						this.isShowAlert = true;
+					}
+					// this.getCustomer()
+				})
+			})
+		},
+		onNavigationBarButtonTap(e){
+			console.log(111111)
+			uni.navigateTo({
+				url:'/pages/user/depotAcquisition/grainDeliveryRecord1'
+			})
+		},
+		methods: {
+			keyClose(){
+				this.keyShow = false
+			},
+			goodsnameConfirm(e) {
+				this.goodsName = this.goodsnameList[e[0]].goodsName
+				this.getCustomer()
+			},
+			showgoodsName() {
+				this.goodsNameshow = true
+			},
+			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[index].carNumberList[index1].carNo == '') {
+					this.carNo = ''
+				} else {
+					this.carNo = this.dataList.shippingInformationList[index].carNumberList[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 {
+					this.$refs.keyboard[0].open(true)
+				}
+
+			},
+			handleClick(e) {
+				this.carNo = e.value
+				this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo = e.value //键盘输入值
+			},
+			showCustomerName(value, index) {
+				this.selectObj = value
+				this.selectObj.index = index
+				value.showCustomerName = true
+			},
+			getCustomer() {
+				var that = this
+				let _data = {
+					commonId: uni.getStorageSync("userInfo").id,
+					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
+								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
+									.data[0].supplier : '无'
+							} else {
+								that.status = true
+								this.$api.msg('当前客户的' + this.goodsName + '送粮量达到上限')
+							}
+						}
+						else if(res.data.code == 11019){
+							this.$api.msg('未认证粮商身份')
+						}
+						else if(res.data.code == 11021){
+							this.$api.msg('该仓库未设置收购价格或收购价格正在审核中')
+						}
+					})
+			},
+			getTime() {
+				let _startTime = new Date().format("yyyy-MM-dd");
+				var _endTime = new Date();
+				_endTime.setDate(_endTime.getDate() + 3);
+				_endTime = _endTime.format("yyyy-MM-dd");
+				return [_startTime, _endTime]
+			},
+			reduceBtn(index) {
+				if (this.dataList.shippingInformationList.length > 1) {
+					this.dataList.shippingInformationList.splice(index, 1)
+					this.$forceUpdate()
+				} else {
+					this.$api.msg('至少保留一位货主！')
+				}
+			},
+			submit() {
+				this.isShowAlert1 = true
+			},
+			nameConfirm(e) {
+				this.dataList.shippingInformationList[this.selectObj["index"]].shipperName = this.nameList[e[0]]
+					.customerName
+				this.dataList.shippingInformationList[this.selectObj["index"]].supplier = this.nameList[e[0]].supplier
+				this.dataList.shippingInformationList[this.selectObj["index"]].identityId = this.nameList[e[0]].id
+				// 备份货主列表,用于删除货主操作
+				this.nameListCopy = this.$u.deepClone(this.nameList);
+				this.nameListCopy.splice(e[0], 1)
+
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			alertBtn() {
+				let _isCanSubmit = this.validate()
+				if (_isCanSubmit) {
+					// 处理车牌号数据
+					for (let i = 0; i < this.dataList.shippingInformationList.length; i++) {
+						this.dataList.shippingInformationList[i].compId= this.dataList.compId
+						let _data = this.dataList.shippingInformationList[i]
+						let _index = 0
+						_data.carNo=''
+						for (let k = 0; k < _data.carNumberList.length; k++) {
+							_index++
+							if (_data.carNumberList.length < 1) {
+								_data.carNo = _data.carNumberList[k].carNo
+							} else if (k < _data.carNumberList.length - 1) {
+								_data.carNo += _data.carNumberList[k].carNo + ','
+							} else {
+								_data.carNo += _data.carNumberList[k].carNo
+							}
+						}
+					}
+					//拷贝dataList用于提交数据
+					let _dataList = this.$u.deepClone(this.dataList);
+					for (let i = 0; i < _dataList.shippingInformationList.length; i++) {
+						let _data = _dataList.shippingInformationList[i]
+						delete _data.carNumberList
+						delete _data.index
+						delete _data.showCustomerName
+					}
+					console.log(_dataList)
+					this.$api.doRequest('post', '/grainDeliveryRegistration/api/insertInfo', _dataList).then(res => {
+						if (res.data.code == 200) {
+							this.$api.msg('添加成功！')
+							setTimeout(function() {
+								uni.navigateBack()
+							}, 1000)
+						} else {
+							this.$api.msg('添加失败！')
+						}
+					})
+				}
+			},
+			validate() {
+				let _val = true
+				for (let i = 0; i < this.dataList.shippingInformationList.length; i++) {
+					let _data = this.dataList.shippingInformationList[i]
+					for (let k = 0; k < _data.carNumberList.length; k++) {
+						if (!_data.carNumberList[k].carNo) {
+							this.$api.msg('车牌号不能为空！')
+							return false
+						} else if (_data.carNumberList[k].carNo.length != 7) {
+							this.$api.msg('车牌号输入错误！')
+							return false
+						}
+					}
+				}
+				return _val
+			},
+			cancelClick() {
+				this.isShowAlert = false
+				this.isShowAlert1 = false
+			},
+			addGoodPeople() {
+				if (this.status == true) {
+					this.$api.msg('当前客户的' + this.goodsName + '送粮量达到上限')
+					return
+				}
+				// 判断是否还有剩余的货主
+				if (this.nameList.length != this.dataList.shippingInformationList.length) {
+					this.dataList.shippingInformationList.push({
+						shipperName: '',
+						supplier: '无',
+						carNo: '',
+						showCustomerName: false,
+						carNumberList: [{
+							carNo: ''
+						}]
+					})
+					this.$forceUpdate()
+				} else {
+					this.$api.msg('无更多认证货主！')
+				}
+
+			},
+			addCarNumber(val) {
+				val.push({
+					carNo: ''
+				})
+			},
+			delCarNumber(val, index) {
+				if (val.length > 1) {
+					val.splice(index, 1)
+					this.$forceUpdate()
+				} else {
+					this.$api.msg('至少保留一个车牌号！')
+				}
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+	}
+
+	.location {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx;
+		position: absolute;
+		left: 20rpx
+	}
+
+	.locationwrap {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.position {
+		font-size: 24rpx;
+		padding: 6rpx 16rpx 6rpx 60rpx;
+		border-radius: 30rpx;
+		background: #F5F6FA;
+	}
+
+	.content1 {
+		background: white;
+		margin: 20rpx;
+		padding: 30rpx 20rpx;
+		border-radius: 20rpx;
+
+		.row1 {
+			display: flex;
+			justify-content: space-between;
+
+			.title {
+				font-size: 32rpx;
+				color: #333;
+				font-weight: 700;
+			}
+
+			.validityDate {
+				font-size: 24rpx;
+				color: #FD714F;
+				position: relative;
+				top: -10rpx;
+			}
+		}
+
+		.row2 {
+			.start-time {
+				font-size: 24rpx;
+				color: #878C9C;
+				margin: 10rpx 0;
+			}
+		}
+
+		.row3 {
+			margin-bottom: 10rpx;
+		}
+	}
+
+	.content2 {
+		.row {
+			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;
+				color: #333333;
+			}
+		}
+
+		.row2,
+		.row3,
+		.row4 {
+			display: flex;
+			justify-content: space-between;
+
+			.right {
+				display: flex;
+			}
+		}
+
+		.row4:last-child {
+			padding-bottom: 0;
+			border: none;
+		}
+	}
+
+	.row4 {
+		display: flex;
+		align-items: center;
+
+		.right {
+			.btn {
+				display: flex;
+				align-items: center;
+			}
+		}
+	}
+
+	.row4-img {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.add-good-people {
+		border-radius: 45rpx;
+		width: 96%;
+		margin: 20rpx auto;
+		text-align: center;
+		background-color: white;
+		font-size: 34rpx;
+		font-weight: 500;
+		color: #00C265;
+		padding: 20rpx 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.img {
+			width: 32rpx;
+			height: 32rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.submit {
+		position: fixed;
+		bottom: 20rpx;
+		background: #22C572;
+		border-radius: 46px;
+		font-size: 34rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		width: 96%;
+		margin-left: 2%;
+	}
+
+	.content {
+		padding-bottom: 200rpx;
+	}
+
+	.car-uumber {
+		font-size: 28rpx;
+	}
+</style>

pages/user/user.vue

@@ -1389,6 +1389,8 @@
 		font-size: 15px;
 		font-weight: 600;
 		height: 60rpx;
+		position: relative;
+		z-index: 10;
 	}
 
 	.indexlow {

store/index.js

@@ -125,8 +125,11 @@ const store = new Vuex.Store({
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
+			uni.removeStorageSync("depotAcquisition_warehouseName")
 			uni.removeStorageSync('userInfo')
 			uni.removeStorageSync('pcUserInfo')
+			uni.removeStorageSync('typevalue')
+			uni.removeStorageSync('gridList')
 		},
 		configfreightTransport(state,flag){
 			state.isConfigfreightTransport = flag