From 263c9557fa656b02d2e44445e70fd003462231a0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 24 Dec 2024 14:40:15 +0800
Subject: [PATCH] =?UTF-8?q?asn=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |  37 +-
 src/common/style/new_style.css                |   5 +
 src/manifest.json                             |   4 +-
 src/mycomponents/balance/intoDeliNo.vue       |  37 ++
 src/mycomponents/item/itemCompareQty.vue      |   8 +-
 src/mycomponents/job/jobBottom.vue            |   2 +-
 src/mycomponents/job/jobComMainCardAsn.vue    |   2 +-
 src/mycomponents/job/jobComMainDetailCard.vue |  11 +-
 src/mycomponents/job/jobTopAsn.vue            |   2 +-
 src/mycomponents/package/packageCard.vue      |  30 +-
 src/mycomponents/package/packageList.vue      |  26 +-
 src/mycomponents/qty/compareQty.vue           |  14 +-
 src/mycomponents/qty/recommendHandleQty.vue   |  15 +-
 src/pages.json                                |  35 ++
 .../coms/comReceiptDetailCardBacth.vue        |  15 +-
 .../coms/comReceiptJobCard.vue                |  10 +-
 .../job/purchaseReceiptAsn.vue                | 559 ++++++++++++++++++
 .../job/purchaseReceiptAsnDetail.vue          | 489 +++++++++++++++
 18 files changed, 1260 insertions(+), 41 deletions(-)
 create mode 100644 src/mycomponents/balance/intoDeliNo.vue
 create mode 100644 src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
 create mode 100644 src/pages/purchaseReceipt/job/purchaseReceiptAsnDetail.vue

diff --git a/src/api/request2.js b/src/api/request2.js
index cb1d2fc0..6e0081bc 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -827,14 +827,29 @@ export function getPurchaseReceiptJobList(params) {
 		data: params,
 	});
 }
-
+/**
+ * 采购收货 任务
+ * status 任务状态 
+ *  开始日期 
+ *  结束日期
+ * 获取日期任务列表
+ * 接口返回添加包装号列表
+ *   @param {*}  
+ */
+export function getPurchaseReceiptASNJobList(params) {
+	return request({
+		url: baseApi + "/wms/purchasereceipt-job-detail/seniorASN",
+		method: "post",
+		data: params,
+	});
+}
 /**
  * 采购收货 任务承接
  * @param {*} id
  * 
  */
