From 5c81b4219f38f85d92c51a28467ffcbc7f3b73d8 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 1 Dec 2023 15:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/deliver/coms/comDeliverDetailCard.vue | 165 +++--
 pages/deliver/coms/comDeliverJobCard.vue    |   4 +-
 pages/deliver/coms/comScanDeliverPack.vue   | 508 ++++++++++++++++
 pages/deliver/job/deliverDetail.vue         | 630 +++++++++-----------
 pages/deliver/job/deliverDetail2.vue        | 533 +++++++++++++++++
 5 files changed, 1419 insertions(+), 421 deletions(-)
 create mode 100644 pages/deliver/coms/comScanDeliverPack.vue
 create mode 100644 pages/deliver/job/deliverDetail2.vue

diff --git a/pages/deliver/coms/comDeliverDetailCard.vue b/pages/deliver/coms/comDeliverDetailCard.vue
index c596835c..afd9726b 100644
--- a/pages/deliver/coms/comDeliverDetailCard.vue
+++ b/pages/deliver/coms/comDeliverDetailCard.vue
@@ -1,49 +1,87 @@
 <template>
-	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" @change="">
-			<uni-collapse-item :open="true">
-				<template v-slot:title>
-					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
-				</template>
-				<u-line />
-				<view class="" v-for="(item,index) in dataContent.subList">
-					<uni-swipe-action ref="swipeAction">
-						<uni-swipe-action-item @click="swipeClick($event,item)"
-							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item" ></recommend>
-						</uni-swipe-action-item>
-					</uni-swipe-action>
-				</view>
-			</uni-collapse-item>
-		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :dataContent="editItem" :settingParam="settingParam"
-			:handleQty="editItem.record.qty" @confirm="confirm"></balance-qty-edit>
-		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
-		<com-message ref="message"></com-message>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.Items">
+			<uni-collapse ref="collapse">
+				<uni-collapse-item :open="true">
+					<template v-slot:title>
+						<!-- 物品 -->
+						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+					</template>
+					<u-line />
+					<view v-for="(loacation,index) in item.Locations">
+						<view>
+							<view class="uni-flex uni-row space-between">
+								<!-- 推荐库位 -->
+								<location :locationCode="loacation.fromLocationCode">
+								</location>
+							</view>
+							<view v-for="(batch,index) in loacation.Batchs">
+								<recommend-balance style='margin-left: 20px;' :detail="batch"
+									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
+								</recommend-balance>
+								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
+									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
+										实际
+									</view>
+									<view class="uni-flex uni-column" style="width: 100%;">
+										<view v-for="(record,index) in batch.Records">
+											<uni-swipe-action ref="swipeAction">
+												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
+													:right-options="scanOptions">
+													<handle-balance :detail="record" :isShowLocation="false"
+														:isShowBatch="batch.packingNumber!=null">
+													</handle-balance>
+												</uni-swipe-action-item>
+											</uni-swipe-action>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</uni-collapse>
+		</view>
 	</view>
+	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
 </template>
 
 <script>
 	import itemQty from '@/mycomponents/item/itemQty.vue'
 	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
 	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
