优化

pages/pda/picking/bill/components/common.js

@@ -51,18 +51,7 @@ export const tableHeader = selectEquiType => {
 				prop: 'materialQuality',
 			
 			},
-			{
-				label: '长宽高',
-				prop: '',
-				formatter(row) {
-					if (!row?.extInfo) return ''
-					const extendField = row.extInfo
-					return `${extendField.vehicleLen || '-'}*${extendField.wilde || '-'}*${
-										  extendField.hight || '-'
-										}`
-			
-				}
-			}
+		
 			]
 
 
@@ -80,18 +69,6 @@ export const tableHeader = selectEquiType => {
 					prop: 'slotNum'
 				},
 
-
-			{
-					label: '长宽高',
-					prop: '',
-					formatter(row) {
-						if (!row?.extInfo) return ''
-						const extendField = row.extInfo
-						return `${extendField.palletLen || '-'}*${extendField.wilde || '-'}*${
-			  extendField.hight || '-'
-			}`
-					}
-				}
 			]
 		case 10:
 			return []

pages/pda/picking/bill/components/instanceBom.vue

@@ -4,7 +4,7 @@
 
 		<view class="material rx-ss" v-for="(mate, idx) in list">
 
-			<view class="content_table">
+			<view class="content_table" >
 				<view class="item">
 					<view class="lable rx-cc">编码</view>
 					<view class="content">
@@ -14,20 +14,20 @@
 
 				<view class="item">
 					<view class="lable rx-cc">名称</view>
-					<view class="content">{{mate.categoryName}}</view>
+					<view class="content" style="color: rgb(255 170 42)">{{mate.categoryName}}</view>
 				</view>
 
 
 				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index"
 					v-if="!itm.formatter">
 					<view class="lable rx-cc">{{ itm.label }}</view>
-					<view class="content">{{ mate[itm.prop] }}</view>
+					<view class="content"  > {{ mate[itm.prop] }}</view>
 
 				</view>
 
-				<view v-for="(itm, index) in tableH(item.rootCategoryLevelId)" :key="index" class="items"
+				<view v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index" class="items"
 					v-if="itm.formatter">
-					{{ itm.label }}：{{ itm.formatter(item) }}
+					{{ itm.label }}：{{ itm.formatter(mate) }}
 				</view>
 
 

pages/pda/picking/bill/index.vue

@@ -7,6 +7,8 @@
 		<view class="list_box">
 
 			<u-list @scrolltolower="scrolltolower" key="dataList">
+				
+	
 
 				<view class="card_box cx-sc" v-for="(item, index) in dataList" :key="index">
 
@@ -21,9 +23,13 @@
 
 					<view v-for="(it,idx) in item.orderInfoList" :key='idx'>
 						<view class="word_order ">工单编号:{{it.code}}</view>
+						
+						<view v-if='it.arr.length == 0' style='margin-top: 10px;'>
+							<u-empty iconSize='80' textSize='32' text='未领料'>
+							</u-empty>
+						</view>
 
-						<instanceBom :list='it.bomDetailDTOS'></instanceBom>
-						<instanceBom :list='it.instanceList'></instanceBom>
+						<instanceBom :list='it.arr'></instanceBom>
 
 
 					</view>
@@ -42,7 +48,7 @@
 
 
 		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">一键报工</view>
+			<!-- <view class="btn_box" @click="save">一键报工</view> -->
 		</view>
 
 
@@ -89,9 +95,26 @@
 
 
 				const res = await pickDetails(this.ids)
-
-
-				this.dataList = res
+                 	let list = res
+					list.forEach(m => {
+						if(m.orderInfoList.length > 0) {
+							m.orderInfoList.forEach(o => {
+									let _arr = []
+									 _arr = [...o.bomDetailDTOS, ...o.instanceList]
+									_arr = _arr.sort((a, b) => a.rootCategoryLevelId - b.rootCategoryLevelId)
+									o['arr'] = _arr
+								
+							})
+						
+	
+						
+						} 
+					})
+					this.dataList = list
+					
+					
+
+		
 
 			},
 

pages/pda/picking/details.vue

@@ -157,7 +157,7 @@
 
 
 						selectList.forEach(f => {
-							if (f.rootCategoryLevelId == 1) { // 投料
+							if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8 ) { // 投料
 								f.automatic = 1
 								instanceList2 = instanceList2.concat(f)
 							} else if (f.rootCategoryLevelId == 5) { // 模具

pages/pda/workOrder/search/index.vue

@@ -48,10 +48,6 @@
 									{{ itm.label }}：{{ item[itm.prop] }}
 								</view>
 
-								<view v-for="(itm, index) in tableH(item.rootCategoryLevelId)" :key="index"
-									class="items" v-if="itm.formatter">
-									{{ itm.label }}：{{ itm.formatter(item) }}
-								</view>
 
 
 
@@ -311,7 +307,7 @@
 				if (this.isType == 'feed') {
 					params.ids = [1, 4, 5, 8, 10, 11, 14]
 				} else if (this.isType == 'pick') {
-					params.ids = [1, 5, 7, 8, 10, 14]
+					params.ids = [1, 5,  8, 10, 14]
 				} else if (this.isType == 'job') {
 					params['ids'] = [4, 7]
 				}