diff --git a/src/api/request2.js b/src/api/request2.js
index f7fb70e6..750772b6 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1605,6 +1605,14 @@ export function getCountJobList(params) {
 	});
 }
 
+//获取盲盘任务列表
+export function getFuzzyCountJobList(params) {
+	return request({
+		url: baseApi + "/wms/count-job-main/senior-pda",
+		method: "post",
+		data: params,
+	});
+}
 /**
  * 盘点 获取任务明细
  * @param {*}   id 任务id
@@ -1618,6 +1626,19 @@ export function getCountJobDetail(id) {
 	});
 }
 
+/**
+ * 盘点 获取任务明细
+ * @param {*}   id 任务id
+ * 
+ */
+export function getFuuzyCountJobDetail(id) {
+	return request({
+		url: baseApi + "/wms/count-job-main/getCountJobById-pda?id=" + id,
+		method: "get",
+		data: {},
+	});
+}
+
 /**
  * 盘点任务 任务承接
  * @param {*} id
diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue
index 6351ba08..82eb0b42 100644
--- a/src/mycomponents/package/PackageAndItemCard.vue
+++ b/src/mycomponents/package/PackageAndItemCard.vue
@@ -3,12 +3,12 @@
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<view style="word-break: break-all;">
 				<item :dataContent="dataContent" style="margin-left: 4px; padding:0px 5px 5px;"></item>
-				<pack v-if="dataContent.number!=null" :packingCode="dataContent.number"></pack>
+				<pack v-if="dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="dataContent.batch!=null" :batch="dataContent.batch"></batch>
 			</view>
 			<view class="uni-flex uni-row" style="word-break: break-all;">
-				<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined"
-					:dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"
+				<recommend-qty
+					:dataContent="dataContent" :isShowStdPack="false" :isShowStatus="true"
 					:isShowPackCount="false"></recommend-qty>
 			</view>
 		</view>
diff --git a/src/mycomponents/qty/countQtyEdit.vue b/src/mycomponents/qty/countQtyEdit.vue
index 17ff75ab..9f89a579 100644
--- a/src/mycomponents/qty/countQtyEdit.vue
+++ b/src/mycomponents/qty/countQtyEdit.vue
@@ -42,23 +42,28 @@
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
-							<view class='split_line'></view>
-							<view v-if="isShowBalance"
-								class="uni-flex uni-row space-between padding title u-col-center">
-								<text>库存数量 : </text>
-								<view class="uni-flex uni-row uni-center" style="align-items: center;">
-									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
-									<uom :uom="dataContent.uom"></uom>
+
+							<view v-if="isShowBalance">
+								<view class='split_line'></view>
+								<view class="uni-flex uni-row space-between padding title u-col-center">
+									<text>库存数量 : </text>
+									<view class="uni-flex uni-row uni-center" style="align-items: center;">
+										<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
+										<uom :uom="dataContent.uom"></uom>
+									</view>
 								</view>
 							</view>
-							<view class='split_line'></view>
-							<view v-if="isShowStatus" class="uni-flex uni-row space-between title"
-								style="align-items: center; padding-left: 30rpx;">
-								<text>库存状态 : </text>
-								<view class="uni-flex uni-row uni-center" style="align-items: center;">
-									<balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit='true'
-										@updateStatus="updateStatus" @onOpen="clickState">
-									</balanceStatus>
+
+							<view v-if="isShowStatus">
+								<view class='split_line'></view>
+								<view class="uni-flex uni-row space-between padding title u-col-center"
+									style="align-items: center; padding-left: 30rpx;">
+									<text>库存状态 : </text>
+									<view class="uni-flex uni-row uni-center" style="align-items: center;">
+										<balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit='true'
+											@updateStatus="updateStatus" @onOpen="clickState">
+										</balanceStatus>
+									</view>
 								</view>
 							</view>
 							<view class='split_line'></view>
@@ -266,4 +271,4 @@
 	.title {
 		font-size: 30rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index fe787179..8e269f9a 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -1,36 +1,58 @@
 <template>
 	<view class="page-wraper">
+		<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+
 		<view class="page-header">
 			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-				<view class="card_view">
-					<text class="card_packing_code ">盘点计划</text>
-					<text class="card_content ">{{jobContent.planNumber}}</text>
-				</view>
-				<view v-for="(range, index) in dataContent.countRange" :key="index">
-					<view class="card_view">
-						<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
-						<text class="card_content ">{{range.value}}</text>
-					</view>
-				</view>
+
+				<!-- <scroll-view scroll-y="true" class="page-main-scroll"> -->
+
+				<uni-collapse ref="collapse">
+					<uni-collapse-item :open="false">
+						<template v-slot:title>
+							<view>
+								<job-top :dataContent="jobContent"></job-top>
+								盘点范围
+							</view>
+						</template>
+						<view v-for="(range, index) in jobContent.countRange" :key="index">
+							<view class="card_view">
+								<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+								<text class="card_content ">{{range.value}}</text>
+							</view>
+							<view class="card_view">
+								<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+								<text class="card_content ">{{range.value}}</text>
+							</view>
+							<view class="card_view">
+								<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+								<text class="card_content ">{{range.value}}</text>
+							</view>
+							<view class="card_view">
+								<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+								<text class="card_content ">{{range.value}}</text>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</uni-collapse>
+			</view>
+			<view class="card_view" v-if="fromLocationCode!=''">
+				<text class="card_location">盘点库位</text>
+				<text class="card_content ">{{fromLocationCode}}</text>
 			</view>
 		</view>
+		<view class="page-main">
 
-		<view class="page-main" >
-			<view class="">
-				<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
-			</view>
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<uni-swipe-action ref="swipeAction">
-					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="editRemoveOption">
-						<!-- 	{{editRemoveOption}} -->
-						<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="editRemoveOption">
 							<view class="">
 								<package-and-item-card :dataContent="item"></package-and-item-card>
 							</view>
 							<view class='split_line'></view>
-						</view>
-					</uni-swipe-action-item>
+						</uni-swipe-action-item>
+					</view>
 				</uni-swipe-action>
 			</scroll-view>
 		</view>
@@ -48,9 +70,7 @@
 
 		<win-scan-button v-if="fromLocationCode!=''" @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
-
 		<win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation='getLocation'></win-scan-location>
-
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
 			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
 		</count-qty-edit>
@@ -60,15 +80,18 @@
 
 <script>
 	import {
-		getCountJobDetail,
+		getFuuzyCountJobDetail,
 		takeCountJob,
 		cancleTakeCountJob,
 		countJobSubmit
 	} from '@/api/request2.js';
+	import {
+		calc
+	} from '@/common/calc.js';
 
 	import {
-		getCountScopeType
-	} from '@/common/directory.js';
+		Decimal
+	} from 'decimal.js'; //引入
 
 	import {
 		getEditRemoveOption
@@ -80,6 +103,10 @@
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 
+	import {
+		getCountScopeType
+	} from '@/common/directory.js';
+
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
@@ -92,7 +119,7 @@
 	import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
 
 	export default {
-		name: 'receipt_detail',
+		name: 'fuzzycountdetail',
 		components: {
 			winScanButton,
 			winScanPack,
@@ -128,13 +155,16 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.getDetail();
+						this.getDetail(r => {
+							this.showFromLocationPopup();
+						});
 					}));
 				} else {
-					this.getDetail();
+					this.getDetail(r => {
+						this.showFromLocationPopup();
+					});
 				}
 			}
-			this.showFromLocationPopup();
 			this.editRemoveOption = getEditRemoveOption();
 		},
 		//返回首页
@@ -181,16 +211,17 @@
 				}
 			},
 
-			getDetail() {
+			getDetail(callback) {
 				var that = this;
 				uni.showLoading({
 					title: "加载中....",
 					mask: true
 				});
-				getCountJobDetail(that.id).then(res => {
+				getFuuzyCountJobDetail(that.id).then(res => {
 					uni.hideLoading();
 					that.jobContent = res.data;
 					that.jobStatus = res.data.status;
+					callback();
 
 				}).catch(error => {
 					uni.hideLoading()
@@ -199,6 +230,8 @@
 			},
 
 			showFromLocationPopup() {
+				let as = '';
+				// this.$refs.scanLocationCode.openScanPopup();
 				this.$nextTick(() => {
 					this.$refs.scanLocationCode.openScanPopup();
 				})
@@ -207,35 +240,48 @@
 			getLocation(location, code) {
 				let countRange = this.jobContent.countRange;
 
-				let range = countRange.find(r => r.type == "LOCATION_CODE");
-				if (range != undefined) {
-					if (!rang.value.includes(location.code)) {
-						this.showErrorMessage("库位代码【" + location.code + "】,不在盘点库位范围【" + rangeValue + "】内")
-						return;
-					}
-				} else {
-					range = countRange.find(r => r.type == "LOCATIONGROUP_CODE");
+				if (countRange != null) {
+					let range = countRange.find(r => r.type == "LOCATION_CODE");
 					if (range != undefined) {
-						if (!rang.value.includes(location.locationGroupCode)) {
-							this.showErrorMessage("库位组代码【" + location.locationGroupCode + "】,不在盘点库位组范围【" + rangeValue +
-								"】内")
+						let rangeValue = range.value;
+						let index = rangeValue.indexOf(location.code)
+						if (index < 0) {
+							this.afterScanLocation("库位代码【" + location.code + "】,不在盘点库位范围【" + rangeValue + "】内");
 							return;
 						}
 					} else {
-						range = countRange.find(r => r.type == "AREA_CODE");
+						range = countRange.find(r => r.type == "LOCATIONGROUP_CODE");
 						if (range != undefined) {
-							if (!rang.value.includes(location.areaCode)) {
-								this.showErrorMessage("库区代码【" + location.areaCode + "】,不在盘点库区范围【" + rangeValue + "】内")
+							let rangeValue = range.value;
+							let index = rangeValue.indexOf(location.locationGroupCode)
+							if (index < 0) {
+								this.afterScanLocation("库位组代码【" + location.locationGroupCode + "】,不在盘点库位组范围【" +
+									rangeValue +
+									"】内");
 								return;
 							}
 						} else {
-							range = countRange.find(r => r.type == "WAREHOUSE_CODE");
+							range = countRange.find(r => r.type == "AREABASIC_CODE");
 							if (range != undefined) {
-								if (!rang.value.includes(location.warehouseCode)) {
-									this.showErrorMessage("仓库代码【" + location.warehouseCode + "】,不在盘点仓库范围【" + rangeValue +
-										"】内")
+								let rangeValue = range.value;
+								let index = rangeValue.indexOf(location.areaCode)
+								if (index < 0) {
+									this.afterScanLocation("库区代码【" + location.areaCode + "】,不在盘点库区范围【" +
+										rangeValue + "】内");
 									return;
 								}
+							} else {
+								range = countRange.find(r => r.type == "WAREHOUSE_CODE");
+								if (range != undefined) {
+									let rangeValue = range.value;
+									let index = rangeValue.indexOf(location.warehouseCode)
+									if (index < 0) {
+										this.afterScanLocation("仓库代码【" + location.warehouseCode + "】,不在盘点仓库范围【" +
+											rangeValue +
+											"】内");
+										return;
+									}
+								}
 							}
 						}
 					}
@@ -243,6 +289,11 @@
 				this.getFromLocationCode(location, code)
 			},
 
+			afterScanLocation(message) {
+				this.showErrorMessage(message)
+				this.showFromLocationPopup();
+			},
+
 			getFromLocationCode(location, code) {
 				this.fromLocation = location;
 				this.fromLocationCode = code;
@@ -253,10 +304,6 @@
 				this.$refs.scanPopup.openScanPopup();
 			},
 
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
 			scanPopupGetFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.getfocus();
@@ -269,36 +316,38 @@
 				}
 			},
 
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.packGetFocus();
-				}
-			},
-
 			scanPopupLoseFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.packLoseFocus();
 				}
 			},
 
-			//明盘
 			getScanResult(result) {
 				let that = this;
-				let package = result.package;
-				let detail = this.detailSource.find(r => r.itemCode == package.itemCode && r.packingNumber == package
-					.packingNumber && r.batch == package.batch && r.inventoryStatus == "OK");
+				let packInfo = result.package;
+				let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber == packInfo
+					.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
+
 				if (detail == undefined) {
-					detail = this.createDetailInfo(package);
-					this.detailSource.push(detail)
+					detail = this.createDetailInfo(packInfo);
+					this.detailSource.unshift(detail)
+					this.scanPopupGetFocus();
 				} else {
-					let index = detail.index;
-					list.unshift(list.splice(index, 1)[0]); //置顶
-					//提交
-					this.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
-						if (res) {
-							this.edit(detail);
-						}
-					});
+					let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
+						packInfo
+						.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
+					if (index >= 0) {
+						this.detailSource.unshift(this.detailSource.splice(index, 1)[0]); //置顶
+						//提交
+						this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
+							if (res) {
+								this.closeScanPopup();
+								this.edit(detail);
+							} else {
+								this.scanPopupGetFocus();
+							}
+						});
+					}
 				}
 			},
 
@@ -318,18 +367,26 @@
 					projectCode: "",
 					qty: packInfo.qty,
 					countQty: packInfo.qty,
+					packQty: packInfo.packQty,
+					packUom: packInfo.packUom,
 					uom: packInfo.uom,
 					remark: "",
 					locationCode: this.fromLocationCode,
 					creator: this.$store.state.user.id,
 					warehouseCode: this.fromLocation.warehouseCode,
 					areaCode: this.fromLocation.areaCode,
-					locationGroupCode: this.fromLocation.locationGroupCode
+					locationGroupCode: this.fromLocation.locationGroupCode,
+					creationTime: new Date(),
+					countTime: new Date()
 				}
 				return detail;
 			},
 
-			swipeClick(e, item) {
+			editClose() {
+				this.$refs.countQtyEdit.closeEditPopup();
+			},
+
+			swipeClick(e, item, index) {
 				if (e.content.text == "编辑") {
 					this.edit(item)
 				} else if (e.content.text == "移除") {
@@ -341,19 +398,16 @@
 			edit(item) {
 				let that = this;
 				this.currentEditItem = item;
-				this.$refs.countQtyEdit.openEditPopup(item);
+				item.handleQty = item.qty;
+				this.$refs.countQtyEdit.openEditPopup(item, null);
 			},
 
 			editConfirm(qty, inventoryStatus, mode) {
 				let that = this;
-				//编辑
-				if (mode == 'edit') {
-					this.currentEditItem.countQty = qty;
-					this.currentEditItem.qty = qty;
-					this.currentEditItem.inventoryStatus = inventoryStatus;
-				}
-				this.scanPopupGetFocus();
-
+				this.currentEditItem.countQty = qty;
+				this.currentEditItem.qty = qty;
+				this.currentEditItem.inventoryStatus = inventoryStatus;
+				this.openScanPopup();
 			},
 
 			editClose() {
@@ -363,11 +417,19 @@
 			remove(item, index) {
 				this.showQuestionMessage("是否要移除扫描信息?", res => {
 					if (res) {
-						this.dataContent.subList.splice(index, 1)
+						this.detailSource.splice(index, 1)
 					}
 				});
 			},
 
+
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.detailInfoPopup.openPopup(item);
+			},
+
+
 			commit() {
 				// if(this.detailSource.length==0)
 				// {
@@ -394,13 +456,13 @@
 			},
 
 			setParams() {
-				var subList = []
 				var creator = this.$store.state.user.id
 				this.jobContent.subList = this.detailSource
 				// this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
+
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
@@ -408,7 +470,6 @@
 					}
 				});
 			},
-
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
@@ -421,12 +482,6 @@
 				this.$refs.comMessage.showScanMessage(message);
 			},
 
-			showQuestionMessage(message, callback) {
-				this.$refs.comMessage.showQuestionMessage(message, res => {
-					callback(res);
-				});
-			},
-
 			afterCloseMessage() {
 				this.scanPopupGetFocus();
 			},
@@ -435,25 +490,30 @@
 				this.scanPopupGetFocus();
 			},
 
-			editItem(item) {
-				this.currentEditItem = item;
-				var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
-				this.$refs.countQtyEdit.openEditPopup(item,
-					detail.subList);
-			},
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					navigateBack(1);
 				})
 			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			},
 
 			getCountScopeName(value) {
 				let item = getCountScopeType(value);
 				return item.label;
 			},
-		}
 
+			showQuestionMessage(message, callback) {
+				this.$refs.comMessage.showQuestionMessage(message, res => {
+					callback(res);
+				});
+			},
+		}
 	}
 </script>
 
@@ -464,32 +524,32 @@
 		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>
+	// .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
diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
index 1115de97..cc2e55ff 100644
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -32,7 +32,7 @@
 <script>
 	import {
 		cancleTakeCountJob,
-		getCountJobList
+		getFuzzyCountJobList
 	} from '@/api/request2.js';
 
 	import {
@@ -180,7 +180,7 @@
 					by: "DESC"
 				}
 
-				getCountJobList(params).then(res => {
+				getFuzzyCountJobList(params).then(res => {
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
@@ -354,7 +354,7 @@
 					sort: "number",
 					by: "DESC"
 				}
-				getCountJobList(params).then(res => {
+				getFuzzyCountJobList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length == 0) {
 						that.showMessage('未查找到' + '【' + code + '】的收货任务');
@@ -413,7 +413,7 @@
 					sort: "number",
 					by: "DESC"
 				}
-				getCountJobList(params).then(res => {
+				getFuzzyCountJobList(params).then(res => {
 					uni.hideLoading();
 					let resultList = res.data.list;
 					resultList.forEach(item => {