-	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
 	import {
 		getDetailOption,
-		getDetailEditRemoveOption,
-		getDetailRemoveOption
+		getEditRemoveOption
 	} from '@/common/array.js';
 
 	export default {
+		emits: ['updateData'],
 		components: {
 			itemQty,
 			recommend,
+			recommendBalance,
+			handleBalance,
 			recommendQtyEdit,
+			requiredLocation,
 			balanceQtyEdit,
-			jobDetailPopup,
-			comMessage
+			location,
+			comMessage,
+			detailInfoPopup
 		},
 		props: {
 			dataContent: {
@@ -62,68 +100,69 @@
 		data() {
 			return {
 				option: [],
-				title: "推荐详情",
 				showItem: {},
-				editItem: {
-					record: {
-
-					}
-				},
+				editItem: {},
+				batchItem: {},
 				detailOptions: [],
 				scanOptions: []
 			}
 		},
 
 		mounted() {
-			if (this.detailOptions.length == 0) {
-				this.detailOptions = getDetailOption();
-			}
-			if (this.scanOptions.length == 0) {
-				// this.scanOptions = getDetailEditRemoveOption();
-				if (this.dataContent.allowModifyQty == 1) {
-					this.scanOptions = getDetailEditRemoveOption();
-				} else {
-					this.scanOptions = getDetailRemoveOption();
-				}
-			}
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getEditRemoveOption();
 		},
 
 		methods: {
-			swipeClick(e, item) {
-				if (e.content.text == "详情") {
-					this.detail(item)
-				} else if (e.content.text == "编辑") {
-					this.edit(item)
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, batch, record, index) {
+				if (e.content.text == "编辑") {
+					this.edit(batch, record)
 				} else if (e.content.text == "移除") {
-					this.remove(item)
+					this.remove(batch, record, index)
 				}
 			},
-			edit(item) {
-				this.editItem = item;
-				this.$refs.qtyEdit.openEditPopup(item.balance, item.record.qty);
+
+			edit(batch, item) {
+				let that = this;
+				that.editItem = item;
+				that.batchItem = batch;
+				item.balance.balanceQty=item.balance.qty;
+				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
 			},
 
 			detail(item) {
 				this.showItem = item;
 				this.$refs.receiptHint.openScanPopup()
 			},
-			remove(item) {
+			remove(batch, record, index) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
 					res => {
 						if (res) {
-							item.scaned = false
-							item.record = {}
-							item.balance = {}
-							item.inventoryStatus = item.RecommendInventoryStatus
-							// item.record.qty = 0;
-							this.$forceUpdate()
-							this.$emit('remove', item)
+							batch.Records.splice(index, 1);
+							this.resizeCollapse();
+							this.$emit('updateData', record)
 						}
 					});
 			},
-			confirm(qty) {
-				this.editItem.record.qty = qty;
-				this.$emit('updateData')
+			confirm(val) {
+				this.editItem.qty = val;
+				this.$emit('updateData', this.editItem)
+				// let qty = 0;
+				// this.batchItem.Records.forEach(r => {
+				// 	qty += Number(r.qty);
+				// })
+				// this.batchItem.handleQty = qty;
 			}
 		}
 	}
diff --git a/pages/deliver/coms/comDeliverJobCard.vue b/pages/deliver/coms/comDeliverJobCard.vue
index 5998243a..6daab45f 100644
--- a/pages/deliver/coms/comDeliverJobCard.vue
+++ b/pages/deliver/coms/comDeliverJobCard.vue
@@ -9,13 +9,13 @@
 
  			<view class="task_text">
  				<view class="">
- 					零件号 : {{dataContent.itemCode}}
+ 					发货计划单号 : {{dataContent.deliverPlanNumber}}
  				</view>
  			</view>
 
  			<view class="task_text">
  				<view class="">
- 					目标库位 : {{dataContent.toLocationCode}}
+ 					客户代码 : {{dataContent.customerCode}}
  				</view>
  			</view>
  		</view>
diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue
new file mode 100644
index 00000000..e3ed35ac
--- /dev/null
+++ b/pages/deliver/coms/comScanDeliverPack.vue
@@ -0,0 +1,508 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title">
+						扫描箱码
+						<text class="fr" @click="closeScanPopup()">关闭</text>
+					</view>
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<com-message ref="comMessage"></com-message>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			comMessage,
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label:{},
+				fromInventoryStatuses :"",
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
+				this.$refs.popup.open('bottom');
+			},
+
+			closeScanPopup() {
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses =this.jobContent.outInventoryStatuses
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+			
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				if (location == undefined) {
+					this.fromLocationCode = ''
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
+							if (balanceRes.success) {
+								if (balanceRes.data.list.length == 0) {
+									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+										res => {
+											this.packGetFocus();
+										})
+								} else if (balanceRes.data.list.length == 1) {
+									let balance = balanceRes.data.list[0];
+									this.afterGetBalance(result.label, balance);
+								} else {
+									this.label =result.label;
+									this.showBalanceSelect(balanceRes.data.list);
+								}
+							} else {
+								this.showErrorMessage(balanceRes.message.message);
+							}
+							uni.hideLoading();
+						});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+			
+			selectBalanceItem(balance) {
+				this.afterGetBalance(this.label, balance);
+			},
+			
+
+			afterGetBalance(label, balance) {
+				try {
+					let that = this;
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.AllowModifyBatch == null) {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance) {
+				let batch = {
+					batch: data.lot,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				let record = this.creatRecord(data, balance);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance) {
+				let record = {
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty)>Number(label.balance)?Number(label.balance):Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty += Number(res.qty)
+				})
+				batch.handleQty = handleQty;
+			},
+
+			addRecord(batch, label, balance) {
+				let record = this.creatRecord(label, balance);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 153a5f4f..72015025 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -1,46 +1,51 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
-							@updateData="updateData" @openDetail="openDetail"
-							:locationTypeList="tolocationTypeList">
-						</com-detail-card>
+
+			<scroll-view scroll-y="true" class="">
+				<view v-for="(toLocation, index) in detailSource">
+					<view class="cen_card" style="padding: 20rpx;">
+						<view class="cell_box uni-flex uni-row">
+							<view class="cell_info">
+								<view class="text_lightblue">客户代码</view>
+								<view>{{jobContent.customerCode}}</view>
+							</view>
+							<!-- <view class="cell_info">
+								<view class="text_lightblue">生产线</view>
+								<view>{{toLocation.productionLineCode}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">工位</view>
+								<view>{{ toLocation.workStationCode }}</view>
+							</view> -->
+							<view class="cell_info">
+								<view class="text_lightblue">客户寄售库</view>
+								<view>{{ toLocation.toLocationCode}}</view>
+							</view>
+						</view>
+						<u-line />
 					</view>
+					<comDeliverDetailCard ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					</comDeliverDetailCard>
 				</view>
 			</scroll-view>
 		</view>
 
-		
-		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10"
-				style="background-color:ghostwhite; width: 100%; ">
+		<div class="btn_bottom">
+			<view class="" style="display: flex;flex-direction: row;">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationTypeList="tolocationTypeList"></requiredLocation>
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-
-		<com-message ref="comMessage"></com-message>
+		</div>
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<comScanDeliverPack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanDeliverPack>
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
 	import {
 		getDeliverDetail,
 		getBasicLocationByCode,
@@ -48,60 +53,57 @@
 		cancleTakeDeliverJob,
 		deliverJobSubmit
 	} from '@/api/request2.js';
-	import {
-		getLocationTypeArray
-	} from '@/common/array.js';
-
-	import {
-		getInventoryStatusName,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
 
 	import {
 		goHome,
+		updateTitle,
+		getRemoveOption,
 		getCurrDateTime,
-		getPackingNumberAndBatch
+		getDirectoryItemArray,
+		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
 
 	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
 
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comDeliverDetailCard from '@/pages/deliver/coms/comDeliverDetailCard.vue'
+	import comScanDeliverPack from '@/pages/deliver/coms/comScanDeliverPack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import detailInfoPopup from '@/pages/deliver/coms/detailInfoPopup.vue'
 
 	export default {
+		name: 'issueDetail',
 		components: {
+			jobDetailPopup,
 			winScanButton,
-			winScanPackAndLocation,
-			comMessage,
-			requiredLocation,
-			comDetailCard,
-			detailInfoPopup
+			comDeliverDetailCard,
+			comScanDeliverPack,
+			comMessage
 		},
 		data() {
 			return {
 				id: '',
-				received: false,
-				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
-				managementList: [],
-				fromLocationCode: "",
-				toLocationCode: "",
-				toLocationInfo: {},
-				tolocationTypeList: [],
+				detailOptions: [],
+				scanOptions: [],
+				status:"",
+				received :false
 			};
 		},
+
+		props: {
+
+		},
+
 		onLoad(option) {
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -116,39 +118,24 @@
 				}
 			}
 		},
-		//返回首页
+
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
 			}
 		},
+
 		//拦截返回按钮事件
 		onBackPress(e) {
 			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.received) {
-					//取消承接任务	
-					cancleTakeDeliverJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
+			if (this.received) {
+				//取消承接任务	
+				cancleTakeDeliverJob(this.id).then(res => {}).catch(error => {
+					this.showMessage(err);
+				})
 			}
 		},
 
-		onPullDownRefresh() {
-			this.getDetail();
-			uni.stopPullDownRefresh();
-		},
-
-		mounted() {
-
-		},
 		methods: {
 			//接收
 			receive(callback) {
@@ -175,359 +162,290 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
-							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
-							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
-							that.detailSource = getDataSource(that.subList)
-							that.getLocationInfo(that.toLocationCode);
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.resizeCollapse();
+							uni.hideLoading();
 						} else {
 							that.showMessage('列表数据为0');
 						}
 					}
-
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error)
 				})
 			},
 
