优化

pages/pda/feeding/bill/index.vue

@@ -22,6 +22,9 @@
 						</modelBom>
 
 						<instanceBom v-if='it.instanceList.length != 0' :list='it.instanceList' :currentTaskDiagram='currentTaskDiagram' ></instanceBom>
+						
+						<semiProductBom v-if='it.semiProductList.length != 0' :list='it.semiProductList' :currentTaskDiagram='currentTaskDiagram' ></semiProductBom>
+						
 
 						<packingBom v-if='it.packingList.length != 0' :list='it.packingList'></packingBom>
 						
@@ -47,6 +50,7 @@
 	import deviceBom from '../components/deviceBom.vue'
 	import modelBom from '../components/modelBom.vue'
 	import instanceBom from '../components/instanceBom.vue'
+	import semiProductBom from '../components/semiProductBom'
 	import packingBom from '../components/packingBom.vue'
 	import palletBom from '../components/palletBom'
 	import revolvingDiskBom from '../components/revolvingDiskBom'
@@ -61,7 +65,8 @@
 			instanceBom,
 			packingBom,
 			palletBom,
-			revolvingDiskBom
+			revolvingDiskBom,
+			semiProductBom
 		},
 		data() {
 			return {

pages/pda/feeding/components/feedBom.js

@@ -129,6 +129,28 @@ export const tableHeader = selectEquiType => {
 
 		case 14:
 			return []
+			
+			case 23:
+				return [
+					
+									{
+										label: '名称',
+										prop: 'name'
+									},
+					
+									{
+										label: '型号',
+										prop: 'modelType'
+									},
+									{
+										label: '规格',
+										prop: 'specification'
+									},
+									{
+										label: '牌号',
+										prop: 'brandNum'
+									}
+				]
 
 	}
 

pages/pda/feeding/components/semiProductBom.vue

@@ -0,0 +1,494 @@
+<template>
+	<view>
+		<view class="title_box rx-bc">
+			<view class="name">半成品</view>
+			<view class="btn_box rx-cc" v-if="deviceList.length > 1" @click="bindDevice">绑定设备</view>
+		</view>
+
+		<u-list @scrolltolower="scrolltolower" class="z_list" style="height: 100% !important;">
+
+			<view class="material rx-ss" v-for="(mate, idx) in list" :key="idx">
+				<view class="left rx-ss" @click="getDelete(idx)" v-if='workOrderId'>
+					<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20" color="#fa3534"></uni-icons>
+				</view>
+				<view class="content_table">
+
+
+					<view class="item rx-sc" v-if='mate.rootCategoryLevelId == 23 && mate.isConsumable == 1'>
+						<view class="rx ">
+							<view class="lable rx-cc">编码</view>
+							<view class="content">{{ mate.code }}</view>
+						</view>
+					</view>
+
+					<view class="item rx-bc" v-if='mate.rootCategoryLevelId == 23  && mate.isConsumable == 0'
+						@click="handleCheck(idx, mate)">
+						<view class="rx ">
+							<view class="lable rx-cc">编码</view>
+							<view class="content">{{ mate.code }}</view>
+						</view>
+
+						<view class="rx-cc ww20" v-if="deviceList.length > 1">
+							<image class="check" v-if="mate.check" src='../../../../static/check.png'></image>
+							<image class="check" v-if="!mate.check" src='../../../../static/check_no.png'></image>
+						</view>
+					</view>
+
+
+
+
+
+
+					<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index">
+						<view class="lable rx-cc">{{ itm.label }}</view>
+						<view class="content">{{ mate[itm.prop] }}</view>
+					</view>
+
+					<view class="item" v-if='mate.isConsumable == 1'>
+						<view class="lable rx-cc">包装库存</view>
+						<view class="content">{{ mate.packingCountBase }}/ {{ mate.minUnit}}</view>
+					</view>
+
+                   
+					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
+						<view class="rx ww50">
+							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
+							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1" >{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}} </view>
+							<view class="content" v-if="currentTaskDiagram.isFirstTask == 0" >{{mate.extInfo.newWeight || 0}} {{ mate.extInfo.weightUnit}} </view>
+						</view>
+
+ 
+						<view class="rx ww50">
+							<view class="lable ww80 rx-cc">刻码</view>
+							<view class="content">{{mate.extInfo.engrave}}</view>
+						</view>
+
+					</view>
+
+
+
+
+
+					<view class="item" v-if='mate.isConsumable == 0'>
+						<view class="lable rx-cc">物料代号</view>
+						<view class="content">{{mate.extInfo.materielCode}}</view>
+					</view>
+
+
+					<view class="item" v-if='mate.isConsumable == 0'>
+						<view class="lable rx-cc">客户代号</view>
+						<view class="content">{{mate.extInfo.clientCode}}</view>
+					</view>
+
+
+					<view class="item" v-if='mate.isConsumable == 0 && deviceList.length > 1'>
+						<view class="lable rx-cc">设备</view>
+						<view class="content content_num">
+							<zxz-uni-data-select :localdata="deviceList" v-model="mate.deviceId" dataValue='id'
+								format='{name}-{codeNumber}' @change=" e => mate.deviceName = e.name + e.codeNumber" dataKey="id"
+								filterable :clear='false'></zxz-uni-data-select>
+						</view>
+					</view>
+
+
+
+					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
+						<view class="rx ww50">
+							<view class="lable rx-cc">位置</view>
+							<view class="content content_num ">
+								<input class="uni-input" v-model='mate.extInfo.position'></input>
+							</view>
+
+						</view>
+
+						<view class="rx ww50">
+							<view class="lable rx-cc ww80">数量</view>
+							<view class="content content_num   ">
+								<input class="uni-input" v-model="mate.feedQuantity" type="digit"></input>
+								<view class="unit ">/{{mate.unit}}</view>
+							</view>
+						</view>
+
+					</view>
+
+
+
+
+
+					<view class="item" v-if='mate.isConsumable == 1'>
+						<view class="lable rx-cc">数量</view>
+						<view class="content content_num">
+							<input class="uni-input" v-model="mate.feedQuantity" type="digit"></input>
+							<view class="unit">/{{mate.unit}}</view>
+						</view>
+					</view>
+
+
+
+
+				</view>
+			</view>
+
+		</u-list>
+
+		<SearchPopup mode="center" v-if='deviveShow'>
+			<template v-slot:list>
+				<view class="search_list">
+
+
+					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
+
+						<u-form-item label="绑定设备:" class="required-form" borderBottom prop="assetType">
+
+							<zxz-uni-data-select :localdata="deviceList" v-model="formData.deviceId" dataValue='id'
+								format='{name}-{codeNumber}' @change="e => formData.deviceName = e.name + e.codeNumber" dataKey="id"
+								filterable :clear='false'></zxz-uni-data-select>
+
+						</u-form-item>
+
+					</u-form>
+
+				</view>
+			</template>
+
+			<template v-slot:operate>
+				<view class="operate_box rx-bc">
+					<u-button size="small" class="u-reset-button" @click="deviceClose">
+						取消
+					</u-button>
+
+
+					<u-button type="success" size="small" class="u-reset-button" @click="deviceOk">
+						确定
+					</u-button>
+
+				</view>
+			</template>
+
+		</SearchPopup>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		tableHeader
+	} from './feedBom.js'
+	import SearchPopup from '../../components/searchPopup.vue'
+	export default {
+		components: {
+			SearchPopup
+		},
+		props: {
+			workOrderId: {
+				type: String,
+				default: ''
+			},
+			list: {
+				type: Array,
+				default: () => []
+			},
+			equipmentList: {
+				type: Array,
+				default: () => []
+			},
+			
+			currentTaskDiagram: {
+				type: Object,
+				default: () => {}
+			},
+		},
+
+		watch: {
+			equipmentList: {
+				immediate: true,
+				deep: true,
+				handler(newVal) {
+					this.deviceList = newVal
+					
+				
+				}
+			},
+		},
+
+		data() {
+			return {
+				deviceList: [],
+
+				deviveShow: false,
+				formData: {
+					deviceId: null,
+					deviceName: null,
+				}
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			tableH(type) {
+				return tableHeader(type)
+			},
+
+			getDelete(idx) {
+				this.list.splice(idx, 1)
+			},
+
+			scrolltolower() {},
+			
+		
+
+			handleCheck(idx, it) {
+				this.$set(this.list[idx], 'check', !it.check)
+			},
+
+			bindDevice() {
+				this.deviveShow = true
+			},
+
+			deviceOk() {
+				let arr = this.list.filter(e => {
+					return e.check
+				})
+				if (arr.length <= 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先勾选半成品'
+					})
+					return false
+				}
+
+				if (!this.formData.deviceId) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选择设备'
+					})
+					return false
+				}
+
+				this.list.forEach(e => {
+					if (e.check) {
+						e['deviceId'] = this.formData.deviceId
+						e['deviceName'] = this.formData.deviceName
+					}
+
+				})
+				this.$forceUpdate()
+				this.deviceClose()
+
+			},
+
+			deviceClose() {
+				this.formData.deviceName = null
+				this.formData.deviceId = null
+				this.deviveShow = false
+			},
+		}
+	}
+</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: 48rpx;
+
+			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;
+
+		.left {
+			width: 40rpx;
+		}
+
+		.zdy_check {
+			width: 30rpx;
+			height: 30rpx;
+			border: 2rpx solid #c8c9cc;
+			border-radius: 4rpx;
+
+		}
+
+		.check_active {
+			background: $theme-color;
+			border: 2rpx solid $theme-color;
+
+			/deep/ .u-icon__icon {
+				color: #fff !important;
+			}
+		}
+
+		.content_table {
+			width: 680rpx;
+			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;
+					}
+				}
+
+				.ww400 {
+					/deep/ .uni-input-input {
+						width: 400rpx;
+					}
+				}
+
+				.pd4 {
+					padding: 4rpx 8rpx;
+				}
+
+
+
+				&:last-child {
+					border-bottom: none;
+				}
+			}
+
+			.ww55 {
+				width: 55%;
+			}
+
+			.ww45 {
+				width: 45%;
+			}
+
+			.ww50 {
+				width: 50%;
+
+			}
+
+			.ww80 {
+				width: 80%;
+			}
+
+			.ww20 {
+				width: 20%;
+			}
+
+			.check {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
+
+
+	.z_list {
+		max-height: 2000rpx;
+	}
+
+
+
+
+	.search_list {
+		min-height: 100rpx;
+		width: 90vw;
+
+		/deep/ .baseForm {
+			padding: 0 20rpx;
+		}
+	}
+
+	.operate_box {
+		padding: 10rpx 32rpx;
+
+		/deep/ .u-button {
+			width: 40%;
+		}
+	}
+</style>

pages/pda/feeding/details.vue

@@ -28,20 +28,27 @@
 						:currentTaskDiagram="item.currentTaskDiagram"></instanceBom>
 
 
+					<semiProductBom v-if='item.semiProductList.length != 0' :workOrderId='item.workOrderId'
+						:list='item.semiProductList' :equipmentList="item.equipmentList"
+						:currentTaskDiagram="item.currentTaskDiagram"></semiProductBom>
+
+
+
 					<turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item' pattern='feed'
 						@handleScan='handleScan' @handleDel='handleDel'></turnoverBom>
 
 					<aridRegion v-if='item.aridRegionList.length != 0' :list='item.aridRegionList'
 						@handleScan='handleScan'></aridRegion>
-						
-						
+
+
 					<palletBom v-if='item.palletList.length != 0' :palletList='item.palletList'></palletBom>
-					
-					<revolvingDiskBom v-if="item.revolvingDiskList.length != 0" :revolvingDiskList="item.revolvingDiskList"></revolvingDiskBom>
+
+					<revolvingDiskBom v-if="item.revolvingDiskList.length != 0"
+						:revolvingDiskList="item.revolvingDiskList"></revolvingDiskBom>
 
 					<packingBom v-if='item.packingList.length != 0' :list='item.packingList'></packingBom>
-					
-			
+
+
 
 
 					<view class='flex_btn' @click="openDetails(item.workOrderId)">出库单</view>
@@ -73,6 +80,7 @@
 	import deviceBom from './components/deviceBom.vue'
 	import modelBom from './components/modelBom.vue'
 	import instanceBom from './components/instanceBom.vue'
+	import semiProductBom from './components/semiProductBom'
 	import aridRegion from './components/aridRegion'
 	import paramBom from './components/paramBom.vue'
 	import turnoverBom from '../jobBooking/components/turnoverBom.vue'
@@ -101,6 +109,7 @@
 			deviceBom,
 			modelBom,
 			instanceBom,
+			semiProductBom,
 			aridRegion,
 			paramBom,
 			turnoverBom,
@@ -108,7 +117,7 @@
 			productsBom,
 			palletBom,
 			revolvingDiskBom,
-			
+
 		},
 		data() {
 			return {
@@ -169,7 +178,7 @@
 								aridRegionList = aridRegionList.concat(f)
 							} else if (f.rootCategoryLevelId == 8) {
 								palletList = palletList.concat(f)
-							} else if(f.rootCategoryLevelId == 26) {
+							} else if (f.rootCategoryLevelId == 26) {
 								revolvingDiskList = revolvingDiskList.concat(f)
 							}
 
@@ -184,7 +193,7 @@
 						this.$set(m, 'equipmentList', equipmentList)
 						this.$set(m, 'palletList', palletList)
 						this.$set(m, 'revolvingDiskList', revolvingDiskList)
-						
+
 
 
 
@@ -258,7 +267,8 @@
 						m.aridRegionList = [] // 干燥区
 						m.packingList = [] // 包装
 						m.palletList = [] // 舟皿
-						m.revolvingDiskList = []   // 周转盘
+						m.revolvingDiskList = [] // 周转盘
+						m.semiProductList = [] //半成品
 
 						if (m.pickOutInList.length > 0) {
 							m.pickOutInList.forEach(f => {
@@ -276,9 +286,11 @@
 									m.palletList.push(f)
 								} else if (f.rootCategoryLevelId == 26) {
 									m.revolvingDiskList.push(f)
+								} else if (f.rootCategoryLevelId == 23) {
+									m.semiProductList.push(f)
 								}
-								
-									
+
+
 							})
 						}
 

