Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -140,6 +140,7 @@
 				managementPrecision: '',
 				fromInventoryStatuses: "",
 				isCheck: false,
+				chooseWhich:'1'
 			}
 		},
 		created() {
@@ -341,7 +342,8 @@
 						this.countCallBack(datas);
 					} else {
 						if (Array.isArray(datas)) {
-							this.countCallBack(datas[0]);
+							this.chooseWhich = '2'
+							this.showBalanceSelect(datas);
 						} else {
 							this.countCallBack(datas);
 						}
@@ -386,6 +388,7 @@
 					// }
 				} else {
 					this.showBalanceSelect(datas);
+					this.chooseWhich='1'
 				}
 			},
 
@@ -394,7 +397,12 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.packCallBack(balance);
+				if(this.chooseWhich == 1){
+					this.packCallBack(balance);
+				}else{
+					this.countCallBack(balance);
+				}
+				
 				//因为盘点时有负库存，暂时去掉判断  2023年12月28日
 				// if (balance.qty > 0) {
 				// 	this.packCallBack(balance);

src/pages/inventoryMove/coms/comMoveJob.vue

@@ -212,14 +212,14 @@
 						uni.stopPullDownRefresh();
 					}
 
-					var list = res.data.list;
+					let list = res.data.list;
 					this.totalCount = res.data.total
 					this.loadingType = "loadmore";
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
 						return;
 					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
 					this.updateTitle();
 				}).catch(error => {

src/pages/issue/job/issueDetail.vue

@@ -453,6 +453,7 @@
 			},
 			
 			autoCommit(){
+				let str=""
 				var totalQty =0;
 				var taskQty =0;
 				this.detailSource.forEach(detail => {