提交

src/api/business/lot.js

@@ -158,3 +158,11 @@ export function checkRecover(data) {
     data: data
   })
 }
+
+export function recoverBatches(data) {
+  return request({
+    url: baseUrl + '/business/lot/recoverBatches',
+    method: 'post',
+    data: data
+  })
+}

src/views/business/lot/InBatchesDialog.vue

@@ -261,7 +261,7 @@ function handleSave() {
   }
   // const saveDate = { ...baseLot.value, sparateList: baseLot.value.sparateList.map(v => ({ ...v, carriers: v.id === baseLot.id ? v.carriers : v.carrierSelection.map(e => ({ id: e })) })) }
   // const saveDate = { ...baseLot.value }
-  const saveDate = { id: baseLot.value.id, isAmend: baseLot.value.isAmend, isWasteRecycling: baseLot.value.isWasteRecycling, requisitionDepartmentName: baseLot.value.requisitionDepartmentName, requisitionDepartmentId: baseLot.value.requisitionDepartmentId, lotCode: baseLot.value.lotCode, sparateList: baseLot.value.sparateList.map(v => ({ id: v.id, fromId: v.fromId, lotNumber: v.lotNumber, qualifiedNum: v.qualifiedNum, productionPlanDetailId: v.productionPlanDetailId, technologicalProcessId: v.technologicalProcessId, isAmend: baseLot.value.isAmend, isWasteRecycling: baseLot.value.isWasteRecycling, requisitionDepartmentName: baseLot.value.requisitionDepartmentName, requisitionDepartmentId: baseLot.value.requisitionDepartmentId, technologyVersion: v.technologyVersion, productId: v.productId, productionQuantity: v.lotNumber, lotCode: v.lotCode, carriers: v.id === baseLot.id ? v.carriers : v.carrierSelection.map(e => ({ id: e })) })) }
+  const saveDate = { id: baseLot.value.id, isAmend: baseLot.value.isAmend, isWasteRecycling: baseLot.value.isWasteRecycling, requisitionDepartmentName: baseLot.value.requisitionDepartmentName, requisitionDepartmentId: baseLot.value.requisitionDepartmentId, lotCode: baseLot.value.lotCode, splitCount: baseLot.value.splitCount, fromCount: baseLot.value.fromCount, sparateList: baseLot.value.sparateList.map(v => ({ id: v.id, fromId: v.fromId, lotNumber: v.lotNumber, qualifiedNum: v.qualifiedNum, productionPlanDetailId: v.productionPlanDetailId, technologicalProcessId: v.technologicalProcessId, isAmend: baseLot.value.isAmend, isWasteRecycling: baseLot.value.isWasteRecycling, requisitionDepartmentName: baseLot.value.requisitionDepartmentName, requisitionDepartmentId: baseLot.value.requisitionDepartmentId, technologyVersion: v.technologyVersion, productId: v.productId, productionQuantity: v.lotNumber, lotCode: v.lotCode, carriers: v.id === baseLot.id ? v.carriers : v.carrierSelection.map(e => ({ id: e })), splitCount: v.splitCount })) }
 
   // 提交分批结果
   saveInBatches(saveDate).then(res => {

src/views/business/lot/index.vue

@@ -152,7 +152,7 @@
 <script setup name="ProductionPlan">
 import { listDept } from "@/api/system/dept";
 import { getDeptList } from "@/api/system/dept.js";
-import { getLotList, getProcessList, checkRecover } from "@/api/business/lot.js";
+import { getLotList, getProcessList, checkRecover, recoverBatches } from "@/api/business/lot.js";
 import wasteRecyclingDialog from "./DialogWasteRecycling.vue";
 import router from "@/router";
 import multiChange from "@/views/business/reviseBath/multiSingleChangeDialog.vue";
@@ -501,16 +501,19 @@ const recoverBatch = () => {
   // 当前行
   // 判断当前行是否可以复原
   const recoverItem = selections.value[0]
-  checkRecover(recoverItem).then(res => {
+  checkRecover({ id: recoverItem.lotId }).then(res => {
     if (res.code === 200) {
+      const lotCodes = res.data.map(e => e.lotCode).join(',')
       // 确认是否还原
-      proxy.$modal.confirm(``).then(function () {
+      proxy.$modal.confirm(`本次将还原${lotCodes},是否确认？`).then(function () {
+        loading.value = true;
         // 确认还原
-        return;
+        return recoverBatches(res.data);
       }).then(() => {
         handleQuerydaywork();
         proxy.$modal.msgSuccess("还原成功！");
       }).catch(err => {
+        console.log(err)
         // 还原失败输出失败结果
       });
     } else {