pages/pda/feeding/single.vue

@@ -88,7 +88,7 @@
 
 				let _arr = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
 				this.memoList = [..._arr[0].modelList, ..._arr[0].equipmentList, ..._arr[0].instanceList, ..._arr[0]
-					.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList
+					.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList, ..._arr[0].semiProductList
 				]
 
 

pages/pda/picking/components/semiProductBom.vue

@@ -0,0 +1,186 @@
+<template>
+	<view>
+
+
+		<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>
+			</view>
+			<view class="content_table">
+				<view class="item">
+					<view class="lable rx-cc">编码</view>
+					<view class="content">
+						{{mate.code}}
+					</view>
+				</view>
+
+				<view class="item">
+					<view class="lable rx-cc">名称</view>
+					<view class="content">{{mate.name}} ({{mate.categoryLevelPath}})</view>
+				</view>
+
+
+				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" v-if='itm.prop' :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">{{mate.packingCountBase}}/ {{mate.minUnit}}</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="number"></input>
+						<view class="unit">/{{mate.measuringUnit}}</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }} {{mate.measuringUnit}})</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 '../../common.js'
+	export default {
+		props: ['list'],
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			tableH(type) {
+				return tableHeader(type)
+			},
+
+			getDelete(idx) {
+				this.list.splice(idx, 1)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.material {
+		margin-top: 10rpx;
+
+		.left {
+			width: 40rpx;
+		}
+
+		.zdy_check {
+			width: 30rpx;
+			height: 30rpx;
+			border: 2rpx solid #c8c9cc;
+			border-radius: 4rpx;
+
+
+		}
+
+		.check_active {
+			background: $theme-color;
+			border: 2rpx solid $theme-color;
+
+			/deep/ .u-icon__icon {
+				color: #fff !important;
+			}
+		}
+
+		.content_table {
+			width: 652rpx;
+			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/details.vue

@@ -84,6 +84,11 @@
 						</boatBom>
 
 						<packingBom :list='item.packingList2'></packingBom>
+						
+						
+						
+						<semiProductBom :list="item.semiProductList2"></semiProductBom>
+					    
 
 
 						<view class='flex_btn' v-if='isPick' @click="openDetails">已有领料单</view>
@@ -111,6 +116,7 @@
 	import modelBom from './components/modelBom.vue'
 	import boatBom from './components/boatBom.vue'
 	import packingBom from './components/packingBom'
+	import semiProductBom from './components/semiProductBom'
 	import {
 		workorderList
 	} from '@/api/pda/workOrder.js'
@@ -125,7 +131,8 @@
 			instanceBom,
 			modelBom,
 			boatBom,
-			packingBom
+			packingBom,
+			semiProductBom
 		},
 		data() {
 			return {
@@ -167,13 +174,15 @@
 						let modelList2 = [] // 模具
 						let palletList2 = []
 						let packingList2 = [] // 包装
-					
-						
+						let semiProductList2 = [] //半成品
+
+                    
+					 console.log(selectList)
 
 
 						selectList.forEach(f => {
 							if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8 && f
-								.rootCategoryLevelId != 13) {
+								.rootCategoryLevelId != 13 && f.rootCategoryLevelId != 23) {
 								f.automatic = 1
 								instanceList2 = instanceList2.concat(f)
 							} else if (f.rootCategoryLevelId == 5) { // 模具
@@ -185,6 +194,9 @@
 							} else if (f.rootCategoryLevelId == 13) {
 								f.automatic = 1
 								packingList2 = packingList2.concat(f)
+							} else if(f.rootCategoryLevelId == 23) {
+								f.automatic = 1
+								semiProductList2 = semiProductList2.concat(f)
 							}
 						})
 
@@ -192,6 +204,9 @@
 						this.$set(m, 'modelList2', modelList2)
 						this.$set(m, 'palletList2', palletList2)
 						this.$set(m, 'packingList2', packingList2)
+						this.$set(m, 'semiProductList2', semiProductList2)
+						
+						
 					}
 				})
 
@@ -215,7 +230,7 @@
 						let bomList = m.bomList.filter(f => f.checked)
 						m['bomDetailDTOSList'] = [...bomList, ...m.modelList, ...m.palletList]
 					}
