领料批量选择仓库

pages/pda/picking/components/boatBom.vue

@@ -46,8 +46,9 @@
 					<view class="lable rx-cc">数量 </view>
 					<view class="content content_num">
 						<input class="uni-input" style="width: 300rpx;" v-model="item.demandQuantity"
-							type='digit'></input> {{ item.unit }} <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量:	{{ Number(item.count || 0) * Number(resObj.formingNum) }} 	 </text>
-					
+							type='digit'></input> {{ item.unit }} <text style="font-size: 20rpx;margin-left: 18rpx;">
+							数量: {{ Number(item.count || 0) * Number(resObj.formingNum) }} </text>
+
 
 					</view>
 				</view>
@@ -56,9 +57,8 @@
 					<view class="lable rx-cc">领料仓库</view>
 
 					<view class="content pd4">
-						<zxz-uni-data-select :localdata="item.warehouseList" v-model="item.warehouseId"
-							dataValue='id' format='{name}' dataKey="name" filterable
-							:clear='false'></zxz-uni-data-select>
+					<zxz-uni-data-select :localdata="warehouseList" v-model="item.warehouseId" dataValue='id' format='{name}'
+						dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 
 					</view>
 				</view>
@@ -98,8 +98,11 @@
 			resObj: {
 				type: Object,
 				default: () => {}
+			},
+			warehouseList: {
+				type: Object,
+				default: () => []
 			}
