ysy před 2 roky
rodič
revize
b35d8faea7

+ 38 - 6
pages/pda/feeding/details.vue

@@ -1,6 +1,8 @@
 <template>
-	<view>
-		
+	<view class="content-box">
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" :title="title" background-color="#F7F9FA"
+			color="#000" @clickLeft="back"></uni-nav-bar>
+
 	</view>
 </template>
 
@@ -8,15 +10,45 @@
 	export default {
 		data() {
 			return {
-				
+				title: '',
+				dataObj: {
+					
+				},
 			}
 		},
+
+
+		onLoad(options) {
+			this.title = options.taskName
+
+
+
+
+
+		},
+
 		methods: {
-			
+			// 相机扫码
+			HandlScanCode() {
+				let _this = this
+				uni.scanCode({
+					success: function(res) {
+						console.log(res)
+					}
+				})
+				//_this.Scancodedate('res')
+			},
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
 
-</style>
+	}
+</style>

+ 3 - 4
pages/pda/feeding/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		
+      
 	</view>
 </template>
 
@@ -8,15 +8,14 @@
 	export default {
 		data() {
 			return {
-				
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
 <style>
 
-</style>
+</style>

+ 1 - 1
pages/pda/picking/components/pickCard.vue

@@ -10,7 +10,7 @@
 							
 						<view class="orderId">{{item.code}} </view>
 					</view>
-					<view class="status FAA" :class="[item.pickStatus == 0 ? 'FAA': '' ]"> {{ item.pickStatus == 0 ? '未领料' : '已领料' }}</view>
+					<view class="status " :class="[item.pickStatus == 0 ? 'FAA': '' ]"> {{ item.pickStatus == 0 ? '未领料' : item.pickStatus == 1 ? '已领料' : item.pickStatus == 2 ? '已出库' : '' }}</view>
 				</view>
 
 				<view class="item_box rx-bc">

+ 1 - 1
pages/pda/picking/details.vue

@@ -51,7 +51,7 @@
 								<view class="rx ww45">
 									<view class="lable rx-cc ww80">数量</view>
 									<view class="content content_num">
-										<input class="uni-input" v-model="mate.needNum" type="digit"></input>
+										<input class="uni-input" v-model="mate.demandQuantity" type="digit"></input>
 										<view class="unit">{{mate.unit}}</view>
 									
 									</view>