From 1391b4269a36f1baf90cf244671a6ab94dbb25b6 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 12 Mar 2025 16:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/request2.js                           |   9 +-
 src/common/directory.js                       |   1 -
 src/common/style/new_style.css                |   2 +-
 src/mycomponents/recommend/recommendCount.vue |  32 +-
 .../scan/winScanPackAndLocation.vue           |   2 +-
 src/pages.json                                |  15 +-
 src/pages/count/coms/comCountDetailcards.vue  | 162 ++--
 src/pages/count/coms/comCountJobCard.vue      |  18 +-
 src/pages/count/coms/comCountRecordCard.vue   | 168 ++++
 src/pages/count/coms/comwinHint.vue           | 103 +++
 src/pages/count/job/countJob.vue              | 130 +--
 src/pages/count/job/countLightDetail.vue      | 794 +++++++++--------
 .../count/job/countLightDetail_liebiao.vue    | 802 ++++++++++++++++++
 src/pages/count/job/countRecord.vue           | 164 ++++
 15 files changed, 1786 insertions(+), 618 deletions(-)
 create mode 100644 src/pages/count/coms/comCountRecordCard.vue
 create mode 100644 src/pages/count/coms/comwinHint.vue
 create mode 100644 src/pages/count/job/countLightDetail_liebiao.vue
 create mode 100644 src/pages/count/job/countRecord.vue

diff --git a/.env.development b/.env.development
index 0032b291..4ba94ebc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://192.168.0.228:12080/admin-api
+VITE_BASE_URL=http://192.168.0.52:12080/admin-api
 #VITE_BASE_URL=http://localhost:12080/admin-api
 #VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api
 # VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
