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

src/pages/fg/receiptByPlan.vue

@@ -334,6 +334,8 @@ import { nextTick } from 'vue';
 						pageSize: 100,
 					}
 					
+					let isAllSubmit = Number(Number(this.dataContent.goodQty)+ Number(this.showList.length))==Number(this.dataContent.planQty)
+
 					var planeInfo = await getPlanByNumber(queryParams);
 					if (planeInfo.data && planeInfo.data.list.length > 0) {
 						if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
@@ -355,10 +357,15 @@ import { nextTick } from 'vue';
 						throw new Error("未查找到单据信息")
 					}
 					uni.hideLoading()
+					if(isAllSubmit){
+						this.clearData()
+					}else{
 						this.showList = [];
 						this.allList = [];
 						this.index = 1;
 						this.dataContent.handleQty = 0;
+					}
+					
 					
 					
 					nextTick(()=>{
@@ -450,7 +457,9 @@ import { nextTick } from 'vue';
 			calcFgQty() {
 				this.dataContent.handleQty = this.showList.length;
 				// this.dataContent.handleQty = this.allList.length;
-				if (this.dataContent.handleQty == this.dataContent.packQty) {
+				// dataContent.noGoodQty 未完工
+				
+				if (this.dataContent.handleQty == this.dataContent.packQty || (this.dataContent.noGoodQty<this.dataContent.packQty&&this.dataContent.handleQty == this.dataContent.noGoodQty)) {
 					if (this.$refs.scanPopup) {
 						this.$refs.scanPopup.closeScanPopup();
 					}