优化

pages/pda/feeding/bill/index.vue

@@ -16,7 +16,7 @@
 			
 		}
 	}
-</script>
+</script> 
 
 <style lang="scss" scoped>
 	.content-box {

pages/pda/feeding/details.vue

@@ -194,8 +194,8 @@
 				// CX-EQ-YLSJL-008	  设备
 				// M001 M002 模具 
 				//  S310000552731 物料
-				// this.scanItData('M002', id)
-				// return false
+				this.scanItData('M002', id)
+				return false
 
 				let _this = this
 				uni.scanCode({
@@ -325,6 +325,7 @@
 		overflow: hidden;
 		display: flex;
 		flex-direction: column;
+		
 
 	}
 

pages/pda/workOrder/search/index.vue

@@ -88,6 +88,8 @@
 
 		<ba-tree-picker ref="treePicker" key="verify" :multiple="false" @select-change="confirm" title="选择分类"
 			:localdata="classificationList" valueKey="id" textKey="name" childrenKey="children" />
+			
+			<matterPop v-if='matterShow' @close='close'></matterPop>
 
 	</view>
 </template>
@@ -102,9 +104,11 @@
 		pageeLedgerMain,
 		assetPage
 	} from '@/api/pda/workOrder.js'
+	import matterPop from './matterPop.vue'
 	export default {
 		components: {
-			baTreePicker
+			baTreePicker,
+			matterPop
 		},
 		data() {
 			return {
@@ -122,7 +126,9 @@
 				isType: null,
 
 				pid: null, // 上个页面id
-				storageKey: null
+				storageKey: null,
+				
+				matterShow: false
 			}
 		},
 
@@ -204,32 +210,10 @@
 			},
 
 			confirm(id, name) {
-				
-				// console.log(this.getParentNodeId(this.classificationList, id))
-			
 				this.categoryLevelId = id
 				this.getList()
 			},
-			
-			 getParentNodeId(tree, childId) {
-			  // 遍历树节点
-			  for (let node of tree) {
-			    // 如果当前节点就是目标节点的父节点，直接返回当前节点id
-			    if (node.children && node.children.some(child => child.id === childId)) {
-			      return node.id;
-			    }
-			    // 否则继续遍历当前节点的子节点
-			    if (node.children) {
-			      const parentId = getParentNodeId(node.children, childId);
-			      if (parentId !== null) {
-			        return parentId;
-			      }
-			    }
-			  }
-			  // 如果没有找到父节点，则返回null
-			  return null;
-			},
-			 
+
 		
 
 			getList() {
@@ -290,25 +274,35 @@
 
 			//勾选
 			selectVal(e, val, index) {
-				this.list[index].checked = !this.list[index].checked
-
-				this.seletedAll = !this.list.some(item => !item.checked)
-
-				const idx = this.memoList.findIndex(
-					item => item.id === this.list[index].id
-				)
-
-				if (this.list[index].checked) {
-					if (idx === -1) {
-						this.memoList.push(this.list[index])
-					}
-				} else {
-					if (idx > -1) {
-						this.memoList.splice(idx, 1)
+                if(this.isType == 'pick') {
+					this.list[index].checked = !this.list[index].checked
+					
+					this.seletedAll = !this.list.some(item => !item.checked)
+					
+					const idx = this.memoList.findIndex(
+						item => item.id === this.list[index].id
+					)
+					
+					if (this.list[index].checked) {
+						if (idx === -1) {
+							this.memoList.push(this.list[index])
+						}
+					} else {
+						if (idx > -1) {
+							this.memoList.splice(idx, 1)
+						}
 					}
+				} else if(this.isType == 'feed') {
+					this.matterShow = true
 				}
+				
+				
 
 
+			},
+			
+			close() {
+				this.matterShow = false
 			},
 
 			//跳转回添加页面

pages/pda/workOrder/search/matterPop.vue

@@ -0,0 +1,76 @@
+<template>
+	<view>
+		<u-popup :show="show" duration='300' :mode='mode' :closeOnClickOverlay='false'>
+			<view class="content-box">
+
+				<view class="list_box">
+					<u-list @scrolltolower="scrolltolower">
+
+					</u-list>
+				</view>
+
+				<view class="operate_box rx-sc">
+					<u-button size="small" class="u-reset-button" @click="handleClose">取消</u-button>
+					<u-button size="small" class="u-reset-button" type="success" @click="save">确认 </u-button>
+				</view>
+
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: true,
+				mode: 'right'
+			}
+		},
+		methods: {
+			scrolltolower() {},
+			
+			save() {
+				
+			},
+			handleClose() {
+				this.$emit('close')
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-box {
+		width: 80vw;
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		background-color: $page-bg;
+	}
+
+
+	.list_box {
+		flex: 1;
+		overflow: hidden;
+		padding: 4rpx 0;
+
+		.u-list {
+			height: 100% !important;
+		}
+
+
+
+
+	}
+
+	.operate_box {
+		background-color: #fff;
+		padding: 10rpx 100rpx;
+
+		/deep/ .u-button {
+			width: 160rpx;
+		}
+	}
+</style>