zxz před 3 roky
rodič
revize
ce1ee159a3
2 změnil soubory, kde provedl 19 přidání a 11 odebrání
  1. 7 0
      pageD/warehousings/warehousings.vue
  2. 12 11
      pages/task/my_task.vue

+ 7 - 0
pageD/warehousings/warehousings.vue

@@ -165,6 +165,13 @@
 				pinType: ['不限(默认)', '一等品', '二等品', '三等品', '等外'],
 			}
 		},
+		onLoad(option){
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.startNetWeight = option.startNetWeight
+			this.WarehouseInOutInfo.carNo = option.carNo+'('+ option.tranCarNo+ ')'
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+		},
 		methods: {
 
 			commit() {

+ 12 - 11
pages/task/my_task.vue

@@ -8,8 +8,8 @@
 
 		</view>
 		<view style='background:#fff;padding:0 145px;display:table-footer-group ;'>
-			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>未完成</view>
-			<view @click='tabcarchange(3)' class='line' :class='TabCur==3?"active":""'>已完成</view>
+			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
@@ -43,8 +43,6 @@
 				showTran: true,
 				scrollTop: 0,
 				statusFlag: 1,
-				//status:'未完成',
-				TabCur: 0,
 				current: 1,
 				warehouseInOutInfo: {
 					pageSize: 10,
@@ -99,21 +97,24 @@
 					})
 				})
 			},
-			// 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) {
+				console.log(item)
+				if(item.statusFlag == 3){
 				uni.navigateTo({
 					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
 				})
+				}else{
+					uni.navigateTo({
+						url: `/pageD/warehousings/warehousings?id=${item.id}&contractNo=${item.contractNo}
+						&goodsName=${item.goodsName}&startNetWeight=${item.startNetWeight}
+						&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+					})
+				}
 			}
 
 		}
@@ -173,7 +174,7 @@
 	}
 
 	.tag-bule {
-		background: #8fe08b;
+		background: #a8e4a5;
 		color: #000000;
 	}
 	.tag {