1

src/views/JXSK/mes/forward/add.vue

@@ -113,6 +113,7 @@ const onSubmit = () => {
       id: formData.data.id,
       receivedUserId: formData.data.receivedUserId,
       fileList: formData.data.fileList,
+      taskProgressId: formData.data.taskProgressId,
     };
     proxy.post("/productionTaskDetail/circulation", data).then(
       (res) => {
@@ -130,6 +131,7 @@ const onSubmit = () => {
       .post("/productionTaskDetail/productStorage", {
         id: formData.data.id,
         fileList: formData.data.fileList,
+        taskProgressId: formData.data.taskProgressId,
       })
       .then(
         (res) => {
@@ -152,7 +154,10 @@ const otherBtnClick = () => {
   })
     .then(() => {
       proxy
-        .post("/productionTaskDetail/revokeTask", { id: formData.data.id })
+        .post("/productionTaskDetail/revokeTask", {
+          id: formData.data.id,
+          taskProgressId: formData.data.taskProgressId,
+        })
         .then(
           (res) => {
             proxy.$router.push("/main/jxskReceive");

src/views/JXSK/mes/receive/add.vue

@@ -191,17 +191,22 @@ const onSubmit = () => {
     });
 };
 const submitApi = () => {
-  proxy.post("/productionTaskDetail/receive", { id: formData.data.id }).then(
-    (res) => {
-      setTimeout(() => {
-        showSuccessToast(proxy.t("common.operationSuccessful"));
-        proxy.$router.push("/main/jxskReceive");
-      }, 500);
-    },
-    (err) => {
-      return showFailToast(err.message);
-    }
-  );
+  proxy
+    .post("/productionTaskDetail/receive", {
+      id: formData.data.id,
+      taskProgressId: formData.data.taskProgressId,
+    })
+    .then(
+      (res) => {
+        setTimeout(() => {
+          showSuccessToast(proxy.t("common.operationSuccessful"));
+          proxy.$router.push("/main/jxskReceive");
+        }, 500);
+      },
+      (err) => {
+        return showFailToast(err.message);
+      }
+    );
 };
 const otherBtnClick = () => {
   proxy.post("/productionTaskDetail/rejection", { id: formData.data.id }).then(

src/views/JXSK/salesContract/add.vue

@@ -472,7 +472,7 @@ const getDetails = (id) => {
     changeAmount();
     setTimeout(() => {
       formDom.value.formDataListShowLabelOne();
-    }, 100);
+    }, 1000);
   });
 };