diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 986fa575..e178813f 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -282,7 +282,7 @@ const commit = async () => {
       pageNo: 1,
       pageSize: 100
     }
-
+    let isAllSubmit = Number(Number(dataContent.value.goodQty)+ Number(showList.value.length))==Number(dataContent.value.planQty)
     const planeInfo = await getPlanByNumber(queryParams)
     if (planeInfo.data && planeInfo.data.list.length > 0) {
       if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
@@ -302,10 +302,14 @@ const commit = async () => {
     }
     uni.hideLoading()
     // showCommitSuccessMessage('提交成功<br>生成装配收货记录<br>', list)
-    showList.value = [];
-    allList.value = [];
-    index.value = 1;
-    dataContent.value.handleQty = 0;
+    if(isAllSubmit){
+      clearData()
+    }else {
+      showList.value = [];
+      allList.value = [];
+      index.value = 1;
+      dataContent.value.handleQty = 0;
+    }
     nextTick(()=>{
       showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
     })
@@ -383,7 +387,7 @@ const getScanResult = (result) => {
 }
 const calcFgQty = () => {
   dataContent.value.handleQty = showList.value.length
-  if (dataContent.value.handleQty == dataContent.value.packQty) {
+  if (dataContent.value.handleQty == dataContent.value.packQty || (dataContent.value.noGoodQty < dataContent.value.packQty && dataContent.value.handleQty == dataContent.value.noGoodQty)) {
     if (scanPopup.value) {
       scanPopup.value.closeScanPopup()
     }