前端

config/index.js

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

pages/erp/receivingfeedback/details.vue

@@ -1,7 +1,16 @@
 <template>
 	<view class="wrap">
 		<view>
-			<view style='margin-left:10px;'>任务详情</view>
+			<view class='flex' style='margin-left:10px;justify-content: space-between;align-items: center;'>
+				<view>任务详情</view>
+				<view>
+					<u-search placeholder="输入车牌号" bg-color='#F2F6FA ' shape='square' v-model="carNo" @change='carchange' @custom='search' @clear='clearsearch' :show-action="true"></u-search></view>
+			</view>
+			<view class='flex' style='margin-left:10px;align-items: center;'>
+				<view :class='status1=="0"?"active":""' class='statusitem' @click='statuschange1("0")'>全部</view>
+				<view :class='status1=="1"?"active":""' class='statusitem' @click='statuschange1("1")'>已反馈</view>
+				<view :class='status1=="2"?"active":""' class='statusitem' @click='statuschange1("2")'>未反馈</view>
+			</view>
 			<view class="content">
 				<view class="row">
 					<view class="left">任务编号</view>
@@ -386,6 +395,7 @@
 				id:'',
 				show1: false,
 				show2: false,
+				carNo:'',
 				currentPage: 1,
 				pageSize: 10,
 				show1:false,
@@ -393,6 +403,7 @@
 				binNumber: "",
 				maxSize: 50 * 1024 * 1024,
 				status: '执行中',
+				status1:'0',
 				positionName: '',
 				statusList: [
 					{name:'执行中',value:1},
@@ -438,6 +449,41 @@
 		    },
 		 },
 		methods: {
+			search(e){
+				this.getList()
+			},
+			clearsearch(){            
+				
+			},
+			carchange(){
+				if(this.carNo==''){
+					this.freightspace=this.detailData.tranCarInfoList
+				}
+			},
+			statuschange1(status){
+				this.status1=status
+				if(status==0){
+					if(this.carNo==''){
+						this.freightspace=this.detailData.tranCarInfoList
+					}else{
+						this.freightspace=this.detailData.carInfoList
+					}
+				}else if(status==1){
+					if(this.carNo==''){
+						var arr=this.detailData.tranCarInfoList
+					}else{
+						var arr=this.detailData.carInfoList
+					}
+					this.freightspace=arr.filter((item)=>{return item.status=='已送达'})
+				}else if(status==2){
+					if(this.carNo==''){
+						var arr=this.detailData.tranCarInfoList
+					}else{
+						var arr=this.detailData.carInfoList
+					}
+					this.freightspace=arr.filter((item)=>{return item.status!='已送达'})
+				}
+			},
 			shadeshow(url){
 				this.imgShow=true
 				this.url=url
@@ -825,10 +871,15 @@
 				}
 			},
 			getList() {
+				uni.showLoading({
+					title:'加载中'
+				})
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
-					id:this.id
+					id:this.id,
+					carNo:this.carNo,
 				}).then(res => {
 					if (res.data.code == 200) {
+						uni.hideLoading()
 						this.detailData = res.data.data
 						if(res.data.data.tranType=='火运'){
 							if(res.data.data.tranCarInfoList.length>0){
@@ -843,7 +894,11 @@
 								this.detailData.receiveDateEnd =
 								            res.data.data.tranCarInfoList[0].receiveDateEnd
 								this.detailData.carModel = res.data.data.tranCarInfoList[0].carModel
-								this.freightspace=res.data.data.tranCarInfoList
+								if(this.carNo){
+									this.freightspace=res.data.data.carInfoList
+								}else{
+									this.freightspace=res.data.data.tranCarInfoList
+								}
 							}
 						}else if(res.data.data.tranType=='汽运'){
 							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
@@ -858,11 +913,13 @@
 											}
 										}
 									}
-									
-									
 								}
 							}
-							this.freightspace=res.data.data.tranCarInfoList
+							if(this.carNo){
+								this.freightspace=res.data.data.carInfoList
+							}else{
+								this.freightspace=res.data.data.tranCarInfoList
+							}
 						}else if(res.data.data.tranType=='船运'){
 							if (res.data.data.tranCarInfoList.length > 0) {
 								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
@@ -886,12 +943,16 @@
 							            if(this.detailData.tranCarInfoList[0].unloadPoundImg){
 							              this.pictureTotal =  this.detailData.tranCarInfoList[0].unloadPoundImg.split(",")
 							            }
-							            this.freightspace = res.data.data.tranCarInfoList
+							            if(this.carNo){
+							            	this.freightspace=res.data.data.carInfoList
+							            }else{
+							            	this.freightspace=res.data.data.tranCarInfoList
+							            }
 							          }
 						}
 						
 					}
-					console.log(this.imgUrl)
+					// console.log(this.imgUrl)
 				})
 			},
 			getImgUrl(res1,res2,res3,res4) {
@@ -979,7 +1040,7 @@
 			position: fixed;
 			bottom:0;
 			display: flex;
-			z-index: 2;
+			z-index: 11;
 			left: 0;
 			background-color: #f8f8f8;
 			flex-direction: column;
@@ -1086,4 +1147,11 @@
 	// 	display: flex;
 	// 	z-index: 9999;
 	// }
+	.statusitem{
+		padding:10rpx;
+	}
+	.statusitem.active{
+		background:#19be6b;
+		color:#fff;
+	}
 </style>