-
 		},
 
 		watch: {

pages/pda/picking/components/instanceBom.vue

@@ -56,9 +56,9 @@
 				<view class="item" v-if="!Object.prototype.hasOwnProperty.call(mate, 'isOut') || mate.isOut == 0">
 					<view class="lable rx-cc">领料仓库</view>
 					<view class="content pd4">
-						<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
-							dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
-							:clear='false'></zxz-uni-data-select>
+				
+							<zxz-uni-data-select :localdata="warehouseList" v-model="mate.warehouseId" dataValue='id' format='{name}'
+								dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 					</view>
 				</view>
 				
@@ -83,7 +83,7 @@
 		tableHeader
 	} from '../../common.js'
 	export default {
-		props: ['list'],
+		props: ['list','warehouseList'],
 		data() {
 			return {
 

pages/pda/picking/components/modelBom.vue

@@ -49,9 +49,8 @@
 					<view class="item">
 						<view class="lable rx-cc">领料仓库</view>
 						<view class="content pd4">
-							<zxz-uni-data-select :localdata="item.warehouseLists" v-model="item.warehouseId"
-								dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
-								:clear='false'></zxz-uni-data-select>
+						<zxz-uni-data-select :localdata="warehouseList" v-model="item.warehouseId" dataValue='id' format='{name}'
+							dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 						</view>
 					</view>
 
@@ -85,6 +84,10 @@
 				type: Array,
 				default: () => []
 			},
+			warehouseList:{
+				type: Array,
+				default: () => []
+			},
 
 		},
 

pages/pda/picking/components/packingBom.vue

@@ -54,9 +54,8 @@
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
 				<view class="content pd4">
-					<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
-						dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
-						:clear='false'></zxz-uni-data-select>
+					<zxz-uni-data-select :localdata="warehouseList" v-model="mate.warehouseId" dataValue='id' format='{name}'
+						dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 				</view>
 				</view>
 
@@ -71,7 +70,7 @@
 		tableHeader
 	} from '../../common.js'
 	export default {
-		props: ['list'],
+		props: ['list','warehouseList'],
 		data() {
 			return {
 

pages/pda/picking/components/semiProductBom.vue

@@ -74,9 +74,8 @@
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
 				<view class="content pd4">
-					<zxz-uni-data-select :localdata="mate.warehouseLists" v-model="mate.warehouseId"
-						dataValue='warehouse_id' format='{warehouse_name}' dataKey="warehouse_name" filterable
-						:clear='false'></zxz-uni-data-select>
+					<zxz-uni-data-select :localdata="warehouseList" v-model="mate.warehouseId" dataValue='id' format='{name}'
+						dataKey="name" filterable :clear='false'></zxz-uni-data-select>
 				</view>
 				</view>
 				
@@ -92,7 +91,7 @@
 		tableHeader
 	} from '../../common.js'
 	export default {
-		props: ['list'],
+		props: ['list','warehouseList'],
 		data() {
 			return {
 

pages/pda/picking/details.vue

@@ -23,8 +23,13 @@
 						</view>
 
 					</view>
+					<view style="display:flex;justify-items: start">
+						<view class="select" @click="selectAll(item.bomList)" style="width: 64px;">全选/取消</view>
+						<view class="select" @click="warehouseShowFn(item.id)" style="width: 85px;margin-left: 10px;">
+							一键选择仓库</view>
+
+					</view>
 
-					<view class="select" @click="selectAll(item.bomList)">全选/取消</view>
 
 					<view class="material rx-ss" v-for="(mate, idx) in item.bomList" :key="idx">
 						<view class="left rx-ss" @click="mate.checked = !mate.checked">
@@ -76,7 +81,7 @@
 							<view class="item">
 								<view class="lable rx-cc">领料仓库</view>
 								<view class="content pd4">
-									<zxz-uni-data-select :localdata="mate.warehouseList" v-model="mate.warehouseId"
+									<zxz-uni-data-select :localdata="warehouseList" v-model="mate.warehouseId"
 										dataValue='id' format='{name}' dataKey="name" filterable
 										:clear='false'></zxz-uni-data-select>
 								</view>
@@ -89,22 +94,23 @@
 					</view>
 
 					<view>
-						<instanceBom :list='item.instanceList2'></instanceBom>
+						<instanceBom :list='item.instanceList2' :warehouseList="warehouseList"></instanceBom>
 
 
 						<modelBom :workOrderId='item.workOrderId' :modelList='item.modelList'
-							:modelList2='item.modelList2' :code='item.code' @hendDel='hendDel'>
+							:warehouseList="warehouseList" :modelList2='item.modelList2' :code='item.code'
+							@hendDel='hendDel'>
 						</modelBom>
 
 						<boatBom :palletList='item.palletList' :palletList2='item.palletList2' :code='item.code'
-							:resObj='item' @hendDel='hendDel'>
+							:warehouseList="warehouseList" :resObj='item' @hendDel='hendDel'>
 						</boatBom>
 
-						<packingBom :list='item.packingList2'></packingBom>
+						<packingBom :list='item.packingList2' :warehouseList="warehouseList"></packingBom>
 
 
 
-						<semiProductBom
+						<semiProductBom :warehouseList="warehouseList"
 							:list="[...item.semiProductList2, ...item.productList2, ...item.junkProductList2]">
 						</semiProductBom>
 
@@ -128,7 +134,27 @@
 			</u-list>
 
 		</view>
+		<u-popup :show="warehouseShow" mode="center" v-if='warehouseShow' :closeOnClickOverlay='false'>
+			<view class="popup_list">
+				<view class="lable rx-cc">领料仓库</view>
+				<view class="content pd4">
+					<zxz-uni-data-select :localdata="warehouseList" v-model="warehouseId" dataValue='id' format='{name}'
+						dataKey="name" filterable :clear='false'></zxz-uni-data-select>
+				</view>
+
+			</view>
 
+
+			<view class="operate_box  rx-bc">
+				<u-button size="small" class="u-reset-button" @click="warehouseShow=fasle">
+					取消
+				</u-button>
+				<u-button type="success" size="small" class="u-reset-button" @click="handOK">
+					确认
+				</u-button>
+
+			</view>
+		</u-popup>
 		<view class="bottom-wrapper">
 			<view class="btn_box" @click="save">{{ submitText }}</view>
 		</view>
@@ -141,285 +167,393 @@
 </template>
 
 <script>
-import instanceBom from './components/instanceBom.vue'
-import modelBom from './components/modelBom.vue'
-import boatBom from './components/boatBom.vue'
-import packingBom from './components/packingBom'
-import semiProductBom from './components/semiProductBom'
-import outsourceOrder from './components/outsourceOrder'
-import {
-	znPdaPage,
-	workorderList,
-	listOutsourceInWarehouse,
-	listOutsource,
-	currentStockQuery,
-	getInventoryTotal
-} from '@/api/pda/workOrder.js'
-import {
-	VirtualPagination
-} from '@/utils/pages.js'
-
-import {
-	batchSave,
-	pickDetails,
-	findVoucherList
-} from '@/api/pda/picking.js'
-
-export default {
-	components: {
-		instanceBom,
-		modelBom,
-		boatBom,
-		packingBom,
-		semiProductBom,
-		outsourceOrder
-	},
-	data() {
-		return {
-			isType: true,
-
-			idsList: [],
-			List: [],
-			pagination: {},
-			classificationList: [], //分类数据
-			newListOne: [],
-			taskId: null,
-			isPick: false,
-			isOutsource: 0,
-			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
-				.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
-			submitText: '提交'
+	import instanceBom from './components/instanceBom.vue'
+	import modelBom from './components/modelBom.vue'
+	import boatBom from './components/boatBom.vue'
+	import packingBom from './components/packingBom'
+	import semiProductBom from './components/semiProductBom'
+	import outsourceOrder from './components/outsourceOrder'
+	import {
+		znPdaPage,
+		workorderList,
+		listOutsourceInWarehouse,
+		listOutsource,
+		currentStockQuery,
+		getInventoryTotal
+	} from '@/api/pda/workOrder.js'
+	import {
+		VirtualPagination
+	} from '@/utils/pages.js'
+
+	import {
+		batchSave,
+		pickDetails,
+		findVoucherList
+	} from '@/api/pda/picking.js'
+	import {
+		getWarehouseList,
+	} from '@/api/warehouseManagement'
+	import {
+		forIn
+	} from 'lodash'
+	export default {
+		components: {
+			instanceBom,
+			modelBom,
+			boatBom,
+			packingBom,
+			semiProductBom,
+			outsourceOrder
+		},
+		data() {
+			return {
+				isType: true,
+				warehouseShow: false,
+				warehouseId: '',
+				warehouseList: [],
+				idsList: [],
+				List: [],
+				currentId: "",
+				pagination: {},
+				classificationList: [], //分类数据
+				newListOne: [],
+				taskId: null,
+				isPick: false,
+				isOutsource: 0,
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
+				submitText: '提交'
 
-		}
-	},
-	onLoad(options) {
-		console.log(options, '1111111111');
+			}
+		},
+		onLoad(options) {
+			console.log(options, '1111111111');
 
-		let queryArray = decodeURIComponent(options.arr);
+			let queryArray = decodeURIComponent(options.arr);
+			getWarehouseList().then(res => {
+				this.warehouseList = res.data
+			})
 
-		this.idsList = JSON.parse(queryArray);
-		this.isOutsource = Number(options.isOutsource) || 0
+			this.idsList = JSON.parse(queryArray);
+			this.isOutsource = Number(options.isOutsource) || 0
 
-		this.taskId = options.taskId
+			this.taskId = options.taskId
 
-		console.log(this.clientEnvironmentId, 'this.clientEnvironmentId');
+			console.log(this.clientEnvironmentId, 'this.clientEnvironmentId');
 
 
 
-		if (this.clientEnvironmentId == 21) {
-			this.getZnList()
-		} else {
-			this.getList()
-		}
+			if (this.clientEnvironmentId == 21) {
+				this.getZnList()
+			} else {
+				this.getList()
+			}
 
 
 
-		if (this.idsList.length == 1) {
-			this.getPick()
-		}
+			if (this.idsList.length == 1) {
+				this.getPick()
+			}
 
 
-		if (this.isOutsource == 1) {
-			this.getListOutsource()
-		}
+			if (this.isOutsource == 1) {
+				this.getListOutsource()
+			}
 
 
 
-	},
-	onShow() {
-		uni.$off("setSelectList");
-
-		uni.$on("setSelectList", (selectList, id) => {
-			this.List.forEach(m => {
-				if (m.workOrderId == id) {
-					let instanceList2 = [] // 投料
-					let modelList2 = [] // 模具
-					let palletList2 = []
-					let packingList2 = [] // 包装
-					let semiProductList2 = [] //半成品
-					let productList2 = [] // 产品
-					let junkProductList2 = [] //废品
-
-					selectList.forEach(f => {
-						if (![5, 8, 13, 23, 9, 28].includes(f.rootCategoryLevelId)) {
-							f.automatic = 1
-							instanceList2 = instanceList2.concat(f)
-						} else if (f.rootCategoryLevelId == 5) { // 模具
-							f.automatic = 1
-							modelList2 = modelList2.concat(f)
-						} else if (f.rootCategoryLevelId == 8) { // 舟皿
-							f.automatic = 1
-							palletList2 = palletList2.concat(f)
-						} else if (f.rootCategoryLevelId == 13) {
-							f.automatic = 1
-							packingList2 = packingList2.concat(f)
-						} else if (f.rootCategoryLevelId == 23) {
-							f.automatic = 1
-							semiProductList2 = semiProductList2.concat(f)
-						} else if (f.rootCategoryLevelId == 9) {
-							f.automatic = 1
-							productList2 = productList2.concat(f)
-						} else if (f.rootCategoryLevelId == 28) {
-							f.automatic = 1
-							junkProductList2 = junkProductList2.concat(f)
-						}
+		},
+		onShow() {
+			uni.$off("setSelectList");
+
+			uni.$on("setSelectList", (selectList, id) => {
+				this.List.forEach(m => {
+					if (m.workOrderId == id) {
+						let instanceList2 = [] // 投料
+						let modelList2 = [] // 模具
+						let palletList2 = []
+						let packingList2 = [] // 包装
+						let semiProductList2 = [] //半成品
+						let productList2 = [] // 产品
+						let junkProductList2 = [] //废品
+
+						selectList.forEach(f => {
+							if (![5, 8, 13, 23, 9, 28].includes(f.rootCategoryLevelId)) {
+								f.automatic = 1
+								instanceList2 = instanceList2.concat(f)
+							} else if (f.rootCategoryLevelId == 5) { // 模具
+								f.automatic = 1
+								modelList2 = modelList2.concat(f)
+							} else if (f.rootCategoryLevelId == 8) { // 舟皿
+								f.automatic = 1
+								palletList2 = palletList2.concat(f)
+							} else if (f.rootCategoryLevelId == 13) {
+								f.automatic = 1
+								packingList2 = packingList2.concat(f)
+							} else if (f.rootCategoryLevelId == 23) {
+								f.automatic = 1
+								semiProductList2 = semiProductList2.concat(f)
+							} else if (f.rootCategoryLevelId == 9) {
+								f.automatic = 1
+								productList2 = productList2.concat(f)
+							} else if (f.rootCategoryLevelId == 28) {
+								f.automatic = 1
+								junkProductList2 = junkProductList2.concat(f)
+							}
+
+						})
+
+						this.$set(m, 'instanceList2', instanceList2)
+						this.$set(m, 'modelList2', modelList2)
+						this.$set(m, 'palletList2', palletList2)
+						this.$set(m, 'packingList2', packingList2)
+						this.$set(m, 'semiProductList2', semiProductList2)
+						this.$set(m, 'productList2', productList2)
+						this.$set(m, 'junkProductList2', junkProductList2)
 
-					})
 
-					this.$set(m, 'instanceList2', instanceList2)
-					this.$set(m, 'modelList2', modelList2)
-					this.$set(m, 'palletList2', palletList2)
-					this.$set(m, 'packingList2', packingList2)
-					this.$set(m, 'semiProductList2', semiProductList2)
-					this.$set(m, 'productList2', productList2)
-					this.$set(m, 'junkProductList2', junkProductList2)
+					}
+				})
+
 
 
+
+			});
+
+		},
+
+		methods: {
+			selectAll(list) {
+				if (Array.isArray(list) && list.length) {
+					// let a = list.some(v=>v.checked = true)
+					// ture 就是取消 false 就是选中
+					if (this.isType) {
+						list.map(d => {
+							d.checked = false
+						})
+						this.isType = false;
+
+					} else {
+						list.map(d => {
+							d.checked = true
+						})
+						this.isType = true;
+					}
+				}
+
+				console.log(list, 'list');
+			},
+
+			//刷新库存
+
+
+			async undatePicking() {
+				uni.showLoading({
+					title: '加载中...',
+				});
+				const res = await currentStockQuery(this.idsList[0]);
+				uni.hideLoading()
+
+				this.getZnList();
+			},
+
+			warehouseShowFn(tiemId) {
+				this.warehouseShow = true
+				this.currentId = tiemId
+			},
+			handOK() {
+
+				let index = this.List.findIndex(item => item.id == this.currentId)
+				// this.$set(this.List[index], 'warehouseId', this.warehouseId)
+				console.log(this.List[index], 'this.List[index]')
+				for (let key in this.List[index]) {
+					if (['instanceList2', 'modelList2', 'palletList2', 'packingList2', 'semiProductList2', 'productList2',
+							'junkProductList2', 'bomList'
+						].includes(key)) {
+						this.List[index][key].forEach((item, i) => {
+							this.$set(this.List[index][key][i], 'warehouseId', this.warehouseId)
+						})
+					}
+				}
+				this.warehouseShow = false
+				this.currentId = ''
+			},
+
+			scrolltolower() {
+
+				let arr = this.pagination.nextPage();
+				if (arr.length) {
+					this.List[0].bomList = [...this.List[0].bomList, ...arr]
 				}
-			})
 
 
+			},
 
+			save() {
 
-		});
 
-	},
+				let _arr = []
+				console.log(this.newList, 'm');
 
-	methods: {
-		selectAll(list) {
-			if (Array.isArray(list) && list.length) {
-				// let a = list.some(v=>v.checked = true)
-				// ture 就是取消 false 就是选中
-				if (this.isType) {
-					list.map(d => {
-						d.checked = false
+				if (this.clientEnvironmentId !== 21) {
+
+					_arr = this.List.map(m => {
+						console.log(m, 'm');
+						if (m.bomList.length > 0) {
+							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.semiProductList2, ...m.productList2, ...m.junkProductList2
+						]
+						m.isOutsource = this.isOutsource
+						return {
+							...m
+						}
+					})
+				}
+
+
+				if (this.clientEnvironmentId == 21) {
+					this.submitText = '领料中'
+					findVoucherList({
+						workOrderId: this.idsList[0]
+					}).then(res => {
+						// uni.navigateTo({
+						// 	url: `/pages/pda/picking/index/index?pickStatus=1`,
+						// });
+						uni.showToast({
+							title: "领料成功",
+							mask: true,
+							duration: 1500,
+						});
+						uni.navigateBack({
+							delta: 1
+						});
 					})
-					this.isType = false;
 
 				} else {
-					list.map(d => {
-						d.checked = true
+					batchSave(_arr).then(res => {
+						uni.navigateTo({
+							url: `/pages/pda/picking/index/index?pickStatus=1`,
+						});
+
 					})
-					this.isType = true;
 				}
-			}
 
-			console.log(list, 'list');
-		},
 
-		//刷新库存
 
+			},
+			// 中赢保存
+			getZnList() {
+				znPdaPage({
+					// ids: ,
+					workId: this.idsList[0]
+				}).then(res => {
 
-		async undatePicking() {
-			uni.showLoading({
-				title: '加载中...',
-			});
-			const res = await currentStockQuery(this.idsList[0]);
-			uni.hideLoading()
+					if (res?.length) {
+						let List = res.map(m => {
+							m.workOrderId = m.id
+							let modelList = []
+							let palletList = []
+							// let bomList = []
 
-			this.getZnList();
-		},
+							// m.bomDetailDTOS.forEach((f, i) => {
 
-		scrolltolower() {
+							// 	if (f.rootCategoryLevelId == 5) {
+							// 		f.automatic = 2
+							// 		modelList = modelList.concat(f)
+							// 	}
 
-			let arr = this.pagination.nextPage();
-			if (arr.length) {
-				this.List[0].bomList = [...this.List[0].bomList, ...arr]
-			}
+							// 	if (f.rootCategoryLevelId == 8) {
+							// 		f.automatic = 2
+							// 		palletList = palletList.concat(f)
+							// 	}
+							// 	if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8) {
+							// 		f.automatic = 2
+							// 		bomList = bomList.concat(f)
+							// 	}
 
+							// })
 
-		},
 
-		save() {
 
+							m['modelList'] = modelList
+							m['palletList'] = palletList
+							// m['bomList'] = bomList
 
-			let _arr = []
-			console.log(this.newList, 'm');
 
-			if (this.clientEnvironmentId !== 21) {
+							m['modelList2'] = []
+							m['instanceList2'] = []
+							m['palletList2'] = []
+							m['packingList2'] = []
+							m['semiProductList2'] = []
+							m['productList2'] = []
+							m['junkProductList2'] = []
+
+							delete m.id
+							return {
+								...m
+							}
+						})
+
+						this.newListOne = JSON.parse(JSON.stringify(List));
+
+						this.pagination = new VirtualPagination(List[0].bomList, 10);
+
+						List[0].bomList = this.pagination.getCurrentPageData();
+
+						this.List = List;
 
-				_arr = this.List.map(m => {
-					console.log(m, 'm');
-					if (m.bomList.length > 0) {
-						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.semiProductList2, ...m.productList2, ...m.junkProductList2
-					]
-					m.isOutsource = this.isOutsource
-					return {
-						...m
 					}
-				})
-			}
 
 
-			if (this.clientEnvironmentId == 21) {
-				this.submitText='领料中'
-				findVoucherList({ workOrderId: this.idsList[0] }).then(res => {
-					// uni.navigateTo({
-					// 	url: `/pages/pda/picking/index/index?pickStatus=1`,
-					// });
-					uni.showToast({
-					  title: "领料成功",
-					  mask: true,
-					  duration: 1500,
-					});
-					uni.navigateBack({
-					    delta: 1
-					});
+
 				})
+			},
 
-			} else {
-				batchSave(_arr).then(res => {
-					uni.navigateTo({
-						url: `/pages/pda/picking/index/index?pickStatus=1`,
-					});
 
-				})
-			}
 
+			getList() {
 
+				workorderList({
 
-		},
-		// 中赢保存
-		getZnList() {
-			znPdaPage({
-				// ids: ,
-				workId: this.idsList[0]
-			}).then(res => {
-
-				if (res?.length) {
-					let List = res.map(m => {
+					ids: this.idsList,
+					taskId: this.taskId
+				}).then(res => {
+
+					console.log('领料列表', res)
+
+					this.List = res.map(m => {
 						m.workOrderId = m.id
 						let modelList = []
 						let palletList = []
-						// let bomList = []
+						let bomList = []
 
-						// m.bomDetailDTOS.forEach((f, i) => {
+						m.bomDetailDTOS.forEach((f, i) => {
 
-						// 	if (f.rootCategoryLevelId == 5) {
-						// 		f.automatic = 2
-						// 		modelList = modelList.concat(f)
-						// 	}
+							if (f.rootCategoryLevelId == 5) {
+								f.automatic = 2
+								modelList = modelList.concat(f)
+							}
 
-						// 	if (f.rootCategoryLevelId == 8) {
-						// 		f.automatic = 2
-						// 		palletList = palletList.concat(f)
-						// 	}
-						// 	if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8) {
-						// 		f.automatic = 2
-						// 		bomList = bomList.concat(f)
-						// 	}
+							if (f.rootCategoryLevelId == 8) {
+								f.automatic = 2
+								palletList = palletList.concat(f)
+							}
+							if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8) {
+								f.automatic = 2
+								bomList = bomList.concat(f)
+							}
 
-						// })
+						})
 
 
 
 						m['modelList'] = modelList
 						m['palletList'] = palletList
-						// m['bomList'] = bomList
+						m['bomList'] = bomList
 
 
 						m['modelList2'] = []
@@ -436,442 +570,375 @@ export default {
 						}
 					})
 
-					this.newListOne = JSON.parse(JSON.stringify(List));
-
-					this.pagination = new VirtualPagination(List[0].bomList, 10);
-
-					List[0].bomList = this.pagination.getCurrentPageData();
 
-					this.List = List;
 
+					this.getInventoryTotalFn()
+				})
+			},
+			//计量库存数量
+			getInventoryTotalFn() {
+				let ids = []
+				this.List.map(item => {
+					item.bomList.map(pitem => {
+						ids.push(pitem.categoryCode)
+					})
+				})
+				if (ids.length == 0) {
+					return;
 				}
+				getInventoryTotal(ids).then(res => {
+					res.map(ritem => {
+						this.List.map(item => {
+							item.bomList.map(pitem => {
+								if (pitem.categoryCode == ritem.code) {
+									pitem.availableCountBase = ritem.availableCountBase
+								}
+
+							})
+						})
+					})
 
+				})
 
 
-			})
-		},
-
-
-
-		 getList() {
-
-			workorderList({
-
-				ids: this.idsList,
-				taskId: this.taskId
-			}).then(res => {
-
-				console.log('领料列表', res)
-
-				this.List = res.map(m => {
-					m.workOrderId = m.id
-					let modelList = []
-					let palletList = []
-					let bomList = []
+			},
 
-					m.bomDetailDTOS.forEach((f, i) => {
+			hendDel(type, code, list) {
 
-						if (f.rootCategoryLevelId == 5) {
-							f.automatic = 2
-							modelList = modelList.concat(f)
-						}
+				if (type == 'modelBom') {
+					console.log(list.length)
+					if (list.length == 0) {
 
-						if (f.rootCategoryLevelId == 8) {
-							f.automatic = 2
-							palletList = palletList.concat(f)
+					}
+					this.List.forEach(f => {
+						if (f.code == code) {
+							if (list.length == 0) {
+								f.modelList2 = []
+								f.modelList = []
+								return false
+							}
+							f.modelList2 = list.filter(t => t.automatic == 1)
+							f.modelList = list.filter(t => t.automatic == 2)
 						}
-						if (f.rootCategoryLevelId != 5 && f.rootCategoryLevelId != 8) {
-							f.automatic = 2
-							bomList = bomList.concat(f)
+					})
+				}
+				if (type == 'boatBom') {
+					this.List.forEach(f => {
+						if (f.code == code) {
+							if (list.length == 0) {
+								f.palletList2 = []
+								f.palletList = []
+								return false
+							}
+							f.palletList2 = list.filter(t => t.automatic == 1)
+							f.palletList = list.filter(t => t.automatic == 2)
 						}
-
 					})
+				}
 
+				this.$forceUpdate()
 
+			},
 
-					m['modelList'] = modelList
-					m['palletList'] = palletList
-					m['bomList'] = bomList
-
-
-					m['modelList2'] = []
-					m['instanceList2'] = []
-					m['palletList2'] = []
-					m['packingList2'] = []
-					m['semiProductList2'] = []
-					m['productList2'] = []
-					m['junkProductList2'] = []
-
-					delete m.id
-					return {
-						...m
-					}
-				})
-
-
+			getListOutsource(list) {
+				let param = {
+					workOrderId: this.idsList,
+					taskId: this.taskId
+				}
 
-			 this.getInventoryTotalFn()
-			})
-		},
-		//计量库存数量
-		getInventoryTotalFn() {
-		      let ids=[]
-		      this.List.map(item=>{
-		        item.bomList.map(pitem=>{
-		          ids.push(pitem.categoryCode)
-		        })
-		      })
-			  if(ids.length==0){
-				  return;
-			  }
-			  getInventoryTotal(ids).then(res => {
-				  res.map(ritem=>{
-				    this.List.map(item=>{
-				      item.bomList.map(pitem=>{
-				        if(pitem.categoryCode==ritem.code){
-				          pitem.availableCountBase=ritem.availableCountBase
-				        }
-				  		
-				      })
-				    })
-				  })
-				  
-			  })
-		      
-		        
-		    },
-
-		hendDel(type, code, list) {
-
-			if (type == 'modelBom') {
-				console.log(list.length)
-				if (list.length == 0) {
+				listOutsource(param).then(res => {
 
-				}
-				this.List.forEach(f => {
-					if (f.code == code) {
-						if (list.length == 0) {
-							f.modelList2 = []
-							f.modelList = []
-							return false
-						}
-						f.modelList2 = list.filter(t => t.automatic == 1)
-						f.modelList = list.filter(t => t.automatic == 2)
+					if (res) {
+						this.$refs.outsourceRef.open(res)
+					} else {
+						uni.showToast({
+							title: '暂无委外申请单',
+							icon: 'none'
+						})
 					}
 				})
-			}
-			if (type == 'boatBom') {
-				this.List.forEach(f => {
-					if (f.code == code) {
-						if (list.length == 0) {
-							f.palletList2 = []
-							f.palletList = []
-							return false
-						}
-						f.palletList2 = list.filter(t => t.automatic == 1)
-						f.palletList = list.filter(t => t.automatic == 2)
-					}
-				})
-			}
+			},
 
-			this.$forceUpdate()
+			outsourceFn(list) {
+				this.outsourceInWarehouseFn(list)
 
-		},
 
-		getListOutsource(list) {
-			let param = {
-				workOrderId: this.idsList,
-				taskId: this.taskId
-			}
+			},
 
-			listOutsource(param).then(res => {
-
-				if (res) {
-					this.$refs.outsourceRef.open(res)
-				} else {
-					uni.showToast({
-						title: '暂无委外申请单',
-						icon: 'none'
-					})
-				}
-			})
-		},
-
-		outsourceFn(list) {
-			this.outsourceInWarehouseFn(list)
 
 
-		},
-
 
+			addPicking(id, item) {
+				const storageKey = Date.now() + "";
+				let arr = [...item.instanceList2, ...item.modelList2, ...item.palletList2, ...item.packingList2, ...item
+					.semiProductList2, ...item.productList2, ...item.junkProductList2
+				]
+				uni.setStorageSync(storageKey, arr);
+				uni.navigateTo({
+					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=pick&taskId=${this.taskId}`
+				})
+			},
 
+			getPick() {
+				pickDetails(this.idsList).then(res => {
 
-		addPicking(id, item) {
-			const storageKey = Date.now() + "";
-			let arr = [...item.instanceList2, ...item.modelList2, ...item.palletList2, ...item.packingList2, ...item
-				.semiProductList2, ...item.productList2, ...item.junkProductList2
-			]
-			uni.setStorageSync(storageKey, arr);
-			uni.navigateTo({
-				url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=pick&taskId=${this.taskId}`
-			})
-		},
+					if (res && res.length > 0) {
+						this.isPick = true
+					}
 
-		getPick() {
-			pickDetails(this.idsList).then(res => {
+				})
+			},
 
-				if (res && res.length > 0) {
-					this.isPick = true
+			outsourceInWarehouseFn(list) {
+				let param = {
+					outsourceOrder: list || [],
+					workOrderId: this.idsList[0],
+					taskId: this.taskId
 				}
 
-			})
-		},
-
-		outsourceInWarehouseFn(list) {
-			let param = {
-				outsourceOrder: list || [],
-				workOrderId: this.idsList[0],
-				taskId: this.taskId
-			}
+				listOutsourceInWarehouse(param).then(res => {
+					res.list.map(m => {
+						m.isOut = 1
+						return {
+							...m
+						}
+					})
+					let _arr = [...this.List[0].instanceList2, ...res.list]
+					this.$set(this.List[0], 'instanceList2', _arr)
+					this.$forceUpdate()
+				})
+			},
 
-			listOutsourceInWarehouse(param).then(res => {
-				res.list.map(m => {
-					m.isOut = 1
-					return {
-						...m
-					}
+			openDetails() {
+				let url = `/pages/pda/picking/bill/index?id=${this.idsList[0]}`
+				uni.navigateTo({
+					url
 				})
-				let _arr = [...this.List[0].instanceList2, ...res.list]
-				this.$set(this.List[0], 'instanceList2', _arr)
-				this.$forceUpdate()
-			})
-		},
+			},
 
-		openDetails() {
-			let url = `/pages/pda/picking/bill/index?id=${this.idsList[0]}`
-			uni.navigateTo({
-				url
-			})
 		},
 
-	},
-
-	beforeDestroy() {
-		uni.hideLoading();
-	},
+		beforeDestroy() {
+			uni.hideLoading();
+		},
 
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-.select {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: 5rpx 0;
-	width: 150rpx;
-	background-color: #157A2C;
-	color: #fff;
-	font-size: 24rpx;
-	border-radius: 5rpx;
-}
-
-.u-reset-button-ii {
-	position: relative;
-	right: -251rpx;
-	width: 200rpx;
-}
-
-.content-box {
-	height: 100vh;
-	overflow: hidden;
-	display: flex;
-	flex-direction: column;
-
-}
-
-
-.list_box {
-	flex: 1;
-	overflow: hidden;
-	padding: 4rpx 0;
-
-	.u-list {
-		height: 100% !important;
+	.select {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 5rpx 0;
+		width: 150rpx;
+		background-color: #157A2C;
+		color: #fff;
+		font-size: 24rpx;
+		border-radius: 5rpx;
 	}
 
-	.card_box {
-		padding: 16rpx 24rpx;
-
+	.u-reset-button-ii {
+		position: relative;
+		right: -251rpx;
+		width: 200rpx;
 	}
 
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
 
-	.title_box {
-		.round {
-			width: 32rpx;
-			height: 32rpx;
-			line-height: 32rpx;
-			border-radius: 50%;
-			background: $theme-color;
-			color: #fff;
-			text-align: center;
-			font-size: 20rpx;
-		}
-
-		.code {
-			margin-left: 16rpx;
-			font-family: PingFang SC;
-			font-size: 28rpx;
-			font-style: normal;
-			font-weight: 400;
-			color: $theme-color;
-		}
 	}
 
-	.right_box {}
-
 
-	.material {
-		margin-top: 10rpx;
+	.list_box {
+		flex: 1;
+		overflow: hidden;
+		padding: 4rpx 0;
 
-		.left {
-			width: 40rpx;
+		.u-list {
+			height: 100% !important;
 		}
 
-		.zdy_check {
-			width: 30rpx;
-			height: 30rpx;
-			border: 2rpx solid #c8c9cc;
-			border-radius: 4rpx;
-
+		.card_box {
+			padding: 16rpx 24rpx;
 
 		}
 
-		.check_active {
-			background: $theme-color;
-			border: 2rpx solid $theme-color;
 
-			/deep/ .u-icon__icon {
-				color: #fff !important;
+		.title_box {
+			.round {
+				width: 32rpx;
+				height: 32rpx;
+				line-height: 32rpx;
+				border-radius: 50%;
+				background: $theme-color;
+				color: #fff;
+				text-align: center;
+				font-size: 20rpx;
+			}
+
+			.code {
+				margin-left: 16rpx;
+				font-family: PingFang SC;
+				font-size: 28rpx;
+				font-style: normal;
+				font-weight: 400;
+				color: $theme-color;
 			}
 		}
 
-		.content_table {
-			width: 652rpx;
-			border: 2rpx solid $border-color;
+		.right_box {}
 
-			.item {
-				display: flex;
-				border-bottom: 2rpx solid $border-color;
 
+		.material {
+			margin-top: 10rpx;
 
-				.lable {
-					width: 132rpx;
-					text-align: center;
-					background-color: #F7F9FA;
-					font-size: 26rpx;
-					border-right: 2rpx solid $border-color;
-					flex-shrink: 0;
-				}
+			.left {
+				width: 40rpx;
+			}
+
+			.zdy_check {
+				width: 30rpx;
+				height: 30rpx;
+				border: 2rpx solid #c8c9cc;
+				border-radius: 4rpx;
 
-				.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;
+			}
 
+			.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;
 
-				.content_num {
+				.item {
 					display: flex;
-					align-items: center;
-					padding: 0 4rpx;
+					border-bottom: 2rpx solid $border-color;
 
-					/deep/ .uni-input-input {
-						border: 2rpx solid #F0F8F2;
-						background: #F0F8F2;
-						color: $theme-color;
-					}
 
-					.unit {
-						width: 90rpx;
+					.lable {
+						width: 132rpx;
 						text-align: center;
-						font-size: 24rpx;
-						color: #404446;
+						background-color: #F7F9FA;
+						font-size: 26rpx;
+						border-right: 2rpx solid $border-color;
+						flex-shrink: 0;
 					}
-				}
 
-				.pd4 {
-					padding: 4rpx 8rpx;
-				}
+					.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 {
+							border: 2rpx solid #F0F8F2;
+							background: #F0F8F2;
+							color: $theme-color;
+						}
 
+						.unit {
+							width: 90rpx;
+							text-align: center;
+							font-size: 24rpx;
+							color: #404446;
+						}
+					}
 
+					.pd4 {
+						padding: 4rpx 8rpx;
+					}
 
-				&:last-child {
-					border-bottom: none;
+
+
+					&:last-child {
+						border-bottom: none;
+					}
 				}
-			}
 
-			.ww55 {
-				width: 55%;
-			}
+				.ww55 {
+					width: 55%;
+				}
 
-			.ww45 {
-				width: 45%;
+				.ww45 {
+					width: 45%;
+				}
 			}
 		}
+
+
+	}
+
+	.bottom-wrapper {
+		.btn_box {
+			width: 750rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			background: $theme-color;
+			text-align: center;
+			font-size: 36rpx;
+			font-style: normal;
+			font-weight: 400;
+			color: #fff;
+		}
 	}
 
 
-}
+	.flex_btn {
+		position: fixed;
 
-.bottom-wrapper {
-	.btn_box {
-		width: 750rpx;
-		height: 88rpx;
-		line-height: 88rpx;
+		right: 0;
+		bottom: 160rpx;
+		width: 140rpx;
+		height: 66rpx;
+		line-height: 66rpx;
+		border-radius: 22rpx 0 0 22rpx;
 		background: $theme-color;
 		text-align: center;
-		font-size: 36rpx;
+		font-size: 22rpx;
 		font-style: normal;
 		font-weight: 400;
 		color: #fff;
 	}
-}
-
-
-.flex_btn {
-	position: fixed;
-
-	right: 0;
-	bottom: 160rpx;
-	width: 140rpx;
-	height: 66rpx;
-	line-height: 66rpx;
-	border-radius: 22rpx 0 0 22rpx;
-	background: $theme-color;
-	text-align: center;
-	font-size: 22rpx;
-	font-style: normal;
-	font-weight: 400;
-	color: #fff;
-}
-
-.out_box {
-	margin: 20rpx;
-	display: flex;
-	justify-content: center;
-	color: $theme-color;
-	font-size: 28rpx;
-}
+
+	.out_box {
+		margin: 20rpx;
+		display: flex;
+		justify-content: center;
+		color: $theme-color;
+		font-size: 28rpx;
+	}
+
+	.popup_list {
+		width: 400rpx;
+		height: 400rpx;
+	}
 </style>