优化

pages/pda/picking/components/modelBom.vue

@@ -1,200 +0,0 @@
-<template>
-	<view>
-		<view class="title_box rx-bc">
-			<view class="name">模具信息</view>
-
-
-		</view>
-
-
-		<view class="material ">
-
-		</view>
-
-
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			workOrderId: {
-				type: String,
-				default: ''
-			},
-			list: {
-				type: Array,
-				default: () => []
-			},
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			tableH(type) {
-				return tableHeader(type)
-			},
-
-			handleScan(id) {
-				this.$emit('scanIt', id)
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.title_box {
-		margin-top: 20rpx;
-
-		.name {
-			font-size: 28rpx;
-			font-style: normal;
-			font-weight: 400;
-			color: $theme-color;
-			padding-left: 20rpx;
-
-			position: relative;
-
-			&:before {
-				position: absolute;
-				content: '';
-				left: 0rpx;
-				top: 0rpx;
-				bottom: 0rpx;
-				width: 4rpx;
-				height: 28rpx;
-				background: $theme-color;
-				margin: auto;
-			}
-
-
-		}
-
-		.btn_box {
-			padding: 0 18rpx;
-			height: 60rpx;
-			background: $theme-color;
-			font-size: 26rpx;
-			font-style: normal;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #fff;
-			border-radius: 4rpx;
-
-			.scan {
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 12rpx;
-
-			}
-
-		}
-
-	}
-
-
-	.material {
-		margin-top: 10rpx;
-
-
-
-		.content_table {
-			width: 100%;
-			border: 2rpx solid $border-color;
-
-			.item {
-				display: flex;
-				border-bottom: 1rpx dotted $border-color;
-
-
-				.lable {
-					width: 132rpx;
-					text-align: center;
-					background-color: #F7F9FA;
-					font-size: 26rpx;
-					border-right: 2rpx solid $border-color;
-					flex-shrink: 0;
-				}
-
-				.lable150 {
-					width: 156rpx !important;
-					font-size: 24rpx;
-				}
-
-
-				.lable300 {
-					width: 300rpx !important;
-					padding-left: 14rpx;
-					font-size: 24rpx;
-				}
-
-
-				.ww80 {
-					width: 80rpx;
-				}
-
-				.content {
-					width: 518rpx;
-					min-height: 64rpx;
-					font-size: 28rpx;
-					line-height: 28rpx;
-					font-style: normal;
-					font-weight: 400;
-					padding: 18rpx 8rpx;
-					box-sizing: border-box;
-					word-wrap: break-word;
-					flex-grow: 1 !important;
-
-
-					.unit {
-						padding: 0 4rpx;
-						font-size: 24rpx;
-						color: #404446;
-					}
-
-				}
-
-				.content_num {
-					display: flex;
-					align-items: center;
-					padding: 0 4rpx;
-
-					/deep/ .uni-input-input {
-						border: 2rpx solid #F0F8F2;
-						background: #F0F8F2;
-						color: $theme-color;
-					}
-
-
-				}
-
-				.pd4 {
-					padding: 4rpx 8rpx;
-				}
-
-
-
-				&:last-child {
-					border-bottom: none;
-				}
-			}
-
-
-			.bot_border {
-				border-bottom: 2rpx solid $theme-color;
-			}
-
-			.ww55 {
-				width: 55%;
-			}
-
-			.ww45 {
-				width: 45%;
-			}
-		}
-
-
-	}
-</style>

pages/pda/picking/details.vue

@@ -48,7 +48,7 @@
 									<view class="content ">{{mate.brandNum}}</view>
 								</view>
 
-								<view class="rx ww45" >
+								<view class="rx ww45">
 									<view class="lable rx-cc ww80">数量</view>
 									<view class="content content_num">
 										<input class="uni-input" v-model="mate.demandQuantity" type="digit"></input>
@@ -74,12 +74,13 @@
 
 					<view>
 						<instanceBom :list='item.instanceList'></instanceBom>
-			
-							<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId' :list='item.modelList'	>
-							</modelBom>
-						
-						
-						
+
+						<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId'
+							:list='item.modelList'>
+						</modelBom>
+
+
+
 					</view>
 
 				</view>
@@ -99,7 +100,7 @@
 
 <script>
 	import instanceBom from './components/instanceBom.vue'
-	import modelBom from './components/modelBom.vue'
+	import modelBom from '../feeding/components/modelBom.vue'
 	import {
 		workorderList
 	} from '@/api/pda/workOrder.js'
@@ -148,10 +149,10 @@
 						selectList.forEach(f => {
 							if (f.rootCategoryLevelId == 1) {
 								instanceList = instanceList.concat(f)
-							} else if(f.rootCategoryLevelId == 5) {
+							} else if (f.rootCategoryLevelId == 5) {
 								modelList = modelList.concat(f)
-								
-							
+
+
 							}
 						})
 
@@ -195,7 +196,7 @@
 					ids: this.idsList,
 					taskId: this.taskId
 				}).then(res => {
-				
+
 
 					this.List = res.map(m => {
 						m.workOrderId = m.id
@@ -211,12 +212,12 @@
 				})
 			},
 
-	
+
 
 			addPicking(id, item) {
 				const storageKey = Date.now() + "";
-				
-			   let arr = [...item.instanceList, ...item.modelList]
+
+				let arr = [...item.instanceList, ...item.modelList]
 				uni.setStorageSync(storageKey, arr);
 				uni.navigateTo({
 					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=pick`

pages/pda/workOrder/search/index.vue

@@ -303,7 +303,7 @@
 				let URL = null
 				if (this.isType == 'pick') { // 领料
 					param.dimension = 1
-					URL = pageeLedgerMain
+					URL = this.rootCategoryLevelId == 1 ? pageeLedgerMain : assetPage
 				} else if (this.isType == 'feed') { // 投料
 					URL = assetPage
 				} else if (this.isType == 'job') { // 报工