-			getLocationInfo(locationCode) {
-				if (locationCode != '') {
-					getBasicLocationByCode(locationCode).then(res => {
-						if (res.data.list.length > 0) {
-							this.toLocationInfo = res.data.list[0]
-						}
-					})
-				}
+			closeScan() {
+				this.resizeCollapse();
 			},
 
-			calcHandleQty() {
-				calcHandleQty(this.detailSource);
-				this.continueScan()
-				this.$forceUpdate();
-			},
-
-			//继续扫描
-			continueScan() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				} else {
-					this.scanPopupGetFocus();
-				}
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
 			},
 
+			
 
-			updateData() {
-				this.calcHandleQty();
-			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
 
-			openDetail(item) {
-				this.$refs.detailInfoPopup.openPopup(item)
-			},
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item=>{
+						itemCodes.push(item.itemCode)
+					})
+				})
 
-			openScanPopup() {
-				let fromlocationCode = '';
-				let fromlocationList = [];
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					item.subList.forEach(l => {
-						//重复的库位不往里面插入
-						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
-							fromlocationList.push(l.fromLocationCode);
-						}
-						//来源库位赋默认值
-						if (fromlocationCode == '') {
-							if (!l.scaned) {
-								fromlocationCode = l.fromLocationCode;
-							}
+				//使用在途库，不查询管理模式
+				if (this.jobContent.useOnTheWayLocation == 'TRUE') {
+					this.submitJob();
+				} else {
+					//获取管理模式，封装参数
+					getManagementPrecisions(itemCodes, locationCode, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							this.submitJob();
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
 						}
-					})
+					});
 				}
