Merge branch '订单删除展示退料入库信息'

src/views/group/order/management/index.vue

@@ -153,6 +153,21 @@
         <el-button @click="openExpressPacking = false">关 闭</el-button>
       </template>
     </el-dialog>
+
+    <el-dialog title="删除并退料入库" v-if="openDelete" v-model="openDelete" width="1000px">
+      <div v-loading="loadingDelete">
+        <el-table :data="deleteList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
+          <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
+          <el-table-column label="BOM品名" prop="bomSpecName" min-width="220" />
+          <el-table-column label="仓库名称" prop="warehouseName" width="100" />
+          <el-table-column label="出库数量" prop="outQuantity" width="100" />
+        </el-table>
+      </div>
+      <template #footer>
+        <el-button @click="openDelete = false" size="large" v-preReClick>取 消</el-button>
+        <el-button type="primary" @click="submitDelete()" size="large" v-preReClick>确认删除</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -598,15 +613,30 @@ const clickDelete = (row) => {
     })
     .catch(() => {});
 };
+const openDelete = ref(false);
+const loadingDelete = ref(false);
+const deleteList = ref([]);
+const deleteRow = ref({});
 const clickDeleteTwo = (row) => {
+  deleteList.value = [];
+  loadingDelete.value = true;
+  openDelete.value = true;
+  deleteRow.value = row;
+  proxy.post("/orderInfo/returnBomList", { id: row.id }).then((res) => {
+    deleteList.value = res;
+    loadingDelete.value = false;
+  });
+};
+const submitDelete = () => {
   ElMessageBox.confirm("你是否确认此操作", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   })
     .then(() => {
-      proxy.post("/orderInfo/deleteAndStore", { id: row.id }).then(() => {
+      proxy.post("/orderInfo/deleteAndStore", { id: deleteRow.value.id }).then(() => {
         ElMessage({ message: "删除成功", type: "success" });
+        openDelete.value = false;
         getList();
       });
     })