From 4046173b1ac3aa2e757355be4125f8518dca083a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 22 五月 2026 17:30:39 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_天津_宝东

---
 src/views/inventoryManagement/receiptManagement/Record.vue |   90 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 56e6f74..3fce379 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -71,10 +71,15 @@
       </el-form>
     </div>
     <div class="actions">
-      <el-button type="primary" @click="handleBatchApprove">瀹℃壒</el-button>
+      <el-button type="primary"
+                 :disabled="!canBatchApprove"
+                 @click="handleBatchApprove">瀹℃壒</el-button>
+      <el-button :disabled="!canReverseApprove"
+                 @click="handleReverseApprove">鍙嶅</el-button>
       <el-button @click="handleOut">瀵煎嚭</el-button>
       <el-button type="danger"
                  plain
+                 :disabled="!canDelete"
                  @click="handleDelete">鍒犻櫎
       </el-button>
     </div>
@@ -89,7 +94,7 @@
                 height="calc(100vh - 18.5em)">
         <el-table-column align="center"
                          type="selection"
-                         :selectable="isRowSelectableForApprove"
+                         :selectable="isRowSelectable"
                          width="55"/>
         <el-table-column align="center"
                          label="搴忓彿"
@@ -97,7 +102,7 @@
                          width="60"/>
         <el-table-column label="鍏ュ簱鎵规"
                          prop="inboundBatches"
-                         width="280"
+                         width="200"
                          show-overflow-tooltip/>
         <el-table-column label="鍏ュ簱鏃堕棿"
                          prop="createTime"
@@ -127,6 +132,16 @@
             {{ getRecordType(scope.row.recordType) }}
           </template>
         </el-table-column>
+        <el-table-column
+            v-if="showSourceOrderNoColumn"
+            label="婧愬崟鍙�"
+            width="150"
+            prop="sourceOrderNo"
+            show-overflow-tooltip>
+          <template #default="scope">
+            {{ formatSourceOrderNo(scope.row?.sourceOrderNo) }}
+          </template>
+        </el-table-column>
         <el-table-column label="瀹℃壒鐘舵��"
                          prop="approvalStatus"
                          show-overflow-tooltip>
@@ -153,6 +168,7 @@
   ref,
   reactive,
   toRefs,
+  computed,
   onMounted,
   getCurrentInstance,
 } from "vue";
@@ -161,6 +177,7 @@
   getStockInRecordListPage,
   batchDeletePendingStockInRecords,
   batchApproveStockInRecords,
+  batchUnapproveStockInRecords,
 } from "@/api/inventoryManagement/stockInRecord.js";
 import {
   findAllQualifiedStockInRecordTypeOptions, 
@@ -245,8 +262,33 @@
   return status === 0 || status === "0" || status === "pending" || status === "PENDING" || status === null || status === undefined || status === "";
 };
 
-const isRowSelectableForApprove = row => {
-  return isPendingApproval(row?.approvalStatus);
+const isRejectedApproval = status => {
+  return status === 2 || status === "2" || status === "rejected" || status === "REJECTED";
+};
+
+const isRowSelectable = row => {
+  return isPendingApproval(row?.approvalStatus) || isRejectedApproval(row?.approvalStatus);
+};
+
+const canBatchApprove = computed(() => {
+  return selectedRows.value.length > 0
+      && selectedRows.value.every(row => isPendingApproval(row.approvalStatus));
+});
+
+const canReverseApprove = computed(() => {
+  return selectedRows.value.length > 0
+      && selectedRows.value.every(row => isRejectedApproval(row.approvalStatus));
+});
+
+const canDelete = computed(() => canBatchApprove.value);
+const showSourceOrderNoColumn = computed(() => {
+  const topParentProductId = Number(props.topParentProductId);
+  return topParentProductId === 276 || topParentProductId === 278;
+});
+
+const formatSourceOrderNo = (value) => {
+  const text = String(value ?? "").trim();
+  return text || "--";
 };
 
 const pageProductChange = obj => {
@@ -283,14 +325,40 @@
 
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = selection => {
-  selectedRows.value = selection.filter(item => item.id && isPendingApproval(item.approvalStatus));
+  selectedRows.value = selection.filter(item => item.id && isRowSelectable(item));
 };
 
 const expandedRowKeys = ref([]);
 
+const handleReverseApprove = () => {
+  if (!canReverseApprove.value) {
+    proxy.$modal.msgWarning("璇烽�夋嫨宸查┏鍥炵殑鏁版嵁");
+    return;
+  }
+  const ids = selectedRows.value.map(item => item.id);
+  ElMessageBox.confirm("鍙嶅鍚庤褰曞皢鎭㈠涓哄緟瀹℃壒鐘舵�侊紝鏄惁纭鍙嶅锛�", "鍙嶅", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
+  })
+      .then(() => {
+        batchUnapproveStockInRecords({ids})
+            .then(() => {
+              proxy.$modal.msgSuccess("鍙嶅鎴愬姛");
+              getList();
+            })
+            .catch(() => {
+              proxy.$modal.msgError("鍙嶅澶辫触");
+            });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
+      });
+};
+
 const handleBatchApprove = () => {
-  if (selectedRows.value.length === 0) {
-    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+  if (!canBatchApprove.value) {
+    proxy.$modal.msgWarning("璇烽�夋嫨寰呭鎵圭殑鏁版嵁");
     return;
   }
   const ids = selectedRows.value.map(item => item.id);
@@ -344,8 +412,8 @@
 
 // 鍒犻櫎
 const handleDelete = () => {
-  if (selectedRows.value.length === 0) {
-    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+  if (!canDelete.value) {
+    proxy.$modal.msgWarning("璇烽�夋嫨寰呭鎵圭殑鏁版嵁");
     return;
   }
   const ids = selectedRows.value.map(item => item.id);
@@ -390,4 +458,4 @@
   justify-content: flex-end;
   margin-bottom: 10px;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3