-				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
 			},
 
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
 
-			getScanResult(result) {
-				try {
-					var packingNumber = result.balance.packingNumber;
-					var batch = result.balance.batch;
-					var qty = result.balance.qty;
-					var itemCode = result.balance.itemCode;
-					var locationCode = result.balance.locationCode;
-					var inventoryStatus = result.balance.inventoryStatus;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
-					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+				deliverJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成发货记录" + res.data)
 					} else {
-						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch
-						})
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续发货?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
-												this.scanPopupGetFocus();
-											}
-										});
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-									this.calcHandleQty();
-								}
-							}
-						}
+						this.showErrorMessage("提交失败[" + res.msg+"]")
 					}
-				} catch (e) {
-					this.showMessage(e.message)
-				}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
 			},
 
-
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+										record.toContainerNumber = r
+											.ContainerNumber;
+										record.toInventoryStatus = r
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.supplierCode = r.supplierCode;
+
+										//使用在途库不改变管理模式
+										if (this.jobContent.useOnTheWayLocation ==
+											'TRUE') {
+											record.toPackingNumber = r
+												.packingNumber;
+											record.toBatch = r.batch;
+										} else {
+											var info = getPackingNumberAndBatch(
+												this.managementList, r
+												.itemCode,
+												r.packingNumber, r
+												.batch);
+											record.toPackingNumber = info
+												.packingNumber;
+											record.toBatch = info.batch;
+										}
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
 						})
 					})
 				})
-			},
 
-			commit() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
-				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
 
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					this.submitJob();
-				} else if (this.scanCount < this.subList.length) {
-					//扫描数量小于任务数量，判断是否允许部分提交
-					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.submitJob();
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的零件和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
 					}
-				}
+				});
 			},
 
-			submitJob() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				var itemCodes = []
-				this.detailSource.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
 
-				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams()
-						console.log("提交参数", JSON.stringify(params));
-
-						// deliverJobSubmit(params).then(res => {
-						// 	uni.hideLoading()
-						// 	if (res.data) {
-						// 		this.showCommitSuccessMessage("提交成功<br>生成制品收货记录" + res.data, )
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
+						})
 					}
-				});
 
+				})
 			},
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
 
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.toBatch = info.batch;
-							subList.push(detail)
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty += Number(res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty += handleQty;
 						}
 					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
