合并时候解决8月17号和20号盘点冲突问题，重新修改一遍

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -8,8 +8,8 @@
 					</view>
 
 					<view class="">
-						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+						<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
-							@click="closeScanPopup()"></image>
+						</image>
 					</view>
 				</view>
 				<view class="uni-flex uni-row" style="align-items: center;
@@ -39,8 +39,8 @@
 				</view>
 				<view class="">
 					<view class="">
-						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :isShowHistory="isShowHistory"
-							:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+							:clearResult="true" :headerType="headerType"></win-com-scan>
 					</view>
 				</view>
 			</view>
@@ -140,6 +140,7 @@
 				managementPrecision: '',
 				fromInventoryStatuses: "",
 				isCheck: false,
+				chooseWhich: '1'
 			}
 		},
 		created() {
@@ -176,7 +177,7 @@
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 				this.$refs.popup.open('bottom')
-				
+
 				setTimeout(res => {
 					if (this.fromLocationCode != '') {
 						this.packGetFocus();
@@ -317,7 +318,12 @@
 								uni.hideLoading();
 								if (res.success) {
 									this.managementPrecision = res.managementPrecision
-									this.afterQueryBalance(res.data.list);
+									this.chooseWhich = '2'
+									if (res.data && res.data.list && res.data.list.length > 1) {
+										this.showBalanceSelect(res.data.list);
+									} else {
+										this.afterQueryBalance(res.data.list);
+									}
 								} else {
 									this.showErrorMessage(res.message, res => {
 										this.packGetFocus();
@@ -386,6 +392,7 @@
 					// }
 				} else {
 					this.showBalanceSelect(datas);
+					this.chooseWhich = '1'
 				}
 			},
 
@@ -394,7 +401,12 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.packCallBack(balance);
+				if (this.chooseWhich == 1) {
+					this.packCallBack(balance);
+				} else {
+					this.countCallBack(balance);
+				}
+				// this.packCallBack(balance);
 				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
 				// if (balance.qty > 0) {
 				// 	this.packCallBack(balance);
@@ -459,10 +471,10 @@
 				let condition = '按照以下条件:\n';
 				let label = this.scanResult.label;
 				var isShowStatus = this.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined
-				if(isShowStatus){
+				if (isShowStatus) {
 					let status = getInventoryStatusDesc(isShowStatus);
 				}
-				
+
 				switch (this.managementPrecision) {
 					case 'BY_PACKAGING':
 						condition = condition + '物料号=[' + label.itemCode + ']\n箱码=[' + label.packingNumber +