diff --git a/src/api/request2.js b/src/api/request2.js
index a6a9c1c6..596c15a5 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1814,8 +1814,8 @@ export function inventoryMoveRecordSubmit(params) {
  */
 export function getCountJobList(params) {
 	return request({
-		url: baseApi + "/wms/count-job-main/senior",
-		method: "post",
+		url: baseApi + "/wms/count-job-main/padJobPageList",
+		method: "get",
 		data: params,
 	});
 }
@@ -1835,7 +1835,7 @@ export function getFuzzyCountJobList(params) {
  */
 export function getCountJobDetail(id) {
 	return request({
-		url: baseApi + "/wms/count-job-main/getCountJobById?id=" + id,
+		url: baseApi + "/wms/count-job-main/pdaGetCountJobDetailById?masterId=" + id,
 		method: "get",
 		data: {},
 	});
@@ -1885,9 +1885,10 @@ export function cancleTakeCountJob(id) {
  * @param {*}  任务id
  *
  */
+
 export function countJobSubmit(params) {
 	return request({
-		url: baseApi + "/wms/count-job-main/execute",
+		url: baseApi + "/wms/count-job-main/executePdaForIntex",
 		method: "put",
 		data: params,
 	});
diff --git a/src/common/directory.js b/src/common/directory.js
index 502af6e7..75038a54 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -77,7 +77,6 @@ export function getDirectoryInfo(type) {
 
 	var result = [];
 	var list = uni.getStorageSync("dictionary")
-	console.log(455,uni.getStorageSync("dictionary"))
 	if (list != undefined && list.length > 0) {
 		for (let item of list) {
 			if (item.type == type) {
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 5d12769a..51a2a804 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -262,7 +262,7 @@ uni-page-head .uni-page-head__title {
 	right: 0;
 	top: 50%;
 	transform: translateY(-50%);
-	width: 1px;
+	width: 4rpx;
 	height: 20px;
 	background-color: #ddd;
 }
diff --git a/src/mycomponents/recommend/recommendCount.vue b/src/mycomponents/recommend/recommendCount.vue
index 4d2bc57b..cf3a3e53 100644
--- a/src/mycomponents/recommend/recommendCount.vue
+++ b/src/mycomponents/recommend/recommendCount.vue
@@ -1,26 +1,21 @@
 <template>
-	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; width: 100%; ">
 		<view class="uni-flex uni-row space-between ">
-			<!-- uni-inline-item 暂时拿掉-->
-			<view>
-				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+			<view style="word-break: break-all; width: 75%;">
+				<pack v-if="isShowPack" :isShowPackingNumberProps="true"  :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
 				</location>
 				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 				</location>
 			</view>
-			<view class="uni-flex uni-row center">
-				<!-- <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
-					:isShowStdPack="false"></recommend-qty> -->
-				<!-- 					{{detail.scaned}} -->
-				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)"
-					:isShowRecommendQty="isShowRecommendQty" :isShowStatus="isShowRecommendQty || detail.scaned==true"
-					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
-				</compare-qty>
-				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
-					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
-					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+			<view class="uni-flex center" style="flex-direction: column;word-break: break-all; width: 25%;">
+				<view class="">
+					<status  :status='detail.inventoryStatus'></status>
+				</view>
+				<view class="uni-flex uni-row">
+					<text style="font-size: 32rpx;">{{detail.handleQty}}</text>
+					<uom :uom="detail.uom"></uom>
 				</view>
 			</view>
 		</view>
@@ -34,6 +29,9 @@
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import config from '@/static/config.js'
+	import packUnit from '@/mycomponents/qty/packUnit.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
@@ -41,7 +39,9 @@
 			location,
 			batch,
 			recommendQty,
-			compareQty
+			compareQty,
+			uom,
+			status
 		},
 
 		data() {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index a360b898..f45837ba 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -483,7 +483,7 @@
 				} else {
 					this.$emit("getResult", data);
 				}
-				this.$emit("getCountScanResult", data);
+				this.$emit("getCountScanResult", data,this.managementPrecision);
 			},
 
 			async packCallBack(item) {
diff --git a/src/pages.json b/src/pages.json
index 36797d0a..2fbae562 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2483,10 +2483,20 @@
 
 			}
 		},
+		
+		{
+			"path": "pages/count/job/countRecord",
+			"style": {
+				"navigationBarTitleText": "本次盘点详细",
+				"enablePullDownRefresh": false
+		
+			}
+		},
+		
 		{
 			"path": "pages/count/job/countBlindDetail",
 			"style": {
-				"navigationBarTitleText": "盘点详细(盲盘)",
+				"navigationBarTitleText": "盘点详细",
 				"enablePullDownRefresh": false
 
 			}
@@ -2494,7 +2504,7 @@
 		{
 			"path": "pages/count/job/countLightDetail",
 			"style": {
-				"navigationBarTitleText": "盘点详细(明盘)",
+				"navigationBarTitleText": "盘点详细",
 				"enablePullDownRefresh": false
 
 			}
@@ -2890,6 +2900,7 @@
 				"enablePullDownRefresh": false
 			}
 		}
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index 822ab974..cc68b220 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -1,34 +1,59 @@
 <template>
-	<view class="" style="width: 100%;">
-		<view class="uni-flex uni-row space-between "  style="align-items: center;" >
+	<view :class="backClass" style="width: 100%; padding: 10rpx; border-radius: 10rpx;">
+		<view class="uni-flex uni-row space-between " style="">
 			<view class="">
 				<item :dataContent="dataContent" style="margin-left: 15rpx;"></item>
-				<pack v-if="dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
 				<batch :batch="dataContent.batch"></batch>
 			</view>
 			<view class="">
-				<view class="uni-flex uni-row">
-					<compareQty :dataContent="dataContent" :recommendQty="dataContent.recommendQty"
-					:handleQty="dataContent.handleQty"
-					:isShowRecommendQty ="isShowRecommendQty"
-					> </compareQty>
+				<status :status='dataContent.inventoryStatus'></status>
+			</view>
+		</view>
+		
+		<view class="uni-flex uni-row" style="width: 100%; justify-content: space-around;  margin-top: 10rpx;">
+		<view class="uni-flex uni-row" style="flex: 1;  align-items: center;  justify-content: center;word-break:break-word; ">
+			<view class=""  style="font-size: 30rpx;">
+				<view class=""  style="color: #909399;">库存数量</view>
+				<view class="uni-flex uni-row " style="color:#3C9CFF ; font-size: 30rpx; margin-top: 10rpx; ">
+					<text style="word-wrap: break-word; white-space: normal;"> {{dataContent.qty}}</text>
+					<uom style="color:#3C9CFF ;" :uom="dataContent.uom"/>
+				</view>
+			</view>
+			
+			<view class="" style="margin-left: 30rpx; height: 50%;width: 4rpx;background-color:#D7D7D7;">
+				
+			</view>
+		</view>
+			<view class="uni-flex uni-row" style="flex: 1; align-items: center;justify-content: center;">
+				<view class=""  style="font-size: 30rpx;">
+					<view class=""  style="color: #909399;">累计盘点</view>
+					<view class="uni-flex uni-row " style="color:#FACC91 ;font-size: 30rpx;  margin-top: 10rpx;">
+						<text > {{dataContent.totalRecordCountQty}}</text>
+						<uom style="color:#FACC91 ;" :uom="dataContent.uom"/>
+					</view>
+				</view>
+				<view class="" style="margin-left: 20rpx;" @click="summCount">
+					＞
+				</view>
+				<view class="" style="margin-left: 20rpx;height: 50%;width: 4rpx;background-color:#D7D7D7;">
 					
 				</view>
-				<!-- <view v-if="dataContent.scaned" style="margin-top: 10rpx; float: right;">
-					<button type="primary" size="mini" @click="edit">编辑</button>
-				</view> -->
-				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
-					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
-					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+			</view>
+			<view class="uni-flex uni-row" style="flex: 1; align-items: center;justify-content: center;word-break:break-word;">
+				<view class="" style="font-size: 30rpx;">
+					<view class="" style="color: #909399;">本次盘点</view>
+					<view class="uni-flex uni-row " style="color:#3C9CFF ;font-size: 30rpx; margin-top: 10rpx;">
+						<text > {{dataContent.currentQty}}</text>
+						<uom style="color:#3C9CFF ;" :uom="dataContent.uom"/>
+					</view>
+				</view>
+				<view class="" style="margin-left: 20rpx;" @click="currentCount">
+					＞
 				</view>
 				
-				
-				
-				<!-- <move-status :fromInventoryStatus="dataContent.inventoryStatus" >
-				</move-status> -->
 			</view>
 		</view>
-		
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
@@ -39,19 +64,23 @@
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 	import moveStatus from '@/mycomponents/balance/moveStatus.vue'
 	import config from '@/static/config.js'
-	
+	import status from '@/mycomponents/status/status.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
+
 	export default {
 		components: {
 			item,
 			pack,
 			batch,
 			compareQty,
-			moveStatus
-			
+			moveStatus,
+			status,
+			uom,
+
 		},
 		data() {
 			return {
-		
+				backClass:""//doing,finish
 			};
 		},
 		// 此处定义传入的数据
@@ -77,68 +106,41 @@
 				default: true
 			}
 		},
-		methods: {
-			edit(){
-				this.$emit('editItem',this.dataContent)
-			},
-			isDevlement() {
-				return config.isDevelopment;
-			},
-			copy() {
-				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-				var content = "HPQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" + this.dataContent
-					.batch + ";Q" + this.dataContent.qty
-				// #ifdef H5
-				this.$copyText(content).then(
-					res => {
-						uni.showToast({
-							title: '复制采购标签成功',
-							icon: 'none'
-						})
-					}
-				)
-				// #endif
-				// #ifndef H5
-				uni.setClipboardData({
-					data: content,
-					success: () => {
-						uni.showToast({
-							title: '复制采购标签成功'
-						})
-					}
-				})
-				// #endif
-			},
-			copyPro() {
-				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-				var content = "HMQ;V1.0;I" + this.dataContent.itemCode + ";P" + this.dataContent.packingNumber + ";B" + this.dataContent
-					.batch + ";Q" + this.dataContent.qty
-				// #ifdef H5
-				this.$copyText(content).then(
-					res => {
-						uni.showToast({
-							title: '复制制品标签成功',
-							icon: 'none'
-						})
-					}
-				)
-				// #endif
-				// #ifndef H5
-				uni.setClipboardData({
-					data: content,
-					success: () => {
-						uni.showToast({
-							title: '复制制品标签成功'
-						})
+		watch: {
+			dataContent: {
+				handler(newName, oldName) {
+					if(this.dataContent.countStatus=='wait'){
+						this.backClass="wait"
+					}else if(this.dataContent.countStatus=='doing'){
+						this.backClass="scan_view"
+					}else {
+						this.backClass="finish"
 					}
-				})
-				// #endif
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		methods: {
+			summCount(){
+				this.$emit('summCount', this.dataContent.countAllRecordList)
 			},
-			
+			currentCount(){
+				this.$emit('currentCount', this.dataContent.recordList)
+			}
+
 		},
 	}
-	
 </script>
 
 <style>
+	.wait{
+		background-color: #fff;
+	}
+	
+	.finish{
+		background-color: #E1E3E5;
+	}
+	
+	
 </style>
\ No newline at end of file
diff --git a/src/pages/count/coms/comCountJobCard.vue b/src/pages/count/coms/comCountJobCard.vue
index 30ea3de0..68705d58 100644
--- a/src/pages/count/coms/comCountJobCard.vue
+++ b/src/pages/count/coms/comCountJobCard.vue
@@ -1,16 +1,16 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-
-	<!-- 	<jobComMainDetailCard :dataContent="dataContent">
-		</jobComMainDetailCard> -->
-		<to-location style="margin-left: 20rpx;"  title="盘点库位" :locationCode="dataContent.countSplitCode">
-		</to-location>
-		<view class="" style="margin-left: 40rpx; font-size: 32rpx; font-weight: bold;">
-			阶段 : {{getCountStageName(dataContent.stage)}}
+		
+		<view class="card_view " style="margin-left:10rpx; padding: 8rpx;">
+			<text class="card_to_location " style="color: #6D3EF0; font-weight: bold;" >盘点计划</text>
+			<text class="card_content ">{{dataContent.planNumber}}</text>
 		</view>
-		<view class="" style="margin-left: 40rpx; font-size: 32rpx;font-weight: bold;">
-			策略 : {{isOpenCount(dataContent.isOpenCount) }}
+		
+		<view class="card_view " style="margin-left:10rpx;padding: 8rpx;">
+			<text class="card_to_location " style="color: #E5AC58; font-weight: bold;  " >库位代码</text>
+			<text class="card_content ">{{dataContent.countSplitCode}}</text>
 		</view>
+		
 	</job-com-main-card>
 </template>
 
diff --git a/src/pages/count/coms/comCountRecordCard.vue b/src/pages/count/coms/comCountRecordCard.vue
new file mode 100644
index 00000000..3c07a497
--- /dev/null
+++ b/src/pages/count/coms/comCountRecordCard.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="" style="background-color: #fff; margin-top: 0rpx;">
+		<item-qty style="color: #000; font-weight: bold;" :dataContent="dataContent" :handleQty="dataContent.handleQty"
+			:isShowBalanceQty="true" :showRecommendQty="false" :showStdPack="true">
+		</item-qty>
+		<view class='split_line'></view>
+		<view class="" style="margin-left: 20rpx;">
+			<view class="" v-for="(item,index) in recordList">
+				<uni-swipe-action ref="swipeAction">
+					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="scanOptions">
+						<recommend-count :detail="item" :isShowFromLocation="false"
+							style='margin:1px 0px;color: #000; font-weight: bold;' :isShowRecommendQty="false">
+						</recommend-count>
+
+						<view class='split_line'></view>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+			</view>
+		</view>
+
+
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm"  :isShowStatus="true"
+			:allowEditStatus="editInventoryStatus" :showConfirmCountdown="false" :isShowBalance="true">
+		</count-qty-edit>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import recommendCount from '@/mycomponents/recommend/recommendCount.vue'
+	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+
+	import {
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		deepCopyData,
+
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	export default {
+		components: {
+			item,
+			itemQty,
+			recommendCount,
+			countQtyEdit
+		},
+		props: {
+			recordList: {
+				type: Object,
+				default: {}
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			editInventoryStatus: {
+				type: Boolean,
+				default: true
+			},
+		},
+		// watch: {
+		// 	recordList: {
+		// 		handler(newName, oldName) {
+		// 			if (recordList.length > 0) {
+		// 				this.dataContent.itemName = this.recordList[0].itemName;
+		// 				this.dataContent.itemCode = this.recordList[0].itemCode;
+		// 				var handleQty = 0;
+		// 				this.recordList.forEach(item => {
+		// 					handleQty = calc(handleQty, item.handleQty)
+		// 				})
+		// 				this.dataContent.handleQty = handleQty
+		// 			}
+		// 		}
+		// 	},
+		// 	immediate: true,
+		// 	deep: true
+		// },
+
+		data() {
+			return {
+				option: [],
+				title: "推荐详情",
+				currentEditItem: {},
+				editItem: {
+					record: {
+
+					}
+				},
+				scanOptions: [],
+
+			}
+		},
+
+
+		mounted() {
+			this.scanOptions = getEditRemoveOption();
+		},
+
+		methods: {
+			swipeClick(e, item) {
+				if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+
+			edit(detail) {
+				
+				var data =deepCopyData(detail)
+				this.currentEditItem = detail;
+				this.$refs.countQtyEdit.openEditPopup(data,
+					null);
+			},
+			editConfirm(qty, inventoryStatus, mode) {
+				//按物料，箱码，批次，状态查找
+				
+				let result = this.recordList.find(r =>
+					r.itemCode == this.currentEditItem.itemCode &&
+					r.packingNumber == this.currentEditItem.packingNumber &&
+					r.batch == this.currentEditItem.batch &&
+					r.inventoryStatus == inventoryStatus)
+				//	存在更新状态和数量
+				if (result) {
+					result.handleQty = qty
+					result.inventoryStatus = inventoryStatus;
+				} else {
+					//不存在，添加到列表中
+					var addItem = deepCopyData(this.currentEditItem)
+					addItem.handleQty = qty;
+					addItem.inventoryStatus = inventoryStatus
+					this.recordList.unshift(addItem)
+				}
+				var handleQty=0;
+				this.recordList.forEach(item => {
+					handleQty = calc.add(Number(handleQty), Number(item.handleQty))
+				})
+				this.dataContent.qty=handleQty;
+
+
+			},
+
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							this.recordList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+			confirm(qty) {
+				this.$emit('updateData')
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/count/coms/comwinHint.vue b/src/pages/count/coms/comwinHint.vue
new file mode 100644
index 00000000..df67ef15
--- /dev/null
+++ b/src/pages/count/coms/comwinHint.vue
@@ -0,0 +1,103 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup">
+			<view class="uni-flex uni-column"
+				style="background-color: white;width: 100%; height:700rpx; align-items: center;justify-content: center; border-radius: 10rpx;">
+				<scroll-view style="height:500px ; ">
+					<view class="" style="margin-bottom: 250rpx;">
+						<view class="" style="font-size: 35rpx; font-weight: bold; padding: 15rpx;">
+							盘点记录
+						</view>
+						<view class='split_line'></view>
+						<view class="" style="" v-for="(item, index) in dataContent" :key="index">
+
+							<view class="uni-flex" style="flex-direction: column;">
+								<view class="item uni-flex" style="margin: 20rpx;justify-content: space-between">
+									<text class="item_title" style="font-weight: bold; font-size: 30rpx;">盘点记录单号 :
+									</text>
+									<text class="text_wrap">{{item.recordNumber}}</text>
+								</view>
+								<view class="item uni-flex" style="margin: 20rpx;justify-content: space-between">
+									<text class="item_title" style="font-weight: bold; font-size: 30rpx;">盘点数量 : </text>
+									<view class="uni-flex uni-row center">
+										<text class="text_wrap">{{item.countQty}}</text>
+										<uom :uom="item.uom" />
+									</view>
+
+								</view>
+								<view class="item uni-flex" style="margin: 20rpx;justify-content: space-between">
+									<text class="item_title" style="font-weight: bold; font-size: 30rpx;">盘点人 : </text>
+									<text class="text_wrap">{{item.createName}}</text>
+								</view>
+								<view class="item uni-flex" style="margin: 20rpx;justify-content: space-between">
+									<text class="item_title" style="font-weight: bold; font-size: 30rpx;">盘点时间 : </text>
+									<text class="text_wrap">{{formatDate(item.createTime)}}</text>
+								</view>
+							</view>
+							<view class='split_line'></view>
+						</view>
+
+					</view>
+				</scroll-view>
+				<view class="uni-flex u-row-center " style="width: 100%; position: fixed; bottom: 2rpx;">
+					<view class="close_button" style="width: 100%;" @click="closeScanPopup">
+						关闭</view>
+					<!-- button 滚动不好使 -->
+				</view>
+
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		dateFormat
+	} from '@/common/basic.js';
+
+	import uom from '@/mycomponents/qty/uom.vue'
+	export default {
+		components: {
+			uom,
+
+		},
+
+		props: {
+			title: {
+				type: String,
+				default: ""
+			},
+		},
+
+		data() {
+			return {
+				dataContent: []
+			};
+		},
+		methods: {
+			formatDate: function(val) {
+				return dateFormat(val)
+			},
+			openScanPopup(data) {
+				this.dataContent = data;
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 200)
+
+			},
+			closeScanPopup() {
+				this.$refs.popup.close()
+			},
+		}
+
+
+	}
+</script>
+
+<style>
+	.popup_box {
+		width: 500rpx;
+		height: 500rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index fa45bfd1..b8c361b7 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -1,9 +1,8 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter ref="filter" :isShowFromLocationCode="true" @onQuery="getListByFilter"
-		 fromLoactionCodeName="盘点库位"
-		 :isShowQurery="true">
+		<job-filter ref="filter" :isShowFromLocationCode="true" @onQuery="getListByFilter" fromLoactionCodeName="盘点库位"
+			:isShowQurery="true">
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
@@ -20,8 +19,8 @@
 
 			<uni-load-more :status="loadingType" />
 		</view>
-		<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
-		<winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult'>
+		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
+		<winScanPackJob title="盘点库位" :isShowHistory="false" ref="scanPopup" @getResult='getScanResult'>
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>
@@ -81,11 +80,10 @@
 				detailGiveupOptions: [],
 				title: '',
 				queryParams: {
-					creationTime: "",
-					status: "1,2",
+					creationTime: false,
+					status: false,
 					fromLocationCode: ""
 				},
-				manageModel:import.meta.env.VITE_MANAGE_MODEL
 			};
 		},
 		onLoad(option) {
@@ -150,11 +148,11 @@
 
 				var queryFiltersParams = this.setQueryParam()
 				var params = {
-					filters: queryFiltersParams,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
-					sort: "number",
-					by: "DESC"
+					locationCode:queryFiltersParams.fromLocationCode,
+					viewCurrentDay:queryFiltersParams.viewCurrentDay,
+					viewPendingStatus:queryFiltersParams.viewPendingStatus
 				}
 
 				getCountJobList(params).then(res => {
@@ -186,77 +184,34 @@
 			},
 
 			openJobDetail(item) {
-				// uni.navigateTo({
-				// 	url: './countDetail?id=' + item.id + '&status=' + item.status
-				// });
-				//明盘
-				if (item.isOpenCount == "TRUE") {
-					uni.navigateTo({
-						url: './countLightDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
-
-					});
-				} else {
-					//盲盘
-					uni.navigateTo({
-						url: './countBlindDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
+				uni.navigateTo({
+					url: './countLightDetail?id=' + item.id 
+				});
 
-					});
-				}
 			},
 			setQueryParam() {
-				var filterParams = []
+				var filterParams = {
+					fromLocationCode:"",
+					viewCurrentDay:'',
+					viewPendingStatus:""
+				}
 
 				//只看当天
 				if (this.queryParams.creationTime) {
-					filterParams.push({
-						column: "create_time",
-						action: "between",
-						value: this.queryParams.creationTime
-					})
+					filterParams.viewCurrentDay="true"
 				}
 				//只看待处理
 				if (this.queryParams.status) {
-					filterParams.push({
-						column: "status",
-						action: "in",
-						value: this.queryParams.status
-					})
+					filterParams.viewPendingStatus="true"
 				} else {
-					filterParams.push({
-						column: "status",
-						action: "in",
-						value: "1,2"
-					})
+					filterParams.viewPendingStatus="false"
 				}
 
-
 				//来源库位
 				if (this.queryParams.fromLocationCode) {
-					filterParams.push({
-						column: "countSplitCode",
-						action: "==",
-						value: this.queryParams.fromLocationCode
-					})
+					filterParams.fromLocationCode=this.queryParams.fromLocationCode
 				}
 
-				filterParams.push({
-					column: "countSplitType",
-					action: "==",
-					value: "locationCode"
-				})
-
-				filterParams.push({
-					column: "isOpenCount",
-					action: "==",
-					value: "TRUE"
-				})
-
-				filterParams.push({
-					column: "accept_user_id",
-					action: "==",
-					value: this.$store.state.user.id
-				})
-
 				return filterParams;
 
 			},
@@ -324,51 +279,22 @@
 					}
 				});
 			},
-
+			//扫描查询回调
 			getScanResult(result) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中....",
 					mask: true
 				});
-				var filters = []
-				filters.push({
-					column: "status",
-					action: "in",
-					value: '1,2'
-				})
-
-				filters.push({
-					column: "countSplitType",
-					action: "==",
-					value: "locationCode"
-				})
-
-				filters.push({
-					column: "isOpenCount",
-					action: "==",
-					value: "TRUE"
-				})
-
-				filters.push({
-					column: "countSplitCode",
-					action: "==",
-					value: result.label.code
-				})
-
-				filters.push({
-					column: "accept_user_id",
-					action: "==",
-					value: this.$store.state.user.id
-				})
-
+				
 				var params = {
-					filters: filters,
 					pageNo: 1,
-					pageSize: 1000,
-					sort: "number",
-					by: "DESC"
+					pageSize: 100,
+					locationCode:result.label.code,
+					viewCurrentDay:"",
+					viewPendingStatus:""
 				}
+
 				getCountJobList(params).then(res => {
 					uni.hideLoading();
 					let resultList = res.data.list;
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 86a3eeff..0c603637 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -1,77 +1,59 @@
 <template>
 	<view class="page-wraper">
-		<view class="header">
-			<view class="">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
-				<view class="cell_box uni-flex uni-row" style=" font-weight: bold;">
-					<view class="cell_info" style="color: #000">
-						<view class="text_lightblue" style="color: #000">阶段</view>
-						<view style="color: #000">{{getCountStageName(jobContent.stage)}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">策略</view>
-						<view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">库位</view>
-						<view style="color: #000">{{fromLocationCode}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">总数</view>
-						<view style="color: #000"> {{allCount}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">已扫描</view>
-						<view style="color: #000">{{scanCount}}</view>
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+					<view class="" style="margin-left: 10rpx; margin-top: 10rpx;margin-bottom: 10rpx;">
+						<text style=" font-size: 32rpx; color: #6750F1">库位代码 </text>
+						<text style="font-size: 35rpx; font-weight: bold;">{{locationCode}}</text>
+
 					</view>
 				</view>
 			</view>
+
 		</view>
-		<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
-		<view style="margin-top: 160rpx; padding-bottom: 130rpx;">
-			<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
-			<scroll-view scroll-y="true" class="" style="margin-bottom: 0px;">
-				<view class="detail-list" v-for="(item, index) in showList" :key="item.id">
+		<view class="page-main" style="margin-bottom: 100rpx;background-color: #F3F4F5">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="" style="background-color: #F3F4F5" v-for="(item, index) in dataList" :key="item.id">
 					<uni-swipe-action ref="swipeAction">
-						<uni-swipe-action-item @click="swipeClick($event,item)"
-							:right-options="item.scaned?scanOptions:detailOptions">
-							<view class="uni-flex uni-row " style="align-items: center;" :class="item.scaned?'scan_view':'item'">
-								<view class="" style="font-size: 30rpx; font-weight: bold;">
-									{{index+1}}.
-								</view>
-								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem"
-									:settingParam="jobContent" @remove="updateData" @updateData="updateData">
+						<uni-swipe-action-item>
+							<view class="uni-flex uni-row "
+								style="align-items: center; margin: 10rpx; border-radius: 10rpx   ;"
+								>
+								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
+									@editItem="editItem" :settingParam="jobContent" @remove="updateData"
+									@summCount="summCount" @currentCount="currentCount" @updateData="updateData">
 								</comCountDetailcards>
 							</view>
-							<view class='split_line'></view>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</view>
 			</scroll-view>
-			<uni-load-more :status="loadingType" v-if="showList.length>0" />
 
 		</view>
 
 		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10" style="background-color:ghostwhite; width: 100%; ">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
 				</view>
 				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submitJob">提交</button>
 				</view>
 			</view>
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
-			@getCountScanResult='getScanResult'>
+			:isShowHistory="false"
+			@getCountScanResult='getCountScanResult'>
 		</win-scan-pack-and-location>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
-			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
+			:allowEditStatus="true" :isShowBalance="true">
 		</count-qty-edit>
-		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comwinHint ref="comHint"></comwinHint>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -79,8 +61,6 @@
 <script>
 	import {
 		getCountJobDetail,
-		takeCountJob,
-		cancleTakeCountJob,
 		countJobSubmit
 	} from '@/api/request2.js';
 	import {
@@ -95,7 +75,8 @@
 		goHome,
 		navigateBack,
 		getPackingNumberAndBatch,
-		compare
+		compare,
+		deepCopyData
 	} from '@/common/basic.js';
 	import {
 		getCountStageName
@@ -119,6 +100,8 @@
 	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
+	import comwinHint from '@/pages/count/coms/comwinHint.vue'
+
 
 	export default {
 		name: 'receipt_detail',
@@ -129,53 +112,38 @@
 			winScanPackAndLocation,
 			countQtyEdit,
 			jobTop,
-			detailInfoPopup
+			detailInfoPopup,
+			comwinHint
 		},
 		data() {
 			return {
 				id: '',
-				receiptJob: {},
-				fromLocationCode: '',
-				isShowPackingCode: true,
+				locationCode: '',
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				balance: {}, //库存余额
-				editInventoryStatus: false,
-				package: {}, //包装
-				label: {}, //标签
 				currentEditItem: {},
+				mainItem: {},
 				jobStatus: "",
-				allCount: 0,
 				scanCount: 0,
 				index: 0,
-				pageSize: 20,
-				showList: [],
-				loadingType: "",
-				allDetails: [],
-				scanOptions: [],
-				detailOptions: [],
+				dataList: [],
 				managementList: [],
-				managementType: ''
+				managementType: '',
+				isOpen:false
+				
 			};
 		},
 		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.title + '详情'
-			})
 			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
+			if (this.id) {
+				this.getDetail();
 			}
-			this.detailOptions = getDetailOption();
-			this.scanOptions = getDetailEditRemoveOption();
+			uni.$on('refreshData', (data) => {
+				// 调用刷新数据的方法
+				this.refreshData(data);
+			});
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -187,56 +155,18 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from === 'backbutton') {
-				if (this.jobStatus == "2") {
-					//取消承接任务	
-					cancleTakeCountJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
+				uni.navigateBack();
 				return true;
 			}
 		},
 
-		onPullDownRefresh() {
-			this.initList();
-			uni.stopPullDownRefresh();
-		},
 
 		mounted() {
 
 		},
-		onReachBottom() {
-			console.log("onReachBottom")
-			//避免多次触发
-			if (this.loadingType == 'nomore') {
-				return;
-			}
-			this.index++;
-			var list = this.getDataPage(this.index, this.pageSize)
-			if (list.length > 0) {
-				// this.showList=list
-				this.showList = this.showList.concat(list)
-			} else {
-				//没有更多了
-				this.loadingType = "nomore";
-			}
 
-		},
+		computed() {},
 		methods: {
-			//接收
-			receive(callback) {
-				if (this.id != null) {
-					takeCountJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
 
 			getDetail() {
 				var that = this;
@@ -250,37 +180,15 @@
 						that.showMessage('未获取到详情');
 					} else {
 						that.jobContent = res.data;
-						that.jobStatus = res.data.status;
-						that.fromLocationCode = that.jobContent.countSplitCode;
-						res.data.subList.forEach(item => {
-							item.recommendQty = item.qty
-							item.handleQty = 0
-							item.countTime = new Date()
-							item.fromLocationCode = that.fromLocationCode;
-						})
-						that.allDetails = res.data.subList;
-						that.allCount = res.data.subList.length;
-						//获取管理模式，封装参数
-						var itemCodes = []
-						this.allDetails.forEach(item => {
-							itemCodes.push(item.itemCode)
-							item.scaned = false 
-						})
-						await getManagementPrecisions(itemCodes, that.fromLocationCode, res => {
-							if (res.success) {
-								this.managementList = res.list;
-								this.managementType = this.managementList.some(item => item.ManagementPrecision ==
-									'BY_BATCH') ? 'BY_BATCH' : ''
-								if (this.managementType == 'BY_BATCH') {
-									this.allDetails.forEach(item => {
-										item.packingNumber = ''
-										item.toPackingNumber = ''
-										item.fromPackingNumber = ''
-									})
-								}
-							}
+						that.jobContent.status = "2";
+						that.locationCode = that.jobContent.locationCode;
+
+						that.dataList = res.data.subList;
+						that.dataList.forEach(res => {
+							res.scaned = false;
 						})
-						that.initList()
+
+						that.updateList(false)
 					}
 
 				}).catch(error => {
@@ -289,47 +197,86 @@
 				})
 			},
 
-			initList() {
-				this.index = 1;
-				this.showList = []
-				this.loadingType = "";
-				this.showList = this.getDataPage(this.index, this.pageSize)
-			},
+			refreshData(recordList) {
+				//记录的数据刷新列表
+				var addList = []
+				recordList.forEach(subItem => {
+					let mainItem = this.dataList.find(r =>
+						r.itemCode == subItem.itemCode &&
+						r.batch == subItem.batch &&
+						r.inventoryStatus == subItem.inventoryStatus)
+					//主列表存在数据
+					if (mainItem) {
+						mainItem.scaned = true;
+						if (!mainItem.recordList) {
+							mainItem.recordList = []
+						}
+						mainItem.recordList.push(subItem)
+					} else {
+						//主列表不存在数据，添加到主列表
+						var detail = this.createBackAddDetailInfo(subItem)
 
-			getDataPage(pageNo, pageSize) {
-				//计算总页数
-				var totalPages = Math.ceil(this.allCount / pageSize);
-				//当前页起始索引
-				const start = (pageNo - 1) * pageSize;
-				const end = start + pageSize; //当前页结束索引
-				return this.allDetails.slice(start, end)
+						if (!detail.recordList) {
+							detail.recordList = []
+						}
+						var recordItem = {
+							scaned: true,
+							isNewJobDetail: "true",
+							itemCode: subItem.itemCode,
+							itemName: subItem.itemName,
+							itemDesc1: subItem.itemDesc1,
+							itemDesc2: subItem.itemDesc2,
+							packingNumber: subItem.packingNumber,
+							toPackingNumber:subItem.toPackingNumber,
+							toBatch:subItem.toBatch,
+							batch: subItem.batch,
+							inventoryStatus: subItem.inventoryStatus,
+							qty: subItem.qty,
+							handleQty: subItem.handleQty,
+							uom: subItem.uom,
+							packUnit: subItem.packUnit,
+							packQty: subItem.packQty,
+							balanceQty: subItem.balanceQty,
+							locationCode: subItem.locationCode
+						}
+						detail.recordList.push(recordItem)
+						addList.push(detail)
+					}
+
+				})
+				if (addList.length > 0) {
+					this.dataList = this.dataList.concat(addList)
+				}
+
+				this.updateList(false);
 
 			},
 
+
 			swipeClick(e, item) {
 				if (e.content.text == "详情") {
 					this.detail(item)
 				} else if (e.content.text == "编辑") {
 					this.editItem(item)
-				} else if (e.content.text == "移除") {
-					this.remove(item)
 				}
 			},
-			detail(item) {
-				this.showItem = item;
-				this.$refs.detailInfoPopup.openPopup(item);
+
+			summCount(countAllRecordList) {
+				if (countAllRecordList) {
+					this.$refs.comHint.openScanPopup(countAllRecordList)
+				} else {
+					this.showMessage("累计盘点数为0")
+				}
 			},
 
-			remove(item, index) {
-				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
-					res => {
-						if (res) {
-							item.scaned = false;
-							item.handleQty = 0;
-							this.showList.splice(index, 1)
-							this.$emit('removePack')
-						}
-					});
+			currentCount(recordList) {
+				if (recordList) {
+					uni.navigateTo({
+						url: `/pages/count/job/countRecord?data=${encodeURIComponent(JSON.stringify(recordList))}`
+					})
+				} else {
+					this.showMessage("请先扫描箱码")
+				}
 			},
 
 
@@ -337,8 +284,8 @@
 
 			openScanPopup() {
 				var fromlocationList = [];
-				fromlocationList.push(this.fromLocationCode)
-				this.$refs.scanPopup.openScanPopupForJob(this.fromLocationCode, fromlocationList, this.jobContent);
+				fromlocationList.push(this.locationCode)
+				this.$refs.scanPopup.openScanPopupForJob(this.locationCode, fromlocationList, this.jobContent);
 			},
 
 			closeScanPopup() {
@@ -358,276 +305,324 @@
 					this.$refs.scanPopup.packLoseFocus();
 				}
 			},
-
-			//明盘
-			getScanResult(result) {
+			
+			getCountScanResult(result, managementPrecision) {
 				var itemCode = result.label.itemCode
 				var packingNumber = result.label.packingNumber
 				var pack = result.package
 				var batch = result.label.batch
 				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
 				var qty = result.balance ? result.balance.qty : result.label.qty;
-
-				//按物料、箱码、批次、状态匹配
-				let items = this.allDetails.filter(r =>
-					r.itemCode === itemCode &&
-					// r.packingNumber === packingNumber &&
-					r.batch === batch &&
-					r.inventoryStatus === inventoryStatus)
-				//不在任务列表中,是否添加库存
-				if (items.length == 0) {
-						// 按批次
-					if (this.managementType == 'BY_BATCH'){
-						this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch +
-							"】不在任务列表中,是否要添加到列表中?",res => {
-								//创建盘点信息，标记为已经扫描
-								if (res) {
-									var detail = this.createAddDetailInfo(pack, qty)
-									detail.countTime = new Date();
-									this.allDetails.push(detail)
-									this.updateList();
-									this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
-										null);
-								} else {
-									this.scanPopupGetFocus();
-								}
-							})
-						}else{
-							this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
-								"】不在任务列表中,是否要添加到列表中?",res => {
-									//创建盘点信息，标记为已经扫描
-									if (res) {
-										var detail = this.createAddDetailInfo(pack, qty)
-										detail.countTime = new Date();
-										this.allDetails.push(detail)
-										this.updateList();
-										this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
-											null);
-									} else {
-										this.scanPopupGetFocus();
-									}
-								})
+				var uom = pack.uom
+				var locationCode = this.locationCode
+				this.managementType = managementPrecision;
+				
+				var recordItem = {
+					scaned: true,
+					isNewJobDetail: "false",
+					itemCode: itemCode,
+					itemName: pack.itemName,
+					itemDesc1: pack.itemDesc1,
+					itemDesc2: pack.itemDesc2,
+					packingNumber: packingNumber,
+					batch: batch,
+					toPackingNumber:packingNumber,
+					toBatch: batch,
+					inventoryStatus: inventoryStatus,
+					qty: qty,
+					handleQty: qty,
+					uom: uom,
+					packUnit: pack.packUnit,
+					packQty: pack.packQty,
+					balanceQty: qty,
+					locationCode: locationCode
+				}
+				this.currentEditItem = recordItem;
+				this.isOpen=true
+				this.$refs.countQtyEdit.openEditPopupShowSeconds(recordItem,
+					null);
+			
+			},
+			
+			setData(scanItem){
+				if(this.isOpen){
+					this.isOpen=false
+					//按批次管理
+					if (this.managementType == 'BY_BATCH') {
+						//按物料、箱码、批次、状态匹配
+						let mainItem = this.dataList.find(r =>
+							r.itemCode == scanItem.itemCode &&
+							r.locationCode == scanItem.locationCode &&
+							r.batch == scanItem.batch &&
+							r.inventoryStatus == scanItem.inventoryStatus)
+								
+						//在任务列表中,添加到对应的recordList
+						if (mainItem) {
+							if (!mainItem.recordList) {
+								mainItem.recordList = []
+							}
+							mainItem.scaned=true;
+							var subItem = mainItem.recordList.find(res =>
+								res.itemCode == scanItem.itemCode &&
+								res.locationCode == scanItem.locationCode &&
+								res.packingNumber == scanItem.packingNumber &&
+								res.batch == scanItem.batch &&
+								res.inventoryStatus == scanItem.inventoryStatus
+							)
+							scanItem.toPackingNumber=""
+							
+							//已经存在，数量累加
+							if (subItem) {
+								subItem.handleQty = calc.add(Number(subItem.handleQty), Number(subItem.handleQty))
+							} else {
+								mainItem.recordList.unshift(scanItem)
+							}
+						} else {
+							//不在任务列表中,添加到列表中
+							var detail = this.createAddDetailInfo(scanItem)
+							scanItem.isNewJobDetail="true"
+								
+							if (!detail.recordList) {
+								detail.recordList = []
+							}
+								
+							var subItem = detail.recordList.find(res =>
+								res.itemCode == scanItem.itemCode &&
+								res.locationCode == scanItem.locationCode &&
+								res.packingNumber == scanItem.packingNumber &&
+								res.batch == scanItem.batch &&
+								res.inventoryStatus == scanItem.inventoryStatus
+							)
+								scanItem.toPackingNumber=""
+							
+							//已经存在，数量累加
+							if (subItem) {
+								subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty))
+							} else {
+								detail.recordList.unshift(scanItem)
+							}
+						
+							
+							this.dataList.unshift(detail)
 						}
-				} else {
-					var selectItem = items[0]
-					//已经扫描
-					if (selectItem.scaned) {
-						// 按批次
-						if (this.managementType == 'BY_BATCH'){
-							this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch +
-								"】已经完成盘点,是否要编辑盘点结果?",
-								res => {
-									if (res) {
-										this.currentEditItem = selectItem;
-										this.$refs.countQtyEdit.openEditPopup(selectItem,
-											null);
-									} else {
-										this.scanPopupGetFocus();
-									}
-								})
-						}else{
-							this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
-								"】已经完成盘点,是否要编辑盘点结果?",
-								res => {
-									if (res) {
-										this.currentEditItem = selectItem;
-										this.$refs.countQtyEdit.openEditPopup(selectItem,
-											null);
-									} else {
-										this.scanPopupGetFocus();
-									}
-								})
+								
+					} else if (this.managementType == 'BY_QUANTITY') {
+						let item = this.dataList.find(r =>
+							r.itemCode == scanItem.itemCode &&
+							r.locationCode == scanItem.locationCode &&
+							r.inventoryStatus == scanItem.inventoryStatus)
+						//在任务列表中,添加到对应的recordList
+						if (item) {
+							if (!item.recordList) {
+								item.recordList = []
+							}
+							item.scaned=true;
+							var subItem = item.recordList.find(res =>
+								res.itemCode == scanItem.itemCode &&
+								res.packingNumber == scanItem.packingNumber &&
+								res.batch == scanItem.batch &&
+								res.locatioCode == scanItem.locatioCode &&
+								res.inventoryStatus == scanItem.inventoryStatus
+							)
+							subItem.toPackingNumber="",
+							subItem.toBatch=""
+							//已经存在，数量累加
+							if (subItem) {
+								subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty))
+							} else {
+								item.recordList.unshift(scanItem)
+							}
+							
+								
+						} else {
+							//不在任务列表中,添加到列表中
+							var detail = this.createAddDetailInfo(scanItem)
+								
+							if (!detail.recordList) {
+								detail.recordList = []
+							}
+							var subItem = detail.recordList.find(res =>
+								res.itemCode == scanItem.itemCode &&
+								res.packingNumber == scanItem.packingNumber &&
+								res.batch == scanItem.batch &&
+								res.inventoryStatus == scanItem.inventoryStatus
+							)
+							subItem.toPackingNumber="",
+							subItem.toBatch=""
+							//已经存在，数量累加
+							if (subItem) {
+								subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty))
+							} else {
+								detail.recordList.unshift(scanItem)
+							}
+								
+							this.currentEditItem = scanItem;
 						}
-					
-
-					} else {
-						//未扫描，赋值
-						selectItem.scaned = true;
-						selectItem.balanceQty = Number(qty)
-						selectItem.handleQty = Number(qty)
-						selectItem.packQty = pack.packQty
-						selectItem.packUnit = pack.packUnit
-						selectItem.parentPackingNumber = pack.parentPackingNumber
-						selectItem.locationCode = this.fromLocationCode
-						selectItem.fromLocationCode = this.fromLocationCode
-
-						this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
-							null);
-						selectItem.countTime = new Date();
-						this.updateList();
 					}
+					this.updateList(true);
 				}
+				
 			},
-
-
-			editConfirm(qty, inventoryStatus, mode) {
-				let that = this;
-				//编辑
-				if (mode == 'edit') {
-					this.currentEditItem.handleQty = qty;
-					this.currentEditItem.inventoryStatus = inventoryStatus;
+			
+			updateList(isGetFocus) {
+				this.calcScanCount()
+				this.calcQtyAndUpdateSatus()
+				this.sortList();
+				this.$forceUpdate()
+				if(isGetFocus){
+					this.scanPopupLoseFocus()
 				}
-				//重新排序
-				this.currentEditItem.countTime = new Date();
-				this.updateList();
-				this.scanPopupGetFocus();
+				
+			},
+			editConfirm(qty, inventoryStatus, mode) {
+				//需要考虑，是否修改状态，修改状态直接添加到列表，不修改，只修改数量
+				this.currentEditItem.handleQty = qty;
+				this.currentEditItem.inventoryStatus = inventoryStatus;
+				this.setData(this.currentEditItem);
+				console.log("editConfirm")
 
 			},
 
-			updateList() {
-				this.allDetails.sort(compare('countTime')); //按扫描信息排序
-				this.initList()
-				this.scanPopupLoseFocus()
-				this.calcAllCount()
-				this.calcScanCount()
+			calcQtyAndUpdateSatus() {
+				this.dataList.forEach(item => {
+					if (Number(item.currentQty) == 0) {
+						if (Number(item.qty) == Number(item.totalRecordCountQty)) {
+							item.countStatus = "finish"
+						} else {
+							item.countStatus = "wait"
+						}
+					} else if (Number(item.currentQty) > 0) {
+						item.countStatus = "doing"
+					}
+				})
 			},
 
-			calcAllCount() {
-				this.allCount = this.allDetails.length;
+			sortList() {
+				const statusOrder = {
+					'wait': 1,
+					'doing': 2,
+					'finish': 3
+				};
+
+				this.dataList.sort((a, b) => {
+					return statusOrder[a.countStatus] - statusOrder[b.countStatus];
+				});
+
 			},
 
+
 			calcScanCount() {
-				this.scanCount = this.allDetails.filter(r => r.scaned === true).length;
+				this.dataList.forEach(main => {
+					if (main.recordList) {
+						var handleQty = 0;
+						main.recordList.forEach(item => {
+							handleQty = calc.add(handleQty, Number(item.handleQty))
+						})
+						main.currentQty = handleQty
+					}
+				})
+
 			},
 
 			editClose() {
-				this.scanPopupGetFocus();
+				this.setData(this.currentEditItem);
 			},
 
 
 			//创建盘盈的明细
-			createAddDetailInfo(pack, qty) {
+			createAddDetailInfo(scanImte) {
 				var detail = {
-					masterId: this.jobContent.id, //新增的明细
-					scaned: true,
-					countDetailNumber: "",
-					ownerCode: "",
-					packingNumber: pack.number,
-					containerNumber: "",
-					batch: pack.batch,
-					inventoryStatus: "OK",
-					itemCode: pack.itemCode,
-					itemName: pack.itemName,
-					itemDesc1: pack.itemDesc1,
-					itemDesc2: pack.itemDesc2,
-					packQty: pack.packQty,
-					packUnit: pack.packUnit,
-					projectCode: "",
-					recommendQty: Number(qty),
-					qty: Number(qty),
-					handleQty: Number(qty),
-					uom: pack.uom,
-					number: pack.number,
-					remark: "",
-					countQty: Number(qty),
-					balanceQty: Number(qty),
-					fromLocationCode: this.fromLocationCode,
-					locationCode: this.fromLocationCode,
-					creator: this.$store.state.user.id,
-					countTime: new Date()
+					scaned:true,
+					isNewJobDetail: "true",
+					batch: scanImte.batch,
+					countAllRecordList: [],
+					currentQty: 0,
+					id: "",
+					inventoryStatus: scanImte.inventoryStatus,
+					itemCode: scanImte.itemCode,
+					itemName: scanImte.itemName,
+					itemDesc1: scanImte.itemDesc1,
+					itemDesc2: scanImte.itemDesc2,
+					packingNumber: scanImte.packingNumber,
+					qty: 0,
+					totalRecordCountQty: 0,
+					uom: scanImte.uom,
+					locationCode: scanImte.locationCode,
+
 				}
 				return detail;
 			},
 
-
-
-			commit() {
-				this.calcAllCount()
-				this.calcScanCount()
-				// if(!this.scanCount){
-				// 	this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交');
-				// 	return
-				// }
-				if (this.scanCount == this.allCount) {
-					this.submitJob();
-				} else if (this.scanCount < this.allCount) {
-					//扫描数量小于任务数量，判断是否允许部分提交
-					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
-							"]总共[" +
-							this.allCount + "],是否把未扫描的盘点数量设置为0?",
-							res => {
-								if (res) {
-									this.allDetails.forEach(item => {
-										if (!item.scaned) {
-											item.scaned = true;
-											item.handleQty = 0
-											item.locationCode = this.fromLocationCode
-											item.fromLocationCode = this.fromLocationCode
-										}
-									})
-									this.submitJob();
-								}
-							});
-
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
-							"]总共[" + this
-							.getTotalCount() + "]", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
+			//创建盘盈的明细
+			createBackAddDetailInfo(subItem) {
+				var detail = {
+					scaned:true,
+					isNewJobDetail: "true",
+					batch: subItem.batch,
+					countAllRecordList: [],
+					currentQty: 0,
+					id: "",
+					inventoryStatus: subItem.inventoryStatus,
+					itemCode: subItem.itemCode,
+					itemName: subItem.itemName,
+					itemDesc1: subItem.itemDesc1,
+					itemDesc2: subItem.itemDesc2,
+					packingNumber: subItem.packingNumber,
+					qty: 0,
+					totalRecordCountQty: 0,
+					uom: subItem.uom,
+					locationCode: subItem.locationCode
 				}
-
+				return detail;
 			},
 
 			submitJob() {
+				if (!this.checkData()) {
+					this.showErrorMessage("当前扫描数据为0,请先扫描")
+					return;
+				}
+
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
-				//获取管理模式，封装参数
-				var itemCodes = []
-				this.allDetails.forEach(item => {
-					itemCodes.push(item.itemCode)
-					// item.scaned = false
+				var params = this.setParams()
+				// return;
+				countJobSubmit(params).then(res => {
+					uni.hideLoading()
+					const str = res.data || ''
+					this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str)
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
-				getManagementPrecisions(itemCodes, this.fromLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams()
-						console.log("提交参数", params);
-						countJobSubmit(params).then(res => {
-							uni.hideLoading()
-							const str = res.data || ''
-							this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str)
-							// if (res.data) {
-							// 	this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
-							// } else {
-							// 	this.showErrorMessage("提交失败[" + res.msg + "]")
-							// }
-						}).catch(error => {
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
+			},
+
+			checkData() {
+				var isCheck = false;
+				this.dataList.forEach(item => {
+					if (item.scaned) {
+						isCheck = true
 					}
 				})
+				return isCheck;
 			},
 
 			setParams() {
+				var submitData = {
+					number: this.jobContent.number,
+					locationCode: this.locationCode,
+					recordList: []
+				}
 				var subList = []
-				var creator = this.$store.state.user.id
-console.log(this.allDetails)
-				this.allDetails.forEach(item => {
-					if (item.scaned) {
-						item.countQty = item.handleQty;
-						var info = getPackingNumberAndBatch(this.managementList, item.itemCode,
-							item.packingNumber, item.batch);
-						item.toPackingNumber = info.packingNumber;
-						item.packingNumber = info.packingNumber;
-						item.fromPackingNumber = info.packingNumber;
-
+				this.dataList.forEach(item => {
+					if (item.scaned && item.recordList && item.recordList.length > 0) {
+						submitData.recordList = submitData.recordList.concat(item.recordList)
+						
 					}
-					subList.push(item)
-				})
 
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
+				})
+				return submitData;
 			},
 
 
@@ -672,9 +667,6 @@ console.log(this.allDetails)
 			getCountStageName(value) {
 				return getCountStageName(value)
 			},
-			isOpenCount(value) {
-				return value == "TRUE" ? "明盘" : "盲盘"
-			}
 
 		}
 
diff --git a/src/pages/count/job/countLightDetail_liebiao.vue b/src/pages/count/job/countLightDetail_liebiao.vue
new file mode 100644
index 00000000..8175c5f9
--- /dev/null
+++ b/src/pages/count/job/countLightDetail_liebiao.vue
@@ -0,0 +1,802 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+					<view class="" style="margin-left: 10rpx; margin-top: 10rpx;margin-bottom: 10rpx;">
+						<text style=" font-size: 32rpx; color: #6750F1">库位代码 </text>
+						<text style="font-size: 35rpx; font-weight: bold;">{{fromLocationCode}}</text>
+
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view class="page-main" style="margin-bottom: 100rpx;background-color: #F3F4F5">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="" style="background-color: #F3F4F5" v-for="(item, index) in showList" :key="item.id">
+					<uni-swipe-action ref="swipeAction">
+						<uni-swipe-action-item @click="swipeClick($event,item)"
+							:right-options="item.scaned?scanOptions:detailOptions">
+							<view class="uni-flex uni-row "
+								style="align-items: center; margin: 10rpx; border-radius: 10rpx   ;"
+								:class="item.scaned?'scan_view':'item'">
+								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
+									@editItem="editItem" :settingParam="jobContent" @remove="updateData"
+									@updateData="updateData">
+								</comCountDetailcards>
+							</view>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+			</scroll-view>
+			<uni-load-more :status="loadingType" v-if="showList.length>0" />
+
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</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 :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
+			@getCountScanResult='getCountScanResult'>
+		</win-scan-pack-and-location>
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
+			:allowEditStatus="true" :isShowBalance="jobContent.isOpenCount=='TRUE'">
+		</count-qty-edit>
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getCountJobDetail,
+		countJobSubmit
+	} from '@/api/request2.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		goHome,
+		navigateBack,
+		getPackingNumberAndBatch,
+		compare
+	} from '@/common/basic.js';
+	import {
+		getCountStageName
+	} from '@/common/directory.js';
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption,
+		getClearOption
+	} from '@/common/array.js';
+
+	import {
+		getManagementPrecisions,
+	} from '@/common/balance.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comCountDetailcards from '@/pages/count/coms/comCountDetailcards.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comCountDetailcards,
+			winScanPackAndLocation,
+			countQtyEdit,
+			jobTop,
+			detailInfoPopup
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				fromLocationCode: '',
+				isShowPackingCode: true,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				balance: {}, //库存余额
+				editInventoryStatus: false,
+				package: {}, //包装
+				label: {}, //标签
+				currentEditItem: {},
+				jobStatus: "",
+				allCount: 0,
+				scanCount: 0,
+				index: 0,
+				pageSize: 20,
+				showList: [],
+				loadingType: "",
+				allDetails: [],
+				scanOptions: [],
+				detailOptions: [],
+				managementList: [],
+				managementType: ''
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			if (this.id) {
+				this.getDetail();
+			}
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				uni.navigateBack();
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.initList();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		
+		computed(){
+		},
+		onReachBottom() {
+			console.log("onReachBottom")
+			//避免多次触发
+			if (this.loadingType == 'nomore') {
+				return;
+			}
+			this.index++;
+			var list = this.getDataPage(this.index, this.pageSize)
+			if (list.length > 0) {
+				// this.showList=list
+				this.showList = this.showList.concat(list)
+			} else {
+				//没有更多了
+				this.loadingType = "nomore";
+			}
+
+		},
+		methods: {
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getCountJobDetail(that.id).then(async res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						that.jobContent = res.data;
+						that.jobStatus = res.data.status;
+						that.fromLocationCode = that.jobContent.countSplitCode;
+						res.data.subList.forEach(item => {
+							item.kucunQty=10
+							item.pandianQty=50
+							item.currentQty=0
+							item.recommendQty = item.qty
+							item.handleQty = 0
+							item.countTime = new Date()
+							item.fromLocationCode = that.fromLocationCode;
+						})
+						
+						
+						that.allDetails = res.data.subList;
+						that.allCount = res.data.subList.length;
+						that.updateList()
+					}
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+			
+
+			initList() {
+				this.index = 1;
+				this.showList = []
+				this.loadingType = "";
+				this.showList = this.getDataPage(this.index, this.pageSize)
+			},
+
+			getDataPage(pageNo, pageSize) {
+				//计算总页数
+				var totalPages = Math.ceil(this.allCount / pageSize);
+				//当前页起始索引
+				const start = (pageNo - 1) * pageSize;
+				const end = start + pageSize; //当前页结束索引
+				return this.allDetails.slice(start, end)
+
+			},
+
+			swipeClick(e, item) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.editItem(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
+			detail(item) {
+				this.showItem = item;
+				this.$refs.detailInfoPopup.openPopup(item);
+			},
+
+			remove(item, index) {
+				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							item.scaned = false;
+							item.handleQty = 0;
+							this.showList.splice(index, 1)
+							this.$emit('removePack')
+						}
+					});
+			},
+
+
+			updateData() {},
+
+			openScanPopup() {
+				var fromlocationList = [];
+				fromlocationList.push(this.fromLocationCode)
+				this.$refs.scanPopup.openScanPopupForJob(this.fromLocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packLoseFocus();
+				}
+			},
+
+			//明盘
+			getCountScanResult(result, managementPrecision) {
+				var itemCode = result.label.itemCode
+				var packingNumber = result.label.packingNumber
+				var pack = result.package
+				var batch = result.label.batch
+				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
+				var qty = result.balance ? result.balance.qty : result.label.qty;
+				var uom = pack.uom
+				this.managementType = managementPrecision;
+
+				//按批次管理
+				if (this.managementType == 'BY_BATCH') {
+					//按物料、箱码、批次、状态匹配
+					let item = this.allDetails.find(r =>
+						r.itemCode == itemCode &&
+						r.batch == batch &&
+						r.inventoryStatus == inventoryStatus)
+
+					//在任务列表中,添加到对应的recordList
+					if (item) {
+						if (!item.recordList) {
+							item.recordList = []
+						}
+						var recordItem = {
+							itemCode: itemCode,
+							packingNumber: packingNumber,
+							batch: batch,
+							inventoryStatus: inventoryStatus,
+							qty: qty,
+							handleQty:qty,
+							uom: uom,
+							packUnit:pack.packUnit,
+							packQty:pack.packQty,
+							balanceQty:qty,
+							countQty:qty,
+							fromLocationCode:result.fromLocationCode
+						}
+						item.countTime = new Date();
+						item.recordList.unshift(recordItem)
+						item.currentQty=item.recordList.length
+						this.$refs.countQtyEdit.openEditPopupShowSeconds(recordItem,
+							null);
+						this.updateList();
+					} else {
+						//不在任务列表中,添加到列表中
+						var detail = this.createAddDetailInfo(pack, qty)
+						detail.countTime = new Date();
+						this.allDetails.push(detail)
+						this.updateList();
+						this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+							null);
+					}
+
+				} else if (this.managementType == 'BY_QUANTITY') {
+						let item = this.allDetails.find(r =>
+							r.itemCode == itemCode &&
+							r.inventoryStatus == inventoryStatus)
+					//在任务列表中,添加到对应的recordList
+					if (item) {
+						if (!item.recordList) {
+							item.recordList = []
+						}
+						var recordItem = {
+							itemCode: itemCode,
+							packingNumber: packingNumber,
+							batch: batch,
+							inventoryStatus: inventoryStatus,
+							qty: qty,
+							handleQty:qty,
+							uom: uom,
+							packUnit:pack.packUnit,
+							packQty:pack.packQty,
+							balanceQty:qty,
+							countQty:handleQty
+						}
+						item.recordList.push(recordItem)
+						this.updateList();
+						this.$refs.countQtyEdit.openEditPopupShowSeconds(recordItem,
+							null);
+							
+					} else {
+						//不在任务列表中,添加到列表中
+						var detail = this.createAddDetailInfo(pack, qty)
+						detail.countTime = new Date();
+						this.allDetails.push(detail)
+						this.updateList();
+						this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+							null);
+					}		
+							
+				}
+
+
+
+
+
+				// if (items.length == 0) {
+				// 		// 按批次
+				// 	if (this.managementType == 'BY_BATCH'){
+				// 		this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch +
+				// 			"】不在任务列表中,是否要添加到列表中?",res => {
+				// 				//创建盘点信息，标记为已经扫描
+				// 				if (res) {
+				// 					var detail = this.createAddDetailInfo(pack, qty)
+				// 					detail.countTime = new Date();
+				// 					this.allDetails.push(detail)
+				// 					this.updateList();
+				// 					this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+				// 						null);
+				// 				} else {
+				// 					this.scanPopupGetFocus();
+				// 				}
+				// 			})
+				// 		}else{
+				// 			this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
+				// 				"】不在任务列表中,是否要添加到列表中?",res => {
+				// 					//创建盘点信息，标记为已经扫描
+				// 					if (res) {
+				// 						var detail = this.createAddDetailInfo(pack, qty)
+				// 						detail.countTime = new Date();
+				// 						this.allDetails.push(detail)
+				// 						this.updateList();
+				// 						this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+				// 							null);
+				// 					} else {
+				// 						this.scanPopupGetFocus();
+				// 					}
+				// 				})
+				// 		}
+				// } else {
+				// 	var selectItem = items[0]
+				// 	//已经扫描
+				// 	if (selectItem.scaned) {
+				// 		// 按批次
+				// 		if (this.managementType == 'BY_BATCH'){
+				// 			this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch +
+				// 				"】已经完成盘点,是否要编辑盘点结果?",
+				// 				res => {
+				// 					if (res) {
+				// 						this.currentEditItem = selectItem;
+				// 						this.$refs.countQtyEdit.openEditPopup(selectItem,
+				// 							null);
+				// 					} else {
+				// 						this.scanPopupGetFocus();
+				// 					}
+				// 				})
+				// 		}else{
+				// 			this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
+				// 				"】已经完成盘点,是否要编辑盘点结果?",
+				// 				res => {
+				// 					if (res) {
+				// 						this.currentEditItem = selectItem;
+				// 						this.$refs.countQtyEdit.openEditPopup(selectItem,
+				// 							null);
+				// 					} else {
+				// 						this.scanPopupGetFocus();
+				// 					}
+				// 				})
+				// 		}
+
+
+				// 	} else {
+				// 		//未扫描，赋值
+				// 		selectItem.scaned = true;
+				// 		selectItem.balanceQty = Number(qty)
+				// 		selectItem.handleQty = Number(qty)
+				// 		selectItem.packQty = pack.packQty
+				// 		selectItem.packUnit = pack.packUnit
+				// 		selectItem.parentPackingNumber = pack.parentPackingNumber
+				// 		selectItem.locationCode = this.fromLocationCode
+				// 		selectItem.fromLocationCode = this.fromLocationCode
+
+				// 		this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
+				// 			null);
+				// 		selectItem.countTime = new Date();
+				// 		this.updateList();
+				// 	}
+				// }
+			},
+
+
+			editConfirm(qty, inventoryStatus, mode) {
+				let that = this;
+				//编辑
+				if (mode == 'edit') {
+					this.currentEditItem.handleQty = qty;
+					this.currentEditItem.inventoryStatus = inventoryStatus;
+				}
+				//重新排序
+				this.currentEditItem.countTime = new Date();
+				this.updateList();
+				this.scanPopupGetFocus();
+
+			},
+
+			updateList() {
+				this.allDetails.sort(compare('countTime')); //按扫描信息排序
+				this.initList()
+				this.scanPopupLoseFocus()
+				this.calcAllCount()
+				this.calcScanCount()
+				this.calcQtyAndUpdateSatus()
+				this.sortList();
+			},
+			calcQtyAndUpdateSatus(){
+				this.allDetails.forEach(item=>{
+					if(Number(item.currentQty)==0&&Number(Number(item.pandianQty)< Number(item.kucunQty))){
+						item.countStatus="wait"
+					}
+					
+					if(Number(item.currentQty)>0){
+						item.countStatus="doing"
+					}
+					
+					if(Number(item.currentQty)>=Number(item.kucunQty)){
+						item.countStatus="finish"
+					}
+					
+				})
+			},
+			
+			sortList(){
+				const statusOrder = {
+				    'wait': 1,
+				    'doing': 2,
+				    'finish': 3
+				};
+				
+				this.allDetails.sort((a, b) => {
+				    return statusOrder[a.countStatus] - statusOrder[b.countStatus];
+				});
+				
+			},
+
+			calcAllCount() {
+				this.allCount = this.allDetails.length;
+			},
+
+			calcScanCount() {
+				this.scanCount = this.allDetails.filter(r => r.scaned === true).length;
+			},
+
+			editClose() {
+				this.scanPopupGetFocus();
+			},
+
+
+			//创建盘盈的明细
+			createAddDetailInfo(pack, qty) {
+				var detail = {
+					masterId: this.jobContent.id, //新增的明细
+					scaned: true,
+					countDetailNumber: "",
+					ownerCode: "",
+					packingNumber: pack.number,
+					containerNumber: "",
+					batch: pack.batch,
+					inventoryStatus: "OK",
+					itemCode: pack.itemCode,
+					itemName: pack.itemName,
+					itemDesc1: pack.itemDesc1,
+					itemDesc2: pack.itemDesc2,
+					packQty: pack.packQty,
+					packUnit: pack.packUnit,
+					projectCode: "",
+					recommendQty: Number(qty),
+					qty: Number(qty),
+					handleQty: Number(qty),
+					uom: pack.uom,
+					number: pack.number,
+					remark: "",
+					countQty: Number(qty),
+					balanceQty: Number(qty),
+					fromLocationCode: this.fromLocationCode,
+					locationCode: this.fromLocationCode,
+					creator: this.$store.state.user.id,
+					countTime: new Date()
+				}
+				return detail;
+			},
+
+
+
+			commit() {
+				this.calcAllCount()
+				this.calcScanCount()
+				// if(!this.scanCount){
+				// 	this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交');
+				// 	return
+				// }
+				if (this.scanCount == this.allCount) {
+					this.submitJob();
+				} else if (this.scanCount < this.allCount) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
+							"]总共[" +
+							this.allCount + "],是否把未扫描的盘点数量设置为0?",
+							res => {
+								if (res) {
+									this.allDetails.forEach(item => {
+										if (!item.scaned) {
+											item.scaned = true;
+											item.handleQty = 0
+											item.locationCode = this.fromLocationCode
+											item.fromLocationCode = this.fromLocationCode
+										}
+									})
+									this.submitJob();
+								}
+							});
+
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
+							"]总共[" + this
+							.getTotalCount() + "]", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				//获取管理模式，封装参数
+				var itemCodes = []
+				this.allDetails.forEach(item => {
+					itemCodes.push(item.itemCode)
+					// item.scaned = false
+				})
+				getManagementPrecisions(itemCodes, this.fromLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", params);
+						countJobSubmit(params).then(res => {
+							uni.hideLoading()
+							const str = res.data || ''
+							this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str)
+							// if (res.data) {
+							// 	this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
+							// } else {
+							// 	this.showErrorMessage("提交失败[" + res.msg + "]")
+							// }
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					}
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				console.log(this.allDetails)
+				this.allDetails.forEach(item => {
+					if (item.scaned) {
+						item.countQty = item.handleQty;
+						var info = getPackingNumberAndBatch(this.managementList, item.itemCode,
+							item.packingNumber, item.batch);
+						item.toPackingNumber = info.packingNumber;
+						item.packingNumber = info.packingNumber;
+						item.fromPackingNumber = info.packingNumber;
+
+					}
+					subList.push(item)
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			editItem(item) {
+				this.currentEditItem = item;
+				this.$refs.countQtyEdit.openEditPopup(this.currentEditItem,
+					null);
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1);
+				})
+			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			}
+
+		}
+
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+	.header {
+		position: fixed;
+		/* #ifdef H5 */
+		top: 88rpx;
+		/* #endif */
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		z-index: 10;
+		padding: 10rpx;
+		/* 确保头部在内容之上 */
+	}
+
+	.page-footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+
+
+	.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;
+
+	}
+
+	.item {
+		background-color: #fff;
+	}
+
+	.item_scaned {
+		background-color: antiquewhite;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/count/job/countRecord.vue b/src/pages/count/job/countRecord.vue
new file mode 100644
index 00000000..4bc9f809
--- /dev/null
+++ b/src/pages/count/job/countRecord.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-wraper" v-if="dataList.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list">
+						<comCountRecordCard  :dataContent="dataContent" :recordList="dataList"  @removeData="removeData"
+							:isShowStatus="true" @updateData="updateData" @removePack='removePack' :allowEditQty="true"
+							:allowEditStatus="true">
+						</comCountRecordCard>
+					</view>
+				</scroll-view>
+			</view>
+
+		</view>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comCountRecordCard from '@/pages/count/coms/comCountRecordCard.vue'
+
+	import {
+		inventoryMoveRecordSubmit,
+		getBasicLocationByCode,
+		getBasicItemByCode
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray,
+		getItemTypeName,
+		getInventoryStatusName,
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getPackingNumberAndBatchByList,
+		deepCopyData,
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty,
+		createItemInfoForLabel,
+		createDetailInfoForLabel
+	} from '@/common/record.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	export default {
+		components: {
+			comCountRecordCard,
+		},
+		props: {},
+		onLoad(options) {
+			if (options.data) {
+				this.dataList = JSON.parse(decodeURIComponent(options.data));
+				this.fromLocationCode = this.dataList[0].fromLocationCode
+				this.dataContent.itemName = this.dataList[0].itemName;
+				this.dataContent.itemDesc1=this.dataList[0].itemDesc1;
+				this.dataContent.itemCode = this.dataList[0].itemCode;
+				this.dataContent.uom =this.dataList[0].uom;
+				var handleQty = 0;
+				this.dataList.forEach(item => {
+					handleQty = calc.add(Number(handleQty), Number(item.handleQty))
+				})
+				this.dataContent.qty=handleQty;
+
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				uni.$emit('refreshData',this.dataList);
+				uni.navigateBack();
+				return true;
+			}
+		},
+
+		data() {
+			return {
+				fromLocationCode: "",
+				toInventoryStatus: "",
+				businessType: {}, //业务类型
+				dataContent: {},
+				businessTypeCode: "Count",
+				dataList: [],
+				managementType: {}
+			}
+		},
+
+		mounted() {
+
+		},
+
+
+		methods: {
+
+
+			showErrorMessage(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()
+						}
+					}
+				});
+			},
+			updateData() {
+				calcHandleQty(this.dataList);
+				for (var i = 0; i < this.dataList.length; i++) {
+					let item = this.dataList[i];
+					if (item.qty == 0) {
+						this.dataList.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				// for (var i = 0; i < this.dataList.length; i++) {
+				// 	var item = this.dataList[i];
+				// 	if (item.subList.length == 0) {
+				// 		this.dataList.splice(i, 1)
+				// 	}
+				// }
+				// this.updateData();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.dataList.length; i++) {
+					if (this.dataList[i].itemCode == item.itemCode) {
+						this.dataList.splice(i, 1)
+					}
+				}
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.dataList = [];
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file