-					m.instanceList = [...m.instanceList2, ...m.modelList2, ...m.palletList2, ...m.packingList2]
+					m.instanceList = [...m.instanceList2, ...m.modelList2, ...m.palletList2, ...m.packingList2,  ...m.semiProductList2]
 
 					return {
 						...m
@@ -273,6 +288,7 @@
 						m['instanceList2'] = []
 						m['palletList2'] = []
 						m['packingList2'] = []
+						m['semiProductList2'] = []
 
 						delete m.id
 						return {

pages/pda/workOrder/search/index.vue

@@ -242,7 +242,7 @@
 				if (this.isType == 'feed') {
 					let _arr = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
 					this.memoList = [..._arr[0].modelList, ..._arr[0].equipmentList, ..._arr[0].instanceList, ..._arr[0]
-						.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList
+						.aridRegionList, ..._arr[0].turnover, ..._arr[0].palletList, ..._arr[0].revolvingDiskList, ..._arr[0].semiProductList
 					]
 
 
@@ -314,9 +314,9 @@
 			getTreeList() {
 				let params = {}
 				if (this.isType == 'feed') {
-					params.ids = [1, 4, 5, 8, 10, 11,13, 14, 26]
+					params.ids = [1, 4, 5, 8, 10, 11,13, 14, 23, 26]
 				} else if (this.isType == 'pick') {
-					params.ids = [1, 5, 7, 8, 10, 13, 14, 26]
+					params.ids = [1, 5, 7, 8, 10, 13, 14, 23, 26]
 				} else if (this.isType == 'job') {
 					params['ids'] = [4, 7]
 				}