zhangyuewww 3 năm trước cách đây
mục cha
commit
8aad47e5c7
2 tập tin đã thay đổi với 26 bổ sung41 xóa
  1. 3 0
      pageD/warehousings/warehousingDetails.vue
  2. 23 41
      pages/task/my_task.vue

+ 3 - 0
pageD/warehousings/warehousingDetails.vue

@@ -168,6 +168,7 @@
 			return {
 				warehouseInOutInfo: {},
 				WarehouseInOutDetail: {},
+				procurementPlanInfos:{}
 			}
 		},
 		onLoad(options){
@@ -184,6 +185,8 @@
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					console.log(res)
 					this.procurementPlanInfos = res.data.data
+					this.warehouseInOutInfo = res.data.data
+					this.WarehouseInOutDetail = this.warehouseInOutInfo.warehouseInOutDetail
 					console.log(this.procurementPlanInfos,"对象")
 					
 				})

+ 23 - 41
pages/task/my_task.vue

@@ -15,10 +15,12 @@
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="price-box">
 					<view class='tag tag-bule radius line-pink'>入库任务</view>
-					<view class="title">辽H12345(C001){{item.car_no}}{{item.tran_car_no}}</view>
+					<view class="title">{{item.carNo}}({{item.tranCarNo}})</view>
+					<view  class="title-tip" v-if="item.statusFlag==3">已完成</view>
+					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
 				</view>
-				<view class="titles ">CG12345678{{item.contract_no}}</view>
-				<view class="titles titleds_aa">2021-06-30{{item.predict_date}}</view>
+				<view class="titles ">{{item.contractNo}}</view>
+				<view class="titles titleds_aa">{{item.inOutDate}}</view>
 			</view>
 			<view v-show="isLoadMore">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -41,6 +43,7 @@
 				showTran: true,
 				scrollTop: 0,
 				statusFlag: 1,
+				//status:'未完成',
 				TabCur: 0,
 				current: 1,
 				warehouseInOutInfo: {
@@ -62,11 +65,12 @@
 				var limit = that.limit
 				console.log(2112454)
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
-					console.log(res,"对象")
+					console.log(res, "对象")
 					if (res.data.code == 200) {
 						let data = res.data.data.records
-						console.log(data,"13246")
+						console.log(data, "13246")
 						//采购信息
 						if (data.length > 0) {
 							that.taskInfo = that.taskInfo.concat(data)
@@ -79,6 +83,7 @@
 							that.loadStatus = 'nomore'
 						}
 						uni.hideLoading()
+						this.taskInfo = res.data.data.records
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -94,17 +99,21 @@
 					})
 				})
 			},
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.category = this.TabCur
+				this.pageSize = 1
+				this.loadData()
+			},
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
 				this.pageSize = 1
 				this.getIndexBuyData()
 			},
-			navToDetailPage(item){
+			navToDetailPage(item) {
 				uni.navigateTo({
-				      url: `/pageD/myRelease/sellGrain?contractNo=${item.contractNo}&goodsName=${item.goodsName}
-					  &startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}
-					  &warehouseName=${item.warehouseName}`
-				     })
+					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+				})
 			}
 
 		}
@@ -158,8 +167,9 @@
 	}
 
 	.title-tip {
-		color: #E63113;
-		text-align: right;
+		color: #00aa00;
+		text-align: center;
+		font-size: 7px;
 	}
 
 	.tag-bule {
@@ -239,34 +249,6 @@
 			line-height: 1;
 			padding-right: 10upx;
 		}
-
-		.goods1 {
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-
-		.goods2 {
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-
-		.goods3 {
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-
-		.goods4 {
-			font-size: $font-sm;
-			color: #ff5500;
-		}
-
-		.goods5 {
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-
 		.view-item {
 			width: 100%;
 			// line-height: 40upx;
@@ -467,7 +449,7 @@
 		}
 
 		.price {
-			font-size: $font-lg + 2upx;
+			font-size: 15px;
 		}
 
 		.m-price {