Merge branch 'stage' into dev0.3

src/components/process/Contract.vue

@@ -1624,47 +1624,53 @@ const clickDelete = (index) => {
   formData.data.contractShipmentList.splice(index, 1);
 };
 
-const handleSubmit = async () => {
-  let status = await submit.value.handleSubmit(() => {});
-  if (status) {
-    if (
-      !(
-        formData.data.contractProductList &&
-        formData.data.contractProductList.length > 0
-      )
-    ) {
-      ElMessage("请添加至少一件商品");
-      return false;
-    }
-    if (
-      formData.data.contractShipmentList &&
-      formData.data.contractShipmentList.length > 0
-    ) {
-      for (let i = 0; i < formData.data.contractProductList.length; i++) {
-        let data = formData.data.contractShipmentList.filter(
-          (item) =>
-            item.productId === formData.data.contractProductList[i].productId
-        );
-        if (data && data.length > 0) {
-          let quantity = 0;
-          for (let j = 0; j < data.length; j++) {
-            quantity = parseFloat(Number(quantity) + Number(data[j].quantity));
-          }
-          if (quantity > formData.data.contractProductList[i].quantity) {
-            ElMessage("出货数量不能大于商品数量");
-            return false;
+const handleSubmit = async (flag) => {
+  if (flag) {
+    return true;
+  } else {
+    let status = await submit.value.handleSubmit(() => {});
+    if (status) {
+      if (
+        !(
+          formData.data.contractProductList &&
+          formData.data.contractProductList.length > 0
+        )
+      ) {
+        ElMessage("请添加至少一件商品");
+        return false;
+      }
+      if (
+        formData.data.contractShipmentList &&
+        formData.data.contractShipmentList.length > 0
+      ) {
+        for (let i = 0; i < formData.data.contractProductList.length; i++) {
+          let data = formData.data.contractShipmentList.filter(
+            (item) =>
+              item.productId === formData.data.contractProductList[i].productId
+          );
+          if (data && data.length > 0) {
+            let quantity = 0;
+            for (let j = 0; j < data.length; j++) {
+              quantity = parseFloat(
+                Number(quantity) + Number(data[j].quantity)
+              );
+            }
+            if (quantity > formData.data.contractProductList[i].quantity) {
+              ElMessage("出货数量不能大于商品数量");
+              return false;
+            }
           }
         }
       }
+      return true;
+    } else {
+      setTimeout(() => {
+        const errorDiv = document.getElementsByClassName("is-error");
+        errorDiv[0].scrollIntoView();
+      }, 0);
     }
-    return true;
-  } else {
-    setTimeout(() => {
-      const errorDiv = document.getElementsByClassName("is-error");
-      errorDiv[0].scrollIntoView();
-    }, 0);
+    return false;
   }
-  return false;
 };
 const getFormData = () => {
   return proxy.deepClone(formData.data);

src/components/process/PriceSheet.vue

@@ -1084,26 +1084,30 @@ const querySearch = (queryString, callback) => {
     }
   });
 };
-const handleSubmit = async () => {
-  let status = await submit.value.handleSubmit(() => {});
-  if (status) {
-    if (
-      !(
-        formData.data.quotationProductList &&
-        formData.data.quotationProductList.length > 0
-      )
-    ) {
-      ElMessage("请添加至少一件商品");
-      return false;
-    }
+const handleSubmit = async (flag) => {
+  if (flag) {
     return true;
   } else {
-    setTimeout(() => {
-      const errorDiv = document.getElementsByClassName("is-error");
-      errorDiv[0].scrollIntoView();
-    }, 0);
+    let status = await submit.value.handleSubmit(() => {});
+    if (status) {
+      if (
+        !(
+          formData.data.quotationProductList &&
+          formData.data.quotationProductList.length > 0
+        )
+      ) {
+        ElMessage("请添加至少一件商品");
+        return false;
+      }
+      return true;
+    } else {
+      setTimeout(() => {
+        const errorDiv = document.getElementsByClassName("is-error");
+        errorDiv[0].scrollIntoView();
+      }, 0);
+    }
+    return status;
   }
-  return status;
 };
 // 接收父组件的传值
 const props = defineProps({

src/views/process/processApproval/index.vue

@@ -584,7 +584,7 @@ const handleSubmit = async (_type) => {
 const handleSubmitStag = async (_type) => {
   try {
     // 调用发起组件的提交事件
-    const flag = await makeDom.value.handleSubmit();
+    const flag = await makeDom.value.handleSubmit(true);
     if (flag) {
       flowFormDom.value.validate((valid) => {
         btnLoading.value = true;