1

src/components/process/EHSD/Contract.vue

@@ -1746,6 +1746,9 @@ const handleSubmit = async () => {
           }
         }
       }
+    } else {
+      ElMessage("请添加出货计划");
+      return false;
     }
     return true;
   } else {

src/components/process/EHSD/ContractChange.vue

@@ -1698,6 +1698,9 @@ const handleSubmit = async () => {
           }
         }
       }
+    } else {
+      ElMessage("请添加出货计划");
+      return false;
     }
     // 判断产品是否存在变更
     if (

src/components/process/EHSD/Sample.vue

@@ -1642,6 +1642,9 @@ const handleSubmit = async () => {
           }
         }
       }
+    }else{
+       ElMessage("请添加出货计划");
+      return false;
     }
     return true;
   } else {
@@ -1749,9 +1752,9 @@ onMounted(() => {
   if (route.query && route.query.processType) {
     let businessId = route.query.businessId;
     proxy.post("/sample/detail", { id: businessId }).then((res) => {
-      if (res && res.dataJson) {
-        res = { ...res, ...JSON.parse(res.dataJson) };
-      }
+      // if (res && res.dataJson) {
+      //   res = { ...res, ...JSON.parse(res.dataJson) };
+      // }
       res.sampleShipmentList = res.sampleShipmentLists;
       res.countryId = res.buyCountryId;
       res.provinceId = res.buyProvinceId;
@@ -1844,9 +1847,9 @@ watch(
     if (val && val.processType) {
       let businessId = val.businessId;
       proxy.post("/sample/detail", { id: businessId }).then((res) => {
-        if (res && res.dataJson) {
-          res = { ...res, ...JSON.parse(res.dataJson) };
-        }
+        // if (res && res.dataJson) {
+        //   res = { ...res, ...JSON.parse(res.dataJson) };
+        // }
         res.sampleShipmentList = res.sampleShipmentLists;
         res.countryId = res.buyCountryId;
         res.provinceId = res.buyProvinceId;

src/components/process/EHSD/SampleChange.vue

@@ -1623,6 +1623,9 @@ const handleSubmit = async () => {
           }
         }
       }
+    } else {
+      ElMessage("请添加出货计划");
+      return false;
     }
     // 判断产品是否存在变更
     if (