优化

pages.json

@@ -1337,7 +1337,25 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		
+
+		{
+			"path": "pages/pda/feeding/index/index",
+			"style": {
+				"navigationBarTitleText": "投料",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+
+		{
+			"path": "pages/pda/feeding/details",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+
+
 		{
 			"path": "pages/pda/picking/bill/index",
 			"style": {
@@ -1406,7 +1424,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		
+
 		{
 			"path": "pages/pda/workOrder/search/index",
 			"style": {

pages/pda/components/bottomOperate.vue

@@ -42,7 +42,7 @@
 						},
 						{
 							name: '投料',
-							type: ''
+							type: 'feeding'
 						},
 						{
 							name: '报工',

pages/pda/feeding/details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/pda/feeding/index/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/pda/picking/components/instanceBom.vue

@@ -4,7 +4,7 @@
 
 		<view class="material rx-ss" v-for="(mate, idx) in list">
 			<view class="left rx-ss" @click="getDelete(idx)">
-					<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+				<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
 			</view>
 			<view class="content_table">
 				<view class="item">
@@ -18,22 +18,24 @@
 					<view class="lable rx-cc">名称</view>
 					<view class="content">{{mate.name}}</view>
 				</view>
-				 
-				
-				<view class="item" v-for="(itm, index) in tableH(4)" :key="index" >
+
+
+				<view class="item" v-for="(itm, index) in tableH(4)" :key="index">
 					<view class="lable rx-cc">{{ itm.label }}</view>
 					<view class="content">{{ mate[itm.prop] }}</view>
-				
+
 				</view>
-				
+
 
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
-				<view class="content content_num">
-					<input  class="uni-input"  v-model="mate.demandQuantity"  @blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity' type="digit"></input>
-					<view class="unit">/{{mate.unit}}</view>
-					<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }})</view>
-				</view>
+					<view class="content content_num">
+						<input class="uni-input" v-model="mate.demandQuantity"
+							@blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity'
+							type="digit"></input>
+						<view class="unit">/{{mate.unit}}</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }})</view>
+					</view>
 				</view>
 
 
@@ -41,7 +43,7 @@
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
 					<view class="content ">
-						 {{ mate.pathName }}
+						{{ mate.pathName }}
 					</view>
 				</view>
 
@@ -63,9 +65,9 @@
 			}
 		},
 		methods: {
-	tableH(type) {
-		return tableHeader(type)
-	},
+			tableH(type) {
+				return tableHeader(type)
+			},
 
 			getDelete(idx) {
 				this.list.splice(idx, 1)
@@ -137,13 +139,13 @@
 				}
 
 				.content_num {
-					
+
 					display: flex;
 					align-items: center;
 					padding: 0 4rpx;
 
 					/deep/ .uni-input-input {
-						width: 200rpx ;
+						width: 200rpx;
 						border: 2rpx solid #F0F8F2;
 						background: #F0F8F2;
 						color: $theme-color;

pages/pda/picking/details.vue

@@ -82,7 +82,7 @@
 		</view>
 
 		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">确认</view>
+			<view class="btn_box" @click="save">提交</view>
 
 		</view>
 

pages/pda/picking/index/index.vue

@@ -5,19 +5,24 @@
 		</uni-nav-bar>
 
 		<view class="top-wrapper">
-			<view class="tab_box rx-sc">
+		<!-- 	<view class="tab_box rx-sc">
 				<view class="tab_item" :class="{active: tabType == 1}" @click="handTab(1)">生产工单列表</view>
 				<view class="tab_item" :class="{active: tabType == 2}" @click="handTab(2)">领料工单列表</view>
-			</view>
+			</view> -->
 
-			<view class="nav_box rx-sc" v-if='tabType == 1'>
+			<view class="nav_box rx-sc">
 				<view class="nav_item " :class="{active: pickStatus == 0}" @click="handNav(0)">未领料({{navObj.unclaimedQuantity}})</view>
 				<view class="nav_item" :class="{active: pickStatus == 1}" @click="handNav(1)">已领料({{navObj.claimedQuantity}})</view>
+				<view class="nav_item" :class="{active: pickStatus == 2}" @click="handNav(2)">已出库(0)</view>
+				
+				
+				
 			</view>
 		</view>
 
 		<view class="list_box">
-			<u-list @scrolltolower="scrolltolower" v-if="tabType == 1">
+     
+			<u-list @scrolltolower="scrolltolower">
 				<pickCard v-if='dataList.length' :list="dataList"> </pickCard>
 				
 				
@@ -28,6 +33,8 @@
 				
 			</u-list>
 
+	
+
 		</view>
 
 		<view class="bottom-wrapper rx-bc" v-if='pickStatus == 0'>
@@ -93,7 +100,7 @@
 
 		onShow() {
 			this.page = 1
-				this.dataList = []
+				// this.dataList = []
 			this.getList()
 			this.getpickTics()
 		},
@@ -286,4 +293,8 @@
 			border-color: $theme-color !important;
 		}
 	}
+	
+	.load-more{
+		height: 100%;
+	}
 </style>

pages/pda/workOrder/extrusionMolding/index.vue

@@ -219,6 +219,13 @@
 				uni.navigateTo({
 					url
 				})
+				} else if(type == 'feeding') {
+					url = '/pages/pda/feeding/details'
+					let _arr = JSON.stringify([ this.info.id ])
+					url += `?arr=${encodeURIComponent(_arr)}&taskName=${this.info.taskName}`
+					uni.navigateTo({
+						url
+					})
 				}
 	
 			},