-export function takePurchaseReceiptJob(id) {
-	return request({
+export async function takePurchaseReceiptJob(id) {
+	return await request({
 		url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
@@ -846,8 +861,8 @@ export function takePurchaseReceiptJob(id) {
  * @param {*} id
  * 
  */
-export function cancleTakePurchaseReceiptJob(id) {
-	return request({
+export async function cancleTakePurchaseReceiptJob(id) {
+	return await request({
 		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
@@ -890,6 +905,18 @@ export function purchaseReceiptJobSubmit(params) {
 		data: params,
 	});
 }
+/**
+ * asn采购收货 多任务提交
+ * @param {*}  任务id
+ *
+ */
+export function purchaseReceiptJobSubmitASN(params) {
+	return request({
+		url: baseApi + "/wms/purchasereceipt-job-main/executeASN",
+		method: "put",
+		data: params,
+	});
+}
 
 
 /**
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index a2d135ee..0391c5ca 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2179,6 +2179,11 @@ button::after {
 	padding: 5px;
 }
 
+.scan_view_gay {
+	/* #0CC2B6 20% */
+	background: linear-gradient(90deg, rgba(0, 0, 0, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
+}
+
 .scan_view {
 	/* #0CC2B6 20% */
 	background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
diff --git a/src/manifest.json b/src/manifest.json
index 77fcf60a..9b27de7b 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "com.yingtai.pda",
     "appid" : "__UNI__F36DDCF",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 1,
+    "versionName" : "1.0.2",
+    "versionCode" : 2,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/mycomponents/balance/intoDeliNo.vue b/src/mycomponents/balance/intoDeliNo.vue
new file mode 100644
index 00000000..8a272371
--- /dev/null
+++ b/src/mycomponents/balance/intoDeliNo.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="card_view ">
+		<text class="card_batch ">纳入便次</text>
+		<text class="card_content ">{{timestampToDateFormat(planArriveTime)}}<text v-if='deliNo && planArriveTime'>-</text>{{String(deliNo).length < 2 ? ('0' + deliNo) :deliNo }}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {}
+		},
+		props: {
+			planArriveTime: {
+				type: String,
+				default: ""
+			},
+			deliNo: {
+				type: String,
+				default: ""
+			}
+		},
+		methods:{
+			timestampToDateFormat(timestamp) {
+			  const dateObj = new Date(timestamp); // 创建Date对象
+			  const year = dateObj.getFullYear(); // 获取年份
+			  const month = ("0" + (dateObj.getMonth() + 1)).slice(-2); // 获取月份，并补零
+			  const day = ("0" + dateObj.getDate()).slice(-2); // 获取日期，并补零
+			  return `${year}${month}${day}`; // 返回转换后的日期格式
+			}
+		}
+		
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index a4d55922..31ad0d7f 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,18 +3,19 @@
 		<view style="flex: 1;">
 			<item :dataContent="dataContent"></item>
 		</view>
-		<view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; ">
+		<!-- 显示采购标包数量和单位 -->
+		<view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; " >
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"  :isShowSupplierQty='isShowSupplierQty'
 				></recommend-qty>
-				<!-- :objTextStyle='objTextStyle' -->
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-				:handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit">
+				:handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit"  :isShowSupplierQty='isShowSupplierQty'>
 			</compare-qty>
 			<view class="text_packQty"  style="margin-top: 5rpx; margin-right: 20rpx;" v-if="isShowPackCount" >
 				{{dataContent.fromPackCount}}/{{dataContent.toPackCount}}
 			</view>
 			
 		</view>
+	
 	</view>
 </template>
 <script>
@@ -66,6 +67,7 @@
 				type: Boolean,
 				default: false
 			},
+			
 		},
 		watch: {
 
diff --git a/src/mycomponents/job/jobBottom.vue b/src/mycomponents/job/jobBottom.vue
index 5559629b..ea603ba5 100644
--- a/src/mycomponents/job/jobBottom.vue
+++ b/src/mycomponents/job/jobBottom.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
-	<view class="task_item">
+	<view class="task_item" style="background: none;">
 		<view class="uni-flex space-between u-col-center">
 			<view class="uni-flex uni-row  u-col-center">
 				<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
diff --git a/src/mycomponents/job/jobComMainCardAsn.vue b/src/mycomponents/job/jobComMainCardAsn.vue
index 92a8c315..a41577b2 100644
--- a/src/mycomponents/job/jobComMainCardAsn.vue
+++ b/src/mycomponents/job/jobComMainCardAsn.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="task_card">
+		<view class="task_card"  :class="dataContent.scaned?'scan_view':''">
 			<jobTopAsn :dataContent="dataContent"></jobTopAsn>
 			<slot></slot>
 			<view class='split_line'></view>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 41c48f9e..f30c8508 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="task_item">
-		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
+	<view class="task_item" style="background: none;">
+		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;" >
 			<!-- 主子表拆分，没有数量了 -->
 			<itemCompareQty :dataContent="dataContent" 
 			:isShowPackCount="isShowPackCount"
@@ -12,6 +12,7 @@
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
+				<intoDeliNo v-if="isShowBatchDeliNo" :planArriveTime="dataContent.planArriveTime" :deliNo="dataContent.deliNo"></intoDeliNo>
 				<view class="u-flex u-row-between">
 					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
 					</location>
@@ -31,6 +32,7 @@
 	import location from '@/mycomponents/balance/location.vue'
 	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
+	import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 	import level from '@/mycomponents/balance/level.vue'
 
@@ -40,6 +42,7 @@
 			location,
 			toLocation,
 			batch,
+			intoDeliNo,
 			itemCompareQty,
 			level
 		},
@@ -64,6 +67,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
 			isShowFromLocation: {
 				type: Boolean,
 				default: true
diff --git a/src/mycomponents/job/jobTopAsn.vue b/src/mycomponents/job/jobTopAsn.vue
index ad061ee1..01f7ca77 100644
--- a/src/mycomponents/job/jobTopAsn.vue
+++ b/src/mycomponents/job/jobTopAsn.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="task_top">
+	<view class="task_top" style="background: none;">
 		<view class="uni-flex space-between u-col-center align-center" >
 			<job-number v-if="dataContent.asnNumber==null || dataContent.asnNumber==''" :number="dataContent.requestNumber"></job-number>
 			<job-number v-else :number="dataContent.asnNumber"></job-number>
diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
index 6e30e527..4c95de7b 100644
--- a/src/mycomponents/package/packageCard.vue
+++ b/src/mycomponents/package/packageCard.vue
@@ -1,14 +1,14 @@
 <template>
-	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
+	<view :class="dataContent.scaned?'scan_view':isShowPackingNumberProps && dataContent.requestNumber ? 'scan_view_gay' :''" style="background-color: #fff; ">
 		<!-- border-bottom: 1upx solid #EEEEEE; -->
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view style="word-break: break-all;">
 			<!-- 	<container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
 				</container> -->
-				
-				<pack  :packingCode="dataContent.packingNumber" :isShowPackingNumberProps='isShowPackingNumberProps'></pack>
+				<pack :packingCode="dataContent.packingNumber" :isShowPackingNumberProps='isShowPackingNumberProps' :title='packTitle'></pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
+				<intoDeliNo v-if="isShowBatchDeliNo " :planArriveTime="dataContent.planArriveTime" :deliNo="dataContent.deliNo"></intoDeliNo>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
 				</location>
 				<!-- 	<to-location></to-location> -->
@@ -20,7 +20,7 @@
 				<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined" :dataContent="dataContent"
 					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-					:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus" :isShowRecommendQty='isShowRecommendQty'>
+					:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus" :isShowRecommendQty='isShowRecommendQty' :isShowSupplierQty='isShowSupplierQty' :isShowPackUnit='isShowPackUnit'>
 				</compare-qty>
 
 			<!-- 	<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
@@ -40,6 +40,7 @@
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import config from '@/static/config.js'
+	import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
 
 	export default {
 		components: {
@@ -49,7 +50,8 @@
 			toLocation,
 			batch,
 			recommendQty,
-			compareQty
+			compareQty,
+			intoDeliNo
 		},
 
 		data() {
@@ -74,6 +76,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
 			isShowFromLocation: {
 				type: Boolean,
 				default: true
@@ -99,7 +105,19 @@
 			isShowRecommendQty: {
 				type: Boolean,
 				default: true
-			}
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
+			packTitle:{
+				type:String,
+				default: '包装'
+			},
+			isShowPackUnit: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			// 模拟扫描功能
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index a7dd05bb..d8aeb00a 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -10,7 +10,7 @@
 								@click="swipeClick($event,item,'parent',index)">
 								<package-card :dataContent="item" :isShowLocation="false"
 									:isShowFromLocation="isShowFromLocation"
-									:isShowStatus="isShowStatus"></package-card>
+									:isShowStatus="isShowStatus" :isShowSupplierQty='isShowSupplierQty' :isShowBatch="isShowBatch" :isShowBatchDeliNo='isShowBatchDeliNo'></package-card>
 							</uni-swipe-action-item>
 						</uni-swipe-action>
 
@@ -19,13 +19,16 @@
 						style=" width: 100%; background-color: antiquewhite;">
 						<uni-swipe-action>
 							<uni-swipe-action-item
-								:right-options="(pack.scaned)?editAndRemoveOptions : pack.scaned? removeOptions:options"
+								:right-options="(pack.scaned&&isEdit)?editAndRemoveOptions : pack.scaned? removeOptions:options"
 								@click="swipeClick($event,pack,'child',index,item)">
-								<package-card :dataContent="pack" :isShowLocation="false" :isShowFromLocation="false" :isShowPackingNumberProps='isShowPackingNumberProps'
+								
+								<package-card :dataContent="pack" :isShowLocation="false" :isShowFromLocation="false" :isShowPackingNumberProps='isShowPackingNumberProps' :isShowSupplierQty='false'
 									:isShowToLocation="false"
 									:isShowStatus="isShowPackListStatus"
 									 :isShowRecommendQty='false'
-									:isShowBatch="false"></package-card>
+									:isShowBatch="false"
+									:isShowPackUnit='false'
+									:packTitle='packTitle'></package-card>
 							</uni-swipe-action-item>
 						</uni-swipe-action>
 
@@ -85,6 +88,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
 			isShowFromLocation: {
 				type: Boolean,
 				default: true
@@ -124,7 +131,14 @@
 				type: Boolean,
 				default: false
 			},
-
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
+			packTitle:{
+				type:String,
+				default: '包装'
+			},
 		},
 		watch: {
 
@@ -251,7 +265,7 @@
 			confirm(qty) {
 				this.editItem.handleQty = qty;
 				this.$emit("updateData")
-			}
+			},
 
 		}
 	}
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
index 3d4afc90..6cfe11dc 100644
--- a/src/mycomponents/qty/compareQty.vue
+++ b/src/mycomponents/qty/compareQty.vue
@@ -34,7 +34,13 @@
 			<uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
 			</uom>
 		</view>
-		<view>
+		<view  class="uni-flex uni-row " style="justify-content: flex-end;" v-if="dataContent.uom != dataContent.supplierUom && isShowSupplierQty">
+			<view class="text_recommend " style="font-size: 28rpx;margin-left: 12rpx;">
+				{{Number(dataContent.supplierQty) || null}}
+			</view>
+			<uom :uom="dataContent.supplierUom"  style="font-size: 28rpx;margin-left: 12rpx;"></uom>
+		</view>
+		<view v-if="!isShowSupplierQty">
 			<pack-unit v-show="isShowPackUnit" :dataContent="dataContent"></pack-unit>
 			<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
@@ -91,7 +97,11 @@
 			isShowRecommendQty: {
 				type: Boolean,
 				default: true
-			}
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 			handleQty: {
diff --git a/src/mycomponents/qty/recommendHandleQty.vue b/src/mycomponents/qty/recommendHandleQty.vue
index b6ff4c3d..58459d1c 100644
--- a/src/mycomponents/qty/recommendHandleQty.vue
+++ b/src/mycomponents/qty/recommendHandleQty.vue
@@ -10,17 +10,14 @@
 				{{Number(dataContent.qty)}}
 			</view>
 			<uom :uom="dataContent.uom"></uom>
-			<view  class="uni-flex uni-row  center" v-if="dataContent.uom != dataContent.supplierUom && isShowSupplierQty">
-				<span class="uom">|</span>
-				<view class="text_recommend " style="font-size: 30rpx;margin-left: 12rpx;">
-					{{Number(dataContent.supplierQty) || 0}}
-				</view>
-				<uom :uom="dataContent.supplierUom"  style="font-size: 30rpx;margin-left: 12rpx;"></uom>
+		</view>
+		<view  class="uni-flex uni-row " style="justify-content: flex-end;" v-if="dataContent.uom != dataContent.supplierUom && isShowSupplierQty">
+			<view class="text_recommend " style="font-size: 28rpx;margin-left: 12rpx;">
+				{{Number(dataContent.supplierQty) || 0}}
 			</view>
-		
+			<uom :uom="dataContent.supplierUom"  style="font-size: 28rpx;margin-left: 12rpx;"></uom>
 		</view>
-
-		<view>
+		<view  v-if="!isShowSupplierQty">
 			<pack-unit :dataContent="dataContent"></pack-unit>
 				<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
diff --git a/src/pages.json b/src/pages.json
index 6fb4ab50..45ec31df 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -310,6 +310,34 @@
 				}
 			}
 		},
+		{
+			"path": "pages/purchaseReceipt/job/purchaseReceiptAsn",
+			"style": {
+				"navigationBarTitleText": "ASN收货",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
 		{
 			"path": "pages/purchaseReceipt/job/purchaseReject",
 			"style": {
@@ -345,6 +373,13 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/purchaseReceipt/job/purchaseReceiptAsnDetail",
+			"style": {
+				"navigationBarTitleText": "ASN收货任务详情",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/purchaseReturn/record/returnRecord",
 			"style": {
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index e7cf690c..19f6881a 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -13,7 +13,7 @@
 				</template>
 				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="false"
 					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
-					:isShowFromLocation="false" :isShowPackingNumberProps='true'  :isNumPackTips='isNumPackTips'></package-list>
+					:isShowFromLocation="false" :isShowPackingNumberProps='true'  :isNumPackTips='isNumPackTips' :isShowSupplierQty='isShowSupplierQty' :isShowBatch="isShowBatch" :isShowBatchDeliNo='isShowBatchDeliNo' :packTitle='packTitle'></package-list>
 			</uni-collapse-item>
 		</uni-collapse>
 
@@ -76,7 +76,18 @@
 				type: Boolean,
 				default: false
 			},
-
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
+			packTitle:{
+				type:String,
+				default: '包装'
+			},
 		},
 		watch: {
 
diff --git a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
index 82588dbd..42825da2 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<jobComMainCardAsn :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent" :isShowSupplierQty='isShowSupplierQty'></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowSupplierQty='isShowSupplierQty' :isShowBatchDeliNo='isShowBatchDeliNo' :isShowBatch='isShowBatch'></jobComMainDetailCard>
 	</jobComMainCardAsn>
 </template>
 
@@ -25,6 +25,14 @@
 				type: Boolean,
 				default: false
 			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatchDeliNo: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 		methods: {
diff --git a/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
new file mode 100644
index 00000000..6d44bbaf
--- /dev/null
+++ b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
@@ -0,0 +1,559 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<view v-if="jobList.length>0" style="padding-bottom: 110rpx;">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="detailOptions" @click="swipeClick($event,item)">
+						<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)' :isShowSupplierQty='true'
+							:isShowBatch='false' :isShowBatchDeliNo='true'></com-receipt-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+		</view>
+		<view class="page-footer" v-if="jobList.length>0">
+			<button class="btn_single_clear" hover-class="btn_commit_after" @click="clearAll">清空</button>
+			<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+		</view>
+		<receipt-info-popup ref='jobInfoPopup'></receipt-info-popup>
+		<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<winScanPackJob :title="scanHintTitle" ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getPurchaseReceiptASNJobList,
+		takePurchaseReceiptJob,
+		cancleTakePurchaseReceiptJob,
+		purchaseReceiptJobSubmitASN
+	} from '@/api/request2.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		getDetailOption,
+		getDetailRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		calc
+	} from '@/common/calc'
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+	import comReceiptJobCard from '@/pages/purchaseReceipt/coms/comReceiptJobCard.vue'
+	import receiptJobListPopup from '@/pages/purchaseReceipt/coms/receiptJobListPopup.vue'
+	import receiptInfoPopup from '@/pages/purchaseReceipt/coms/receiptInfoPopup.vue'
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+
+	export default {
+		name: 'purchaseReceiptAsn',
+		components: {
+			winScanButton,
+			winScanPackJob,
+			comReceiptJobCard,
+			receiptJobListPopup,
+			receiptInfoPopup,
+			comEmptyView
+		},
+		data() {
+			return {
+				title: '',
+				scanHintTitle: "箱标签/ASN单号",
+				jobList: [],
+				detailOptions: [],
+				detailRemoveOption: [],
+			};
+		},
+		onShow() {},
+		onLoad(option) {
+			this.title = option.title
+			uni.setNavigationBarTitle({
+				title: this.title
+			})
+			this.detailOptions = getDetailOption();
+			this.detailRemoveOption = getDetailRemoveOption();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.receiptjob.goHome();
+				// this.$refs.receiptjob.refresh();
+			} else if (e.index == 1) {
+				this.$refs.receiptjob.openFilter();
+			}
+		},
+		onShow() {
+			uni.$on('updateData', (data) => {
+				this.jobList.forEach(item => {
+					if (item.asnNumber == data.asnNumber && item.itemCode == data.itemCode && item.batch == data.batch) {
+						if (data.handleQty) {
+							item.scaned = true
+						} else {
+							item.scaned = false
+						}
+						item.packingNumber = data.packingNumber
+						item.packQty = data.packQty
+						item.packUnit = data.packUnit
+						item.toLocationCode = data.toLocationCode
+						item.labelQty = data.labelQty
+						item.handleQty = data.handleQty
+						item.convertRate = data.convertRate
+						item.supplierQty = data.supplierQty
+						item.supplierUom = data.supplierUom
+						item.packageDOS = data.packList
+					}
+				})
+			})
+		},
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			getScanResult(result) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				const asnNumber = result.label.asn || result.label.code
+				const isAsn = result.label.code ? true : false
+				
+				try {
+					if (!asnNumber) {
+						this.showMessage("标签格式异常，请重新补打标签")
+						uni.hideLoading();
+						return;
+					}
+					this.scanMessage = ""
+					let filters = []
+					// ASN单号
+					filters = [{
+						column: "asn_number",
+						action: "==",
+						value: asnNumber
+					}, {
+						column: "status",
+						action: "in",
+						value: '1,2',
+					}, {
+						column: "accept_user_id",
+						action: "==",
+						value: this.$store.state.user.id
+					}]
+					getPurchaseReceiptASNJobList({
+						filters: filters,
+						pageNo: 1,
+						pageSize: 100,
+					}).then(async res => {
+						this.scanMessage = result.scanMessage
+						let resultList = res.data.list;
+						uni.hideLoading()
+						if (resultList.length > 0) {
+							// 判断目前是否有已扫描的asn单号
+							const asnObj = this.jobList.find(item => item.asnNumber == asnNumber)
+							// 如果扫描箱标签
+							if (!isAsn) {
+								result.label.lookNumber = result.package.number.substring(result.package.number
+									.length - 5);
+								// 扫描的箱标签asn单号不在列表中给个提示
+								if (!asnObj) {
+									this.$refs.comMessage.showQuestionMessage(`ASN单号【${asnNumber}】不在列表中，是否要按此ASN收货？`, async res => {
+										if (res) {
+											// 承接任务 // 如果任务状态是待处理的情况需要承接
+											if (resultList[0].status == '1') {
+												await this.handleTakePurchaseReceiptJob(resultList[0].masterId, () => {
+													resultList.forEach(item => {
+														item.status = '2'
+														item.acceptUserId = 4
+													})
+												})
+											} else if (resultList[0].status == '2') {
+												// 如果任务状态是进行中的时候需要判断承接人和登录人是否一致
+												if (resultList[0].acceptUserId != this.$store.state.user.id) {
+													this.showMessage(`ASN单号【${asnNumber}】已经被${resultList[0].acceptUserName}承接`)
+													return
+												}
+											}
+											this.jobList = [...this.jobList, ...resultList]
+											const itemObj = this.jobList.find(item => item.asnNumber == asnNumber && item
+												.itemCode == result.label.itemCode)
+											const packObj = itemObj.packageDOS.find(cur => cur.number == result.label
+												.packingNumber)
+											if (packObj.requestNumber) {
+												this.showMessage(`看板编号【${ result.label.lookNumber}】已经收货`)
+												return
+											}
+											if (packObj.scaned) {
+												this.showMessage(`看板编号【${ result.label.lookNumber}】已经扫描`)
+												return
+											}
+											itemObj.scaned = true
+											packObj.scaned = true
+											packObj.handleQty = result.label.qty
+											packObj.packingNumber = result.package.number
+											packObj.packQty = Number(result.package.packQty);
+											packObj.packUnit = result.package.packUnit
+											packObj.labelQty = Number(result.label.qty);
+											packObj.convertRate = result.label.convertRate
+											packObj.supplierQty = parseFloat(calc.div(parseFloat(packObj.handleQty), parseFloat(packObj.convertRate)).toFixed(5))
+											packObj.supplierUom = result.label.purchaseUom
+											this.calcHandleQty(this.jobList);
+										this.scanPopupGetFocus()
+										}else{
+											this.scanPopupGetFocus()
+										}
+									});
+								} else {
+									// 扫描的箱标签asn单号已经在列表中
+									const itemObj = this.jobList.find(item => item.asnNumber == asnNumber && item.itemCode == result
+										.label.itemCode)
+									if (!itemObj) {
+										this.showMessage(`ASN单号【${asnNumber}】物料代码【${result.label.itemCode}】不在列表中 `)
+										return
+									}
+									const packObj = itemObj.packageDOS.find(cur => cur.number == result.label.packingNumber)
+									if (!packObj) {
+										this.showMessage(
+											`ASN单号【${asnNumber}】物料代码【${result.label.itemCode}】不存在看板编号【${ result.label.lookNumber}】`)
+										return
+									}
+									if (packObj.requestNumber) {
+										this.showMessage(`看板编号【${ result.label.lookNumber}】已经收货`)
+										return
+									}
+									if (packObj.scaned) {
+										this.showMessage(`看板编号【${ result.label.lookNumber}】已扫描`)
+										return
+									}
+									itemObj.scaned = true
+									packObj.scaned = true
+									packObj.handleQty = result.label.qty
+									this.calcHandleQty(this.jobList);
+										this.scanPopupGetFocus()
+								}
+
+							} else {
+								// if (asnObj) {
+								// 	this.showMessage("此ASN关联的采购收货任务已扫描")
+								// 	return;
+								// }
+								// 承接任务 // 如果任务状态是待处理的情况需要承接
+								if (resultList[0].status == '1') {
+									await this.handleTakePurchaseReceiptJob(resultList[0].masterId, () => {
+										resultList.forEach(item => {
+											item.status = '2'
+											item.acceptUserId = this.$store.state.user.id
+										})
+									})
+								} else if (resultList[0].status == '2') {
+									// 如果任务状态是进行中的时候需要判断承接人和登录人是否一致
+									if (resultList[0].acceptUserId != this.$store.state.user.id) {
+										this.showMessage(`ASN单号【${asnNumber}】已经被${resultList[0].acceptUserName}承接`)
+										return
+									}
+								}
+								this.jobList = [...this.jobList, ...resultList]
+										this.scanPopupGetFocus()
+							}
+						} else {
+							this.showMessage("未查询到此ASN关联的采购收货任务")
+						}
+					}).catch(error => {
+						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
+						
+							this.scanPopupGetFocus()
+					})
+				} catch (e) {
+					this.showMessage(e.message)
+											this.scanPopupGetFocus()
+				}
+			},
+			calcHandleQty(detailSource) {
+				for (let item of detailSource) {
+					item.handleQty = new Decimal(0).toNumber();
+					// item.qty = new Decimal(0).toNumber();
+					for (let detail of item.packageDOS) {
+						if (detail != undefined) {
+							if (detail.scaned) {
+								item.handleQty = calc.add(item.handleQty, detail.handleQty);
+							}
+							// item.qty = calc.add(item.qty, detail.qty);
+						}
+					}
+				}
+			},
+			async handleTakePurchaseReceiptJob(id, callback) {
+				await takePurchaseReceiptJob(id).then(res => {
+					uni.hideLoading();
+					callback()
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error)
+				})
+			},
+			showMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.packLoseFocus()
+				}
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.packGetFocus()
+						}
+					}
+				});
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "移除") {
+					this.$refs.comMessage.showQuestionMessage("是否要移除当前收货明细?",
+						res => {
+							if (res) {
+								this.jobList = this.jobList.filter(item => item.asnNumber != dataContent.asnNumber || item.itemCode !=
+									dataContent.itemCode)
+								const isHave = this.jobList.some(item => item.asnNumber == dataContent.asnNumber)
+								if (!isHave) {
+									//取消承接任务
+									cancleTakePurchaseReceiptJob(dataContent.masterId).then(res => {
+
+									}).catch(error => {})
+								}
+							}
+						});
+				}
+			},
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './purchaseReceiptAsnDetail?data=' + encodeURIComponent(JSON.stringify(item))
+				});
+			},
+			clearAll() {
+				this.$refs.comMessage.showQuestionMessage("是否确认要清空ASN收货列表?",
+					async res => {
+						if (res) {
+							let masterIds = Array.from(new Set(this.jobList.map(item => item.masterId)))
+							let index = 0
+							//取消承接任务
+							await this.handleCancleTakePurchaseReceiptJob(index, masterIds)
+						}
+					});
+			},
+			async handleCancleTakePurchaseReceiptJob(index, masterIds) {
+				if (index <= masterIds.length - 1) {
+					await cancleTakePurchaseReceiptJob(masterIds[index]).then(res => {
+						this.jobList = []
+						index++
+						this.handleCancleTakePurchaseReceiptJob(index, masterIds)
+					}).catch(error => {})
+				} else {
+					uni.navigateBack({
+						delta: 2
+					});
+				}
+			},
+			commit(){
+				let str =''
+				let str1 =''
+				this.params = []
+				let obj = {}
+				let obj1 = {}
+				this.jobList.forEach(item=>{
+					if(item.scaned){
+						obj = {...item}
+						obj.id = item.masterId
+						if(this.params.some(i => i.asnNumber  == item.asnNumber)){
+							item.packageDOS.forEach(cur=>{
+								if(cur.scaned){
+									obj1 = {
+										...cur,
+										...item,
+										packingNumber:cur.number,
+										number:'',
+										deliNo:item.deliNo,
+										itemCode:item.itemCode,
+										itemDesc:item.itemDesc,
+										itemDesc1:item.itemDesc1,
+										itemDesc2:item.itemDesc2,
+										itemName:item.itemName,
+										backNumber:item.backNumber,
+										packQty:cur.packQty,
+										packUnit:cur.packUnit,
+										purchaseQty:cur.purchaseQty,
+										purchaseStdQty:cur.purchaseStdQty,
+										purchaseUom:cur.purchaseUom,
+										qty:item.qty,
+										remark:cur.remark,
+										supplierBatch:cur.supplierBatch,
+										supplierCode:cur.supplierCode,
+										toLocationCode:item.toLocationCode,
+										uom:item.uom,
+										handleQty:cur.handleQty,
+										qty:item.qty,
+									}
+									obj.subList.push(obj1)
+								}
+							})
+						}else{
+							obj.subList=[]
+							item.packageDOS.forEach(cur=>{
+								if(cur.scaned){
+									obj1 = {
+										...cur,
+										...item,
+										packingNumber:cur.number,
+										number:'',
+										deliNo:item.deliNo,
+										itemCode:item.itemCode,
+										itemDesc:item.itemDesc,
+										itemDesc1:item.itemDesc1,
+										itemDesc2:item.itemDesc2,
+										itemName:item.itemName,
+										backNumber:item.backNumber,
+										packQty:cur.packQty,
+										packUnit:cur.packUnit,
+										purchaseQty:cur.purchaseQty,
+										purchaseStdQty:cur.purchaseStdQty,
+										purchaseUom:cur.purchaseUom,
+										qty:item.qty,
+										remark:cur.remark,
+										supplierBatch:cur.supplierBatch,
+										supplierCode:cur.supplierCode,
+										toLocationCode:item.toLocationCode,
+										uom:item.uom,
+										handleQty:cur.handleQty,
+										qty:item.qty,
+									}
+									obj.subList.push(obj1)
+								}
+							})
+							this.params.push(obj)
+						}
+					}
+					if(item.handleQty>0 && item.handleQty < item.qty){
+						str += `ASN单号${item.asnNumber}】物料代码【${item.itemCode}】实际收货数量【${item.handleQty}】小于任务数量【${item.qty}】，\n`	
+					}
+					if(!item.handleQty){
+						str1 += `ASN单号${item.asnNumber}】物料代码【${item.itemCode}】实际收货数量为0，\n`	
+					}
+				})
+				this.params.forEach(item=>{
+					delete item.packageDOS
+					item.subList.forEach(cur=>{
+						delete cur.packageDOS,
+						delete item.masterId
+					})
+				})
+				//提交
+				if(str || str1){
+					this.$refs.comMessage.showQuestionMessage1(str + '对于未收货部分将创建一个新的收货任务\n'+ str1 +'是否确认提交', 'red', res => {
+						if (res) {
+							this.submitJob()
+						}
+					});
+				}else{
+						this.submitJob()
+				}
+			},
+			submitJob(){
+				purchaseReceiptJobSubmitASN(this.params).then(res => {
+					if (res.data) {
+						// this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data)
+						let str =''
+						let str1 =''
+						res.data.forEach(item=>{
+							if(item.isSuccess === 0 || item.isSuccess === '0'){
+								str+= `ASN单号【${item.asnNumber}】提交成功，生成采购收货记录，${item.recordNumber}\n`	
+							}else{
+								str1+= `ASN单号【${item.asnNumber}】提交失败，失败原因：${item.message}\n`
+							}
+						})
+						if(str){
+							this.showCommitSuccessMessage(str+str1)
+						}else{
+							this.$refs.comMessage.showErrorMessage(str1);
+						}
+						
+					} else {
+						// this.showErrorMessage("提交失败[" + res.msg + "]")
+						this.$refs.comMessage.showErrorMessage("提交失败[" + res.msg + "]");
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.$refs.comMessage.showErrorMessage(error);
+				})
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					uni.navigateBack({
+						delta:1
+					})
+				})
+			},
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			if (this.jobList.length > 0) {
+				this.$refs.comMessage.showQuestionMessage("是否要放弃当前的扫描信息?",
+					async res => {
+						if (res) {
+							let masterIds = Array.from(new Set(this.jobList.map(item => item.masterId)))
+							let index = 0
+							//取消承接任务
+							await this.handleCancleTakePurchaseReceiptJob(index, masterIds)
+						}
+					});
+				return true
+			}
+
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-footer {
+		display: flex;
+		justify-content: flex-end;
+		background: white;
+		padding: 10rpx 20rpx;
+		position: fixed;
+		width: 100%;
+		bottom: 0px;
+	}
+
+	.btn_single_commit,
+	.btn_single_clear {
+		margin: 0px;
+	}
+
+	.btn_single_clear {
+		margin-right: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/purchaseReceiptAsnDetail.vue b/src/pages/purchaseReceipt/job/purchaseReceiptAsnDetail.vue
new file mode 100644
index 00000000..78064a77
--- /dev/null
+++ b/src/pages/purchaseReceipt/job/purchaseReceiptAsnDetail.vue
@@ -0,0 +1,489 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<jobTopAsn :dataContent="jobContent"></jobTopAsn>
+				</view>
+			</view>
+		</view>
+		<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>
+						<!-- 管理精度是批次 -->
+						<comReceiptDetailCardBacth ref='comReceiptDetailCardBacthRef' :dataContent="item" :index="index"
+							:settingParam="jobContent" @remove="updateData" @updateData="updateData"
+							:locationAreaTypeList='toLocationAreaTypeList' :isNumPackTips='true' :isShowSupplierQty='true'
+							:isShowBatch="false" :isShowBatchDeliNo='true' packTitle='看板编号'>
+						</comReceiptDetailCardBacth>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="page-footer">
+			<view style="background-color:ghostwhite; width: 100%; height: 100%;">
+				<view class="uni-flex u-col-center space-between padding_10" style="height: 100%;">
+					<view>
+						<locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode"
+							@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
+						</locationCompare>
+					</view>
+					<view>
+						<!-- <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :locationCode='jobToLocationCode'></win-scan-pack>
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		purchaseReceiptJobSubmit,
+		getPurchaseReceiptJobDetail,
+		takePurchaseReceiptJob,
+		cancleTakePurchaseReceiptJob,
+		getPutawayJobList,
+		getPurchaseReceiptJobDetailListByNmber
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		compareDesc,
+		navigateBack,
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import {
+		getTreeDataSource,
+		createRecordInfo,
+		calcHandleQty,
+		getScanCount,
+		calcTreeHandleQty
+	} from '@/common/detail.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		calc
+	} from '@/common/calc'
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import comReceiptDetailCardBacth from '@/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue'
+	import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import {
+		productDismantleJobClose
+	} from '@/api/request2.js';
+	import {
+		nextTick
+	} from 'vue';
+
+	export default {
+		name: 'purchase_receipt_asn_detail',
+		components: {
+			winScanButton,
+			locationCompare,
+			jobTopAsn,
+			comReceiptDetailCardBacth,
+			winScanPack
+		},
+		data() {
+			return {
+				jobContent: '',
+				detailSource: [],
+				jobToLocationCode: '',
+				toLocationCode: '',
+				scanPackList: [], //记录扫描包装
+				packNumberList: [], //记录所有包装
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			this.jobContent = JSON.parse(decodeURIComponent(option.data));
+			this.jobContent.packList = this.jobContent.packageDOS
+			this.detailSource = [this.jobContent]
+			this.toLocationCode = this.jobContent.toLocationCode
+			this.jobToLocationCode = this.jobContent.toLocationCode
+			this.detailSource = getTreeDataSource(this.detailSource)
+			this.detailSource.forEach(item => {
+				item.subList.forEach(cur => {
+					cur.packList = cur.packageDOS
+					cur.packList.forEach(i => {
+						i.packingNumber = i.remark
+						if (i.scaned == true) {
+							this.scanPackList.push(i)
+						}
+					})
+					this.packNumberList = [...cur.packList]
+				})
+			})
+			this.$nextTick(() => {
+				this.$refs.comReceiptDetailCardBacthRef.forEach(item => {
+					item.resizeCollapse()
+					item.$refs.packageListRef.resizeCollapse()
+				})
+			})
+		},
+		methods: {
+			openScanPopup() {
+				// 第一个参数是库位查精度，第二个参数是判断是否走包装信息接口
+				this.$refs.scanPopup.openScanPopup(this.jobToLocationCode, true);
+			},
+			getScanResult(result) {
+				console.log(result)
+				this.balanceInfo = result.balance
+				this.managementType = result.managementType
+				if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
+					this.getScanResultAfterBatch(result)
+				} else {
+					this.getScanResultAfter(result)
+				}
+			},
+			// 包装扫码之后逻辑
+			getScanResultAfter(result) {
+				try {
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						return;
+					}
+					detail.scaned = true;
+					if (result.label.labelType == "ContainerLabel") {
+						var containerNumber = result.label.container;
+						var itemDetail = detail.subList.filter(r => r.containerNumber == containerNumber);
+						if (itemDetail.length == 0) {
+							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
+						} else {
+							if (itemDetail[0].scaned) {
+								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
+							} else {
+								itemDetail.forEach(item => {
+									item.scaned = true;
+									itemDetail.scanDate = new Date();
+									item.handleQty = item.qty;
+									item.toLocationCode = this.toLocationCode;
+								})
+								calcHandleQty(this.detailSource);
+								this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序
+								this.continueScan()
+								this.$forceUpdate()
+							}
+						}
+					} else if (result.label.labelType == "PurchaseLabel") {
+						var packingNumber = result.package.number;
+						var parentpackingNumber = result.package.parentNumber;
+						var batch = result.label.batch;
+						var qty = result.label.qty;
+						var detail = this.detailSource.find(r => r.itemCode == itemCode);
+						if (detail == undefined) {
+							this.showMessage("物料号【" + itemCode + "】不在列表中")
+						} else {
+							//物料在列表中
+							var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch ==
+								batch);
+							if (itemDetail == undefined) {
+								itemDetail = detail.subList.find(r => r.packingNumber == parentpackingNumber && r.batch ==
+									batch);
+
+								if (itemDetail == undefined) {
+									this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
+								} else {
+									var pack = itemDetail.packList.find(p => p.packingNumber == packingNumber &&
+										p.batch == batch)
+									if (pack == undefined) {
+										this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
+									} else {
+										if (pack.scaned) {
+											pack.scanDate = new Date();
+											this.showMessage("箱码【" + packingNumber + "】已经扫描");
+										} else {
+											pack.scaned = true
+											pack.scanDate = new Date();
+											pack.handleQty = Number(result.label.qty);
+											pack.toLocationCode = this.toLocationCode;
+											pack.labelQty = Number(result.label.qty);
+										}
+									}
+									calcHandleQty(this.detailSource);
+									itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
+									this.$forceUpdate()
+								}
+
+							} else {
+								//扫描的是外包装,将包装集合全部扫描
+								var scanedLength = 0;
+								itemDetail.packList.forEach(res => {
+									if (res.scaned) {
+										scanedLength++;
+									}
+								})
+								if (itemDetail.scaned && scanedLength == itemDetail
+									.packList.length) {
+									itemDetail.scanDate = new Date();
+									this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.scanDate = new Date();
+									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.toLocationCode = this.toLocationCode;
+									itemDetail.labelQty = Number(result.label.qty);
+									itemDetail.packList.forEach(pac => {
+										pac.scaned = true
+										pac.scanDate = new Date();
+										pac.handleQty = Number(pac.qty);
+										pac.toLocationCode = this.toLocationCode;
+									})
+
+									calcTreeHandleQty(this.detailSource);
+									this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序
+									this.continueScan()
+									this.$forceUpdate()
+								}
+							}
+						}
+					}
+
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+			// 批次扫码之后逻辑
+			getScanResultAfterBatch(result) {
+				console.log(222, result)
+				try {
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						return;
+					}
+					detail.scaned = true;
+					if (result.label.labelType == "ContainerLabel") {
+						var containerNumber = result.label.container;
+						var itemDetail = detail.subList.filter(r => r.containerNumber == containerNumber);
+						if (itemDetail.length == 0) {
+							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
+						} else {
+							if (itemDetail[0].scaned) {
+								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
+							} else {
+								itemDetail.forEach(item => {
+									item.scaned = true;
+									itemDetail.scanDate = new Date();
+									item.handleQty = calc.add(item.handleQty, result.label.qty)
+									item.toLocationCode = this.toLocationCode;
+								})
+								// calcHandleQty(this.detailSource);
+								this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序
+
+								this.$forceUpdate()
+							}
+						}
+						this.continueScan()
+					} else if (result.label.labelType == "PurchaseLabel") {
+						// debugger
+						var packingNumber = result.package.number.substring(result.package.number.length - 5);
+						var parentpackingNumber = result.package.parentNumber;
+						var batch = result.label.batch;
+						var qty = result.label.qty;
+						console.log(this.detailSource)
+						var detail = this.detailSource.find(r => r.itemCode == itemCode);
+						if (detail == undefined) {
+							this.showMessage("物料号【" + itemCode + "】不在列表中")
+						} else {
+							//物料在列表中
+							const batchDetail = detail.subList.find(r => r.batch == batch);
+							if (!batchDetail) {
+								this.showMessage("批次【" + batch + "】不在列表中")
+							} else {
+								console.log(batchDetail)
+								const packingDetail = batchDetail.packList.find(r => r.packingNumber == packingNumber);
+								if (!packingDetail) {
+									this.showMessage("看板编号【" + packingNumber + "】不在列表中")
+								} else {
+									if (packingDetail.requestNumber) {
+										this.showMessage(`看板编号【${packingNumber}】已经收货`)
+										return
+									}
+									if (packingDetail.scaned) {
+										this.showMessage("看板编号【" + packingNumber + "】已经扫描");
+									} else {
+										packingDetail.scaned = true
+										packingDetail.packingNumber = packingNumber
+										packingDetail.packQty = Number(result.package.packQty);
+										packingDetail.packUnit = result.package.packUnit
+										packingDetail.toLocationCode = this.toLocationCode;
+										packingDetail.labelQty = Number(result.label.qty);
+										packingDetail.handleQty = Number(qty);
+										packingDetail.convertRate = result.label.convertRate
+										packingDetail.supplierQty = parseFloat(calc.div(parseFloat(packingDetail.handleQty), parseFloat(
+											packingDetail.convertRate)).toFixed(5))
+										packingDetail.supplierUom = result.label.purchaseUom
+										this.scanPackList.push(packingDetail)
+												calcTreeHandleQty(this.detailSource);
+									}
+								}
+
+								setTimeout(() => {
+									this.$refs.comReceiptDetailCardBacthRef.forEach(item => {
+										item.resizeCollapse()
+
+										item.$refs.packageListRef.$refs.collapse2.forEach(cur => {
+											cur.resize()
+										})
+									})
+								}, 500)
+							}
+						}
+						this.continueScan()
+					}
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
+			//继续扫描
+			continueScan() {
+				if (this.scanPackList.length == this.packNumberList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+			showMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
+				setTimeout(r => {
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.scanPopupGetFocus()
+						}
+					});
+				})
+			},
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+			updateData(type,item,index,ele) {
+				if(type == 'parent'){
+
+				}else if(type == 'child'){
+					setTimeout(()=>{
+						this.$refs.comReceiptDetailCardBacthRef.forEach(item=>{
+							item.resizeCollapse()
+							item.$refs.packageListRef.$refs.collapse2.forEach(cur=>{
+								cur.resize()
+							})
+						})
+					},500)
+					calcTreeHandleQty(this.detailSource);
+				}
+			},
+			scanLocationCode(location, code) {
+				if (this.jobContent.allowModifyLocation == 'TRUE') {
+					this.toLocationCode = code;
+					this.jobToLocationCode= code
+					this.toWarehouseCode= location.warehouseCode
+				} else {
+					if (code == this.jobToLocationCode) {
+						this.toLocationCode = code;
+					} else {
+						this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致")
+					}
+				}
+			
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+			},
+		},
+		onUnload(){
+			let data = {}
+			this.detailSource.forEach(item=>{
+				 // data = {...item}
+				 item.subList.forEach(cur=>{
+					  data = {...item,...cur}
+				 })
+			})
+			console.log(this.detailSource)
+			uni.$emit('updateData',data)
+		}
+	}
+</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>
\ No newline at end of file