Merge remote-tracking branch 'origin/master'

src/views/business/certificate/index.vue

@@ -184,22 +184,22 @@ function getInfoFromP2() {
       getP2CompanyProductPackage().then(res => {
         if (res.code === 200) {
           proxy.$modal.closeLoading()
-          proxy.$modal.msgSuccess("拉取成功")
+          // proxy.$modal.msgSuccess("拉取成功")
         } else {
           proxy.$modal.closeLoading()
-          proxy.$modal.msgError("拉取失败")
+          // proxy.$modal.msgError("拉取失败")
         }
       }).catch(err => {
         proxy.$modal.closeLoading()
-        proxy.$modal.msgError("拉取失败")
+        // proxy.$modal.msgError("拉取失败")
       })
     } else {
       proxy.$modal.closeLoading()
-      proxy.$modal.msgError("拉取失败")
+      // proxy.$modal.msgError("拉取失败")
     }
   }).catch(err => {
     proxy.$modal.closeLoading()
-    proxy.$modal.msgError("拉取失败")
+    // proxy.$modal.msgError("拉取失败")
   })
 }
 

src/views/business/specialDaywork/form.vue

@@ -1295,7 +1295,11 @@ function getProcessInfo(data) {
         //通过批次号查
         console.log("data", data);
         const req = { ...data, product: null };
-        getProcessListByLot(req).then((response) => {
+        getProcessListByLot({
+          isWasteRecycling: data.isWasteRecycling,
+          isAmend: data.isAmend,
+          technologicalProcessId: data.technologicalProcessId,
+        }).then((response) => {
           let lotProcessList = response.data;
           let filteredData = lotProcessList.filter((item1) =>
             res.data.some((item2) => item2.processCode === item1.processCode)