Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageD/warehousings/warehousings.vue

@@ -62,11 +62,12 @@
 					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
 				</view>
 				</view>
-				<view class="cu-form-group">
-					<view class="title">入库类型</view>
-					<picker @change="packingChange" :value="packingIndex" :range="packingType">
-						<view class="picker">
-							{{packingIndex>-1?packingType[packingIndex]:'请选择入库类型'}}
+				
+				<view class="c-row b-b">
+					<text class="tit">入库类型 </text>
+					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
+						<view class="con-list">
+							{{ruIndex>-1?ruType[ruIndex]:'请选择入库类型'}}
 						</view>
 					</picker>
 				</view>
@@ -163,8 +164,17 @@
 				},
 				pinIndex: 0,
 				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				ruIndex: 0,
+				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
 			}
 		},
+		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() {
@@ -180,6 +190,10 @@
 					})
 				})
 			},
+			ruChange(e){
+				this.ruIndex = e.detail.value
+				this.rutypes = this.ruType[this.ruIndex];
+			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
 				this.pintypes = this.pinType[this.pinIndex];

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 {