前端

pages/erp/deliveryfeedback/list.vue

@@ -10,32 +10,35 @@
 		</view>
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
-				<view class="row bold">
-					<view class="left">{{item.processNo}}</view>
-					<view>{{item.tranType}}</view>
+				<view style='padding:20px 5px 13px;border-bottom:1px solid #EEEEEE;' class="row">
+					<view style='font-size:14px;' class="left">{{item.processNo}}</view>
+					<view style='color:#22C572;'>{{item.tranType}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view class="left">{{item.goodsName}}</view>
+				<view style='font-size:13px;' class="row">
+					<view style='color:#9698A2;' class="left">{{item.goodsName}}</view>
 					<view>{{item.weight}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">发货</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">发货</view>
 					<view style='flex:2;text-align:right;'>{{item.send}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">收货</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">收货</view>
 					<view style='flex:2;text-align:right;'>{{item.receive}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">运输周期</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">运输周期</view>
 					<view style='flex:2;text-align:right;'>{{item.deliveryDateStart}} ~ {{item.deliveryDateEnd}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">{{item.feedbackStatus}}</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">{{item.feedbackStatus}}</view>
 					<view style='flex:2;text-align:right;'>{{item.createDate}}</view>
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 	</view>
 </template>
 
@@ -49,6 +52,7 @@
 				currentPage: 1,
 				pageSize: 10,
 				positionId: "",
+				isContent:false,
 				binNumber: "",
 				status: '执行中',
 				positionName: '',
@@ -91,6 +95,9 @@
 					if (res.data.code == 200) {
 						var data=res.data.data.records
 						this.dataList = this.dataList.concat(data)
+						if(res.data.data.records.length==0){
+							this.isContent=true
+						}
 					}
 				})
 			},
@@ -128,8 +135,8 @@
 	}
 
 	.content2 {
-		background: white;
-		margin:10px;
+		// background: white;
+		margin:10px 0;
 		border-radius:10px;
 		.row {
 			display: flex;
@@ -154,8 +161,10 @@
 
 	.content2-item {
 		// margin: 0 20rpx 20rpx 20rpx;
-		margin:0 10px;
-		// padding: 10rpx;
+		margin:10px;
+		background:#fff;
+		padding:0 20rpx;
+		border-radius:10px;
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.content2-item:last-child{

pages/erp/receivingfeedback/list.vue

@@ -10,32 +10,35 @@
 		</view>
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
-				<view class="row bold">
-					<view class="left">{{item.processNo}}</view>
-					<view>{{item.tranType}}</view>
+				<view style='padding:20px 5px 13px;border-bottom:1px solid #EEEEEE;' class="row">
+					<view style='font-size:14px;' class="left">{{item.processNo}}</view>
+					<view style='color:#22C572;'>{{item.tranType}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view class="left">{{item.goodsName}}</view>
+				<view style='font-size:13px;' class="row">
+					<view style='color:#9698A2;' class="left">{{item.goodsName}}</view>
 					<view>{{item.weight}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">发货</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">发货</view>
 					<view style='flex:2;text-align:right;'>{{item.send}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">收货</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">收货</view>
 					<view style='flex:2;text-align:right;'>{{item.receive}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">运输周期</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">运输周期</view>
 					<view style='flex:2;text-align:right;'>{{item.deliveryDateStart}} ~ {{item.deliveryDateEnd}}</view>
 				</view>
-				<view style='color:#878C9C;font-size:14px;' class="row">
-					<view style='flex:1;' class="left">{{item.feedbackStatus}}</view>
+				<view style='font-size:14px;' class="row">
+					<view style='flex:1;color:#9698A2;' class="left">{{item.feedbackStatus}}</view>
 					<view style='flex:2;text-align:right;'>{{item.createDate}}</view>
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 	</view>
 </template>
 
@@ -48,6 +51,7 @@
 				show2: false,
 				currentPage: 1,
 				pageSize: 10,
+				isContent:false,
 				positionId: "",
 				binNumber: "",
 				status: '执行中',
@@ -76,6 +80,11 @@
 			this.warehouseId = _data.warehouseId
 			this.getList()
 		},
+		onReachBottom() {
+			 this.currentPage+=1
+		    this.getList(false)
+			// this.getMoreNews()
+		},
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/tranProcessInfo/selectTranProcessInfo', {
@@ -84,7 +93,11 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.dataList = res.data.data.records
+						var data=res.data.data.records
+						this.dataList = this.dataList.concat(data)
+						if(res.data.data.records.length==0){
+							this.isContent=true
+						}
 					}
 				})
 			},
@@ -122,8 +135,8 @@
 	}
 
 	.content2 {
-		background: white;
-		margin:10px;
+		// background: white;
+		margin:10px 0;
 		border-radius:10px;
 		.row {
 			display: flex;
@@ -148,8 +161,10 @@
 
 	.content2-item {
 		// margin: 0 20rpx 20rpx 20rpx;
-		margin:0 10px;
-		// padding: 10rpx;
+		margin:10px;
+		background:#fff;
+		padding:0 20rpx;
+		border-radius:10px;
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.content2-item:last-child{