前端

pages/erpbusiness/add_quality_testing.vue

@@ -170,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="compName=='辽宁佳屹农商贸有限公司'" class='cu-btn bg-green shadow' @click="carchange">选择</button>
+				<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>
@@ -627,6 +627,7 @@
 			return {
 				isQY: false,
 				isZJ: false,
+				deliverType:'',
 				redstatus: false,
 				isShowPrint: false,
 				isShowAlert: false,
@@ -1085,7 +1086,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
@@ -1134,7 +1135,7 @@
 					})
 				}
 			}
-			if(uni.getStorageSync('gridList')&&this.typevalue==1&&this.compName=='辽宁佳屹农商贸有限公司'){
+			if(uni.getStorageSync('gridList')&&this.typevalue==1){
 				
 				if(uni.getStorageSync('typevalue')){
 					this.typevalue=uni.getStorageSync('typevalue')
@@ -1142,6 +1143,7 @@
 				this.gridList=uni.getStorageSync('gridList')
 				if(uni.getStorageSync('carNo')){
 					this.gridList.carNumber=uni.getStorageSync('carNo')
+					this.gridList.shipId=uni.getStorageSync('checkcustomer').shipId
 				}
 			}
 		},
@@ -1588,6 +1590,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

pages/erpbusiness/customercar.vue

@@ -32,7 +32,7 @@
 
 			<!-- <view v-for='item in registeredCustomer'> -->
 			<view class="dj-customer" v-for="(item,index) in registeredCustomer"
-				@click="registeredCustomerClick(item,item1)">
+				@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>

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>

pages/user/user.vue

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