+				}
+				// item.handleQty=itemHandleQty;
 			},
 
-			checkLocation() {
-				var isPass = true;
-				if (this.toLocationCode == "" || this.toLocationCode == null) {
-					this.showMessageHint('请扫描收货库位', callback => {
-						this.$refs.comScanLocation.showLocation();
-					})
-
-					return isPass = false;
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
 				}
-				return isPass;
 			},
 
-			showMessageHint(hint, callback) {
-				this.$refs.comMessage.showErrorMessage(hint, res => {
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-						callback()
+						this.afterCloseMessage()
 					}
 				});
 			},
 
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
 			},
 
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
 			},
 
-			showQuestionMessage(message, callback) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showQuestionMessage(message, res => {
-						if (res) {
-							callback(res);
-						}
-					});
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					uni.navigateTo({
+						url: './issueJob'
+					})
 				})
 			},
 
-			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
 			},
 
-			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
+			closeCommitMessage() {
+				this.openScanPopup();
 			},
 
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
 			},
 
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './deliverJob'
-					})
-				})
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
 			},
 		}
-	}
+	};
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
+	.uni-numbox__value {
+		width: 40px;
 	}
 
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
 	}
 
 
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
 
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
 
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
 
-	}
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
 </style>
diff --git a/pages/deliver/job/deliverDetail2.vue b/pages/deliver/job/deliverDetail2.vue
new file mode 100644
index 00000000..153a5f4f
--- /dev/null
+++ b/pages/deliver/job/deliverDetail2.vue
@@ -0,0 +1,533 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							@updateData="updateData" @openDetail="openDetail"
+							:locationTypeList="tolocationTypeList">
+						</com-detail-card>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+		<com-message ref="comMessage"></com-message>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getDeliverDetail,
+		getBasicLocationByCode,
+		takeDeliverJob,
+		cancleTakeDeliverJob,
+		deliverJobSubmit
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeArray
+	} from '@/common/array.js';
+
+	import {
+		getInventoryStatusName,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+	import detailInfoPopup from '@/pages/deliver/coms/detailInfoPopup.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			comMessage,
+			requiredLocation,
+			comDetailCard,
+			detailInfoPopup
+		},
+		data() {
+			return {
+				id: '',
+				received: false,
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationInfo: {},
+				tolocationTypeList: [],
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.received) {
+					//取消承接任务	
+					cancleTakeDeliverJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeDeliverJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getDeliverDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.subList = res.data.subList;
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.toLocationCode = that.subList[0].toLocationCode
+							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
+							that.detailSource = getDataSource(that.subList)
+							that.getLocationInfo(that.toLocationCode);
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			getLocationInfo(locationCode) {
+				if (locationCode != '') {
+					getBasicLocationByCode(locationCode).then(res => {
+						if (res.data.list.length > 0) {
+							this.toLocationInfo = res.data.list[0]
+						}
+					})
+				}
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						//重复的库位不往里面插入
+						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
+						if (location.length == 0) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.balance.packingNumber;
+					var batch = result.balance.batch;
+					var qty = result.balance.qty;
+					var itemCode = result.balance.itemCode;
+					var locationCode = result.balance.locationCode;
+					var inventoryStatus = result.balance.inventoryStatus;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch
+						})
+						if (itemDetail == undefined) {
+							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+										']不一致,是否继续发货?', res => {
+											if (res) {
+												itemDetail.scaned = true;
+												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.balance = result.balance;
+												itemDetail.balance.balanceQty = result.balance.qty;
+												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+												this.calcHandleQty();
+											} else {
+												this.scanPopupGetFocus();
+											}
+										});
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.submitJob();
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+							"]箱总共[" + this.subList.length + "]箱", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						// deliverJobSubmit(params).then(res => {
+						// 	uni.hideLoading()
+						// 	if (res.data) {
+						// 		this.showCommitSuccessMessage("提交成功<br>生成制品收货记录" + res.data, )
+						// 	} else {
+						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+						// 	}
+						// }).catch(error => {
+						// 	uni.hideLoading()
+						// 	this.showErrorMessage(error)
+						// })
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					uni.navigateTo({
+						url: './deliverJob'
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>