优化

api/pda/picking.js

@@ -37,3 +37,13 @@ export async function pickDetails(params) {
   return Promise.reject(data.message);
 }
 
+// pda领料出库单
+export async function pickOutInOrder(params) {
+  const data = await postJ(
+   Vue.prototype.apiUrl  + `/pda/mes/pickorder/pickOutInOrder`, params, true,
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}

pages/pda/feeding/components/instanceBom.vue

@@ -22,6 +22,12 @@
 				</view>
 
 
+				<view class="item" v-if='mate.isConsumable == 0'>
+					<view class="lable rx-cc">重量</view>
+					<view class="content">{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}} </view>
+				</view>
+
+
 				<view class="item" v-if='mate.isConsumable == 0'>
 					<view class="lable rx-cc">刻码</view>
 					<view class="content">{{mate.extInfo.engrave}}</view>
@@ -44,9 +50,6 @@
 
 
 
-
-
-
 				<view class="item" v-if='mate.isConsumable == 0'>
 					<view class="lable rx-cc">位置</view>
 					<view class="content content_num ww400">

pages/pda/jobBooking/components/byProductBom.vue

@@ -23,8 +23,8 @@
 							<input class="uni-input" v-model="item.recycleQuantity" type="digit" v-if="!isDetails"></input>
 							<view v-if="isDetails">{{item.quantity}}</view>
 							<view class="unit">{{item.unit}}</view>
-							<view class="penalize" v-if="!isDetails" :style="{ color: item.warehouseId ? 'rgb(255 170 42)' : ''}" @click="penalize(index)">处置</view>
-                            <view v-if="isDetails"  class="penalize" :style="{ color: item.warehouseId ? 'rgb(255 170 42)' : ''}" @click="handleView(item.warehouseName)">查看</view>
+							<view class="penalize" v-if="!isDetails" :style="{ background: item.warehouseId ? '#FFA07A' : ''}" @click="penalize(index)">处置</view>
+                            <view v-if="isDetails"  class="penalize" :style="{ background: item.warehouseId ? '#FFA07A' : ''}" @click="handleView(item.warehouseName)">查看</view>
 						</view>
 					</view>
 

pages/pda/jobBooking/components/jobBom.vue

@@ -91,9 +91,9 @@
 							<view class="unit">{{item.weightUnit}}</view>
 
 							<view class="penalize" v-if='!isDetails'
-								:style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}" @click="penalize">处置</view>
+								:style="{ background: not.warehouseId ? '#FFA07A' : ''}" @click="penalize">处置</view>
 							<view class="penalize" v-if='isDetails'
-								:style="{ color: not.warehouseId ? 'rgb(255 170 42)' : ''}"
+								:style="{ background: not.warehouseId ? '#FFA07A' : ''}"
 								@click="handleView(item.warehouseName)">查看</view>
 						</view>
 					</view>

pages/pda/jobBooking/components/oneJobBom.vue

@@ -47,7 +47,8 @@
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">物料代号</view>
 						<view class="content content_num">
-							<input class="uni-input" v-model="it.extInfo.materielCode"></input>
+							<view v-if='isDetails'>{{it.extInfo.materielCode }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.materielCode"></input>
 
 						</view>
 					</view>
@@ -55,7 +56,8 @@
 					<view class="rx ww50">
 						<view class="lable lable150 rx-cc ">客户代号</view>
 						<view class="content content_num">
-							<input class="uni-input" v-model="it.extInfo.clientCode"></input>
+							<view v-if='isDetails'>{{it.extInfo.clientCode }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.clientCode"></input>
 						</view>
 					</view>
 
@@ -66,7 +68,8 @@
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">刻码</view>
 						<view class="content content_num ">
-							<input class="uni-input" v-model="it.extInfo.engrave"></input>
+							<view v-if='isDetails'>{{it.extInfo.engrave }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.engrave"></input>
 
 						</view>
 					</view>
@@ -74,7 +77,8 @@
 					<view class="rx ww50">
 						<view class="lable lable150 rx-cc ">位置</view>
 						<view class="content content_num">
-							<input class="uni-input" v-model="it.extInfo.position"></input>
+							<view v-if='isDetails'>{{it.extInfo.position }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.position"></input>
 						</view>
 					</view>
 
@@ -98,13 +102,14 @@
 					<view class="tr row rx-sc">
 						<view class="item ww25">{{it.extInfo.weight}}</view>
 						<view class="item ww25 content_num">
-							<input class="uni-input" v-model="it.extInfo.reportWeight"></input>
+							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.reportWeight"></input>
 						</view>
 						<view class="item ww25" @click="openNumerate(it, idx)">
 							<view class="numerate">点击计算</view>
 						</view>
 						<view class="item ww25">
-                           {{it.extInfo.deal }}
+							{{it.extInfo.taskName }}
 						</view>
 
 					</view>
@@ -121,40 +126,42 @@
 
 		<u-popup :show="show" mode='center' v-if='show' :closeOnClickOverlay='false'>
 			<view class="popup_box">
-				
-			 <view class="content_table2">
-			 	<view class="head row rx-sc">
-			 		<view class="item ww25">物料重量Kg</view>
-			 		<view class="item ww25">坯体密度</view>
-			 		<view class="item ww30">产品密度系数</view>
-			 		<view class="item ww20">标准</view>
-			 	</view>
-			 
-			 	<view class="table">
-			 
-			 		<view class="tr row rx-sc" v-for="(item, index) in rowIt" :key='index'>
-			 			<view class="item ww25 rx-bc">
-						 <view>{{item.deal}}</view>
-						 <view>{{item.weight}}</view>
+
+				<view class="content_table2">
+					<view class="head row rx-sc">
+						<view class="item ww25">物料重量Kg</view>
+						<view class="item ww25">坯体密度</view>
+						<view class="item ww30">产品密度系数</view>
+						<view class="item ww20">标准</view>
+					</view>
+
+					<view class="table">
+
+						<view class="tr row rx-sc" v-for="(item, index) in rowIt" :key='index'>
+							<view class="item ww25 rx-bc">
+								<view>{{item.taskName}}</view>
+								<view style="margin-right: 12rpx;">{{item.weight}}</view>
+							</view>
+							<view class="item ww25 content_num">
+								<input class="uni-input" v-model="item.billet" type="digit"
+									@input="changeInp(item, index)"></input>
+							</view>
+							<view class="item ww30 content_num">
+								<input class="uni-input" v-model="item.density" type="digit"
+									@input="changeInp(item, index)"></input>
+							</view>
+							<view class="item ww20">
+								{{item.result}}
+							</view>
+
 						</view>
-			 			<view class="item ww25 content_num">
-			 			  	<input class="uni-input" v-model="item.billet" type="digit" @input="changeInp(item, index)"></input>
-			 			</view>
-			 			<view class="item ww30 content_num" >
-			 			  	<input class="uni-input" v-model="item.density" type="digit"  @input="changeInp(item, index)"></input>
-			 			</view>
-			 			<view class="item ww20">
-			                 {{item.result}}
-			 			</view>
-			 
-			 		</view>
-				
-			 
-			 	</view>
-				
+
+
+					</view>
+
 					<view class="reportWeight">报工重量: {{reportWeight}}</view>
-			 
-			 </view>
+
+				</view>
 
 
 				<view class="operate_box rx-sc">
@@ -185,6 +192,12 @@
 			list: {
 				type: Array,
 				default: () => []
+			},
+
+			isDetails: {
+				type: Boolean,
+				default: false
+
 			}
 
 
@@ -245,78 +258,113 @@
 
 
 			getSteps() {
-				console.log(this.item)
+
 				getTaskInstanceList(this.item.workOrderId).then(res => {
 					this.stepsList = res
+
 				})
 			},
 
 			openNumerate(row, idx) {
-				if(!row.extInfo.reportWeight) {
-					 uni.showToast({
-					 	icon:'none',
+				if (!row.extInfo.reportWeight) {
+					uni.showToast({
+						icon: 'none',
 						title: '请先输入报工重量'
-					 })
+					})
 					return false
 				}
 				this.reportWeight = row.extInfo.reportWeight
-				this.rowIt = [
-					{
-						 weight: row.extInfo.weight,
-						 billet: 0.45,
-						 density: 0.7,
-						 result: (Number(row.extInfo.weight) / 0.45 * 0.7).toFixed(2),
-						 deal: 'PIP',
-						 idx
-					},
-					
-					{
-						 weight: row.extInfo.weight,
-						 billet: 0.46,
-						 density: 1.1,
-						 result: (Number(row.extInfo.weight) / 0.6* 1.1).toFixed(2) ,
-						 deal: '粗车',
-						  idx
-					},
-					
-					{
-						 weight: row.extInfo.weight,
-						 billet: 0.47,
-						 density: 1.6,
-						 result: (Number(row.extInfo.weight) / 0.47 * 1.6).toFixed(2),
-						 deal: '高温',
-						  idx
-					}
-				]
+
+				if (this.isDetails) {
+					this.rowIt = row.extInfo.calculate
+				} else {
+					this.rowIt = [{
+							weight: row.extInfo.weight,
+							billet: 0.45,
+							density: 0.7,
+							result: (Number(row.extInfo.weight) / 0.45 * 0.7).toFixed(2),
+							taskName: 'PIP',
+							taskCode: '1',
+							idx
+						},
+
+						{
+							weight: row.extInfo.weight,
+							billet: 0.46,
+							density: 1.1,
+							result: (Number(row.extInfo.weight) / 0.6 * 1.1).toFixed(2),
+							taskName: '粗车',
+							taskCode: '2',
+							idx
+						},
+
+						{
+							weight: row.extInfo.weight,
+							billet: 0.47,
+							density: 1.6,
+							result: (Number(row.extInfo.weight) / 0.47 * 1.6).toFixed(2),
+							taskName: '高温',
+							taskCode: '3',
+							idx
+						}
+					]
+				}
+
 				this.show = true
 			},
-			
-			changeInp(item,index) {
-				this.rowIt[index]['result'] =  (Number(item.weight) / item.billet * item.density).toFixed(2)
-		
+
+			changeInp(item, index) {
+				this.rowIt[index]['result'] = (Number(item.weight) / item.billet * item.density).toFixed(2)
+
 			},
 
 			cancel() {
 				this.show = false
 				this.rowIt = []
-				this.reportWeight  = 0
+				this.reportWeight = 0
 			},
 
 			save() {
-	
+
 				let _idx = this.rowIt[0].idx
-				let _deal = null
-				if(this.reportWeight >= this.rowIt[0].result && this.reportWeight < this.rowIt[1].result) {
-					_deal = this.rowIt[0].deal
-				} else if(this.reportWeight >= this.rowIt[1].result && this.reportWeight < this.rowIt[2].result) {
-					_deal = this.rowIt[1].deal
-				} else if(this.reportWeight >= this.rowIt[2].result ) {
-					_deal = this.rowIt[2].deal
+				let _taskCode = null
+				let _taskName = null
+
+				if (this.reportWeight >= this.rowIt[0].result && this.reportWeight < this.rowIt[1].result) {
+					_taskCode = this.rowIt[0].taskCode
+					_taskName = this.rowIt[0].taskName
+				} else if (this.reportWeight >= this.rowIt[1].result && this.reportWeight < this.rowIt[2].result) {
+					_taskCode = this.rowIt[1].taskCode
+					_taskName = this.rowIt[1].taskName
+				} else if (this.reportWeight >= this.rowIt[2].result) {
+					_taskCode = this.rowIt[2].taskCode
+					_taskName = this.rowIt[2].taskName
 				}
-				
-				if(_deal) {
-					this.list[_idx].extInfo.deal = _deal
+
+				if (_taskCode) {
+
+					let _taskId = null
+					this.stepsList.forEach(e => {
+						if (e.taskTypeName == _taskName) {
+							_taskId = e.taskId
+						}
+					})
+					
 					
+
+					if (_taskId == null) {
+						uni.showToast({
+							title: `工序匹配不到${_taskName}`,
+							icon: 'none'
+						})
+						return false
+					}
+
+					this.list[_idx].extInfo.taskCode = _taskCode
+					this.list[_idx].extInfo.taskName = _taskName
+					this.list[_idx].extInfo.calculate = this.rowIt
+					this.list[_idx].extInfo.taskId = _taskId
+
 				}
 				this.cancel()
 			},
@@ -493,12 +541,12 @@
 			.ww25 {
 				width: 25%;
 			}
-			
+
 			.ww30 {
 				width: 30%;
-			
+
 			}
-			
+
 		}
 
 		.head {
@@ -578,7 +626,7 @@
 
 	.popup_box {
 		width: 94vw;
-		padding: 16rpx  12rpx;
+		padding: 16rpx 12rpx;
 		box-sizing: border-box;
 
 	}
@@ -593,7 +641,8 @@
 			width: 160rpx;
 		}
 	}
-	.reportWeight{
+
+	.reportWeight {
 		font-size: 24rpx;
 		font-style: normal;
 		font-weight: 400;

pages/pda/jobBooking/index/index.vue

@@ -23,7 +23,8 @@
 					<jobBom :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'
 						@penalize='penalize' @modeNum='modeNum'></jobBom>
 
-					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0' :item='objData' :list='objData.instanceList'  >
+					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0' :item='objData'
+						:list='objData.instanceList'>
 					</oneJobBom>
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
@@ -345,13 +346,18 @@
 					if (!this.objData.hasOwnProperty('aridRegionList')) {
 						this.objData['aridRegionList'] = []
 					}
-			
-				
-					
-					
+
+					if (!this.objData.hasOwnProperty('instanceList')) {
+						this.objData['instanceList'] = []
+					}
+
+
+
+
+
 					this.objData.palletList = [{
 						categoryLevelId: '',
-						categoryLevelName: '', 
+						categoryLevelName: '',
 						categoryId: '',
 						rootCategoryLevelId: '',
 						code: '',
@@ -379,6 +385,11 @@
 						warehouseId: null, // 处置 仓库id
 					}]
 
+					if (this.objData.instanceList.length > 0) { // 预制体报工
+						this.objData.workReportInfo.formedNum = this.objData.instanceList.length
+					}
+
+
 					this.objData.workReportInfo.formingNum = res.formingNum
 					this.objData.workReportInfo.formingWeight = res.formingWeight
 					this.objData.workReportInfo.unit = res.unit
@@ -509,9 +520,22 @@
 				}
 
 
+				if (this.objData.instanceList.length > 0) {
+					let bol
+					let _i
+					bol = this.objData.instanceList.every((e, i) => {
+						_i = i + 1
+						return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
+					})
 
-
-
+					if (!bol) {
+						uni.showToast({
+							title: `请完善第${_i}处置方式`,
+							icon: 'none'
+						})
+						return false
+					}
+				}
 
 
 

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

@@ -0,0 +1,85 @@
+export const tableHeader = selectEquiType => {
+
+	// model => model    specifications =>  specificationss
+
+
+	// 1：物料；4：生产设备; 5：模具；6：备品备件; 7：周转车；8：舟皿；9：产品；10：消耗材料，11：干燥区，12.质检，13.包装材料，14.工装夹具 ，15.刀具 ,99.其他
+	switch (+selectEquiType) {
+		case 1:
+			return [{
+					label: '型号',
+					prop: 'modelType'
+				},
+				{
+					label: '规格',
+					prop: 'specification'
+				},
+				{
+					label: '牌号',
+					prop: 'brandNum'
+				}
+			]
+		case 5:
+			return [{
+					label: '牌号',
+					prop: 'brandNum'
+				},
+				{
+					label: '型号',
+					prop: 'model'
+				},
+				{
+					label: '模孔数量',
+					prop: 'dieHoleNum'
+				},
+
+				{
+					label: '芯棒直径',
+					prop: 'mandrelDiameter'
+				},
+				{
+					label: '收缩系数',
+					prop: 'shrinkEffictive',
+
+				},
+			]
+
+
+		case 7:
+			return [{
+					label: '规格',
+					prop: 'specifications'
+				},
+				{
+					label: '材质',
+					prop: 'materialQuality',
+
+				},
+
+			]
+
+
+		case 8: //'舟皿'
+			return [{
+					label: '规格',
+					prop: 'specifications'
+				},
+				{
+					label: '型号',
+					prop: 'modelType'
+				},
+				{
+					label: '槽数',
+					prop: 'slotNum'
+				},
+
+			]
+		case 10:
+			return []
+		case 14:
+			return []
+
+	}
+
+	return []
+}

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

@@ -0,0 +1,193 @@
+<template>
+	<view>
+
+
+		<view class="material rx-ss" v-for="(mate, idx) in list">
+
+			<view class="content_table">
+				<view class="item">
+					<view class="lable rx-cc">编码</view>
+					<view class="content">
+						{{mate.categoryId}}
+					</view>
+				</view>
+
+				<view class="item">
+					<view class="lable rx-cc">名称</view>
+					<view class="content" style="color: rgb(255 170 42)">{{mate.name}}</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>
+
+				<view v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index" class="items"
+					v-if="itm.formatter">
+					{{ itm.label }}：{{ itm.formatter(mate) }}
+				</view>
+				
+			
+			<view class="item" v-if='mate.rootCategoryLevelId == 1 && mate.isConsumable == 0'>
+				<view class="lable rx-cc">重量</view>
+				<view class="content ">
+					{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}} 
+				</view>
+			</view>
+			
+						
+			
+			
+			<view class="item" v-if='mate.rootCategoryLevelId == 1 && mate.isConsumable == 0'>
+				<view class="lable rx-cc">刻码</view>
+				<view class="content">{{mate.extInfo.engrave}}</view>
+			</view>
+			
+			
+			<view class="item" v-if='mate.rootCategoryLevelId == 1 && mate.isConsumable == 0'>
+				<view class="lable rx-cc">物料代号</view>
+				<view class="content">{{mate.extInfo.materielCode}}</view>
+			</view>
+			
+			
+			<view class="item" v-if='mate.rootCategoryLevelId == 1 && mate.isConsumable == 0'>
+				<view class="lable rx-cc">客户代号</view>
+				<view class="content">{{mate.extInfo.clientCode}}</view>
+			</view>
+			
+			
+
+
+				<view class="item">
+					<view class="lable rx-cc">数量</view>
+					<view class="content content_num">
+						<input class="uni-input" v-model="mate.quantity" type="digit"></input>
+						<view class="unit" v-if='mate.unit'>/{{mate.unit}}</view>
+
+					</view>
+				</view>
+
+
+
+				<view class="item">
+					<view class="lable rx-cc">领料仓库</view>
+					<view class="content ">
+						{{ mate.pathName }}
+					</view>
+				</view>
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		tableHeader
+	} from './outCommon.js'
+	export default {
+		props: ['list'],
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			tableH(type) {
+				return tableHeader(type)
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.material {
+		margin-top: 10rpx;
+
+
+
+
+
+		.content_table {
+			width: 702rpx;
+			border: 2rpx solid $border-color;
+
+			.item {
+				display: flex;
+				border-bottom: 2rpx solid $border-color;
+
+
+				.lable {
+					width: 132rpx;
+					text-align: center;
+					background-color: #F7F9FA;
+					font-size: 26rpx;
+					border-right: 2rpx solid $border-color;
+					flex-shrink: 0;
+				}
+
+				.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;
+
+				}
+
+				.content_num {
+
+					display: flex;
+					align-items: center;
+					padding: 0 4rpx;
+
+					/deep/ .uni-input-input {
+						width: 200rpx;
+						border: 2rpx solid #F0F8F2;
+						background: #F0F8F2;
+						color: $theme-color;
+					}
+
+					.unit {
+						padding: 0 4rpx;
+						font-size: 24rpx;
+						color: #404446;
+					}
+				}
+
+				.pd4 {
+					padding: 4rpx 8rpx;
+				}
+
+
+
+				&:last-child {
+					border-bottom: none;
+				}
+			}
+
+			.ww55 {
+				width: 55%;
+			}
+
+			.ww45 {
+				width: 45%;
+			}
+		}
+	}
+</style>

pages/pda/picking/bill/index.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="content-box">
-		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="领料单" background-color="#F7F9FA" color="#000"
-			@clickLeft="back"></uni-nav-bar>
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" :title="title" background-color="#F7F9FA"
+			color="#000" @clickLeft="back"></uni-nav-bar>
 
 
 		<view class="list_box">
 
-			<u-list @scrolltolower="scrolltolower" key="dataList">
+			<u-list @scrolltolower="scrolltolower" key="dataList" v-if='status == 1'>
 
 
 
@@ -44,6 +44,22 @@
 				</u-list-item>
 
 			</u-list>
+
+			<u-list @scrolltolower="scrolltolower" key="dataList2" v-if='status == 2'>
+
+				<view class="card_box cx-sc">
+					<outInstanceBom :list='dataList' :isDetails='true'></outInstanceBom>
+				</view>
+
+
+
+				<u-list-item v-if="dataList.length === 0" style='margin-top: 20vh;'>
+					<u-empty iconSize='150' textSize='32' text='暂无数据'>
+					</u-empty>
+				</u-list-item>
+
+
+			</u-list>
 		</view>
 
 
@@ -64,25 +80,32 @@
 	} from '@/api/pda/workOrder.js'
 
 	import {
-		pickDetails
+		pickDetails,
+		pickOutInOrder
 	} from '@/api/pda/picking.js'
 
 	import instanceBom from './components/instanceBom.vue'
+	import outInstanceBom from './components/outInstanceBom.vue'
 	export default {
 		components: {
-			instanceBom
+			instanceBom,
+			outInstanceBom
 		},
 		data() {
 			return {
 
 				ids: [],
 				dataList: [],
+				title: null,
+				status: 1,
 
 			}
 		},
 
 
 		onLoad(option) {
+			this.status = option.status || 1
+			this.title = option.status == 1 ? '领料单' : option.status == 2 ? ' 出库单' : ''
 			this.ids = [option.id]
 			this.getList()
 		},
@@ -92,25 +115,40 @@
 		methods: {
 			async getList() {
 
+				let list = []
 
+				if (this.status == 1) {
+					const res = await pickDetails(this.ids)
+					list = res
 
-				const res = await pickDetails(this.ids)
-				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
+					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
+						}
+					})
+					this.dataList = list
+
+				} else if (this.status == 2) {
+					const res = await pickOutInOrder({
+						workOrderIds: this.ids
+					})
+
+
+					this.dataList = res
+
+				}
+
+
 
 
 

pages/pda/workOrder/index/details.vue

@@ -22,6 +22,9 @@
 
 					<jobBom :item='objData' :palletList='objData.palletList' :notFormed='objData.notFormedList'
 						:isDetails='true'></jobBom>
+					
+					<oneJobBom  v-if='objData.instanceList &&  objData.instanceList.length != 0' :list='objData.instanceList' :item='objData' :isDetails='true'> </oneJobBom>
+						
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
 						:isDetails='true'>
@@ -35,6 +38,9 @@
 
 					<aridRegion v-if='objData.aridRegionList.length != 0' :list='objData.aridRegionList'
 						:remainingTime='0'  :isType='true'></aridRegion>
+						
+						
+						
 
 
 				</view>