From cf84003a476d61584484d3b121c5ee5b85f44fba Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期五, 21 八月 2026 11:16:40 +0800
Subject: [PATCH] refactor: 临时隐藏多个业务模块的备注及非核心字段

---
 src/views/procurementManagement/purchaseReturnOrder/index.vue |   67 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index f8866e1..11e3864 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -45,8 +45,13 @@
             @click="handleDetail(row)"
             >璇︽儏</el-button
           >
-          <el-button link size="small" @click="handleDelete(row)"
-            >鍒犻櫎</el-button
+          <el-button
+            link
+            size="small"
+            :disabled="row.stockOutApproved"
+            :style="{ color: row.stockOutApproved ? '#c0c4cc' : undefined }"
+            @click="handleDelete(row)"
+            >{{ row.stockOutApproved }}</el-button
           >
         </template>
       </PIMTable>
@@ -89,6 +94,20 @@
           <el-descriptions-item label="閫�鏂欎汉">{{
             detailData.returnUserName || "--"
           }}</el-descriptions-item>
+          <el-descriptions-item label="鍙戣揣绫诲瀷">{{
+            getShippingTypeLabel(detailData.shippingType)
+          }}</el-descriptions-item>
+          <el-descriptions-item v-if="String(detailData.shippingType) === '1'" label="鍙戣揣杞︾墝鍙�">{{
+            detailData.truckPlateNo || "--"
+          }}</el-descriptions-item>
+          <template v-else-if="String(detailData.shippingType) === '2'">
+            <el-descriptions-item label="蹇�掑叕鍙�">{{
+              detailData.expressCompany || "--"
+            }}</el-descriptions-item>
+            <el-descriptions-item label="蹇�掑崟鍙�">{{
+              detailData.expressNo || "--"
+            }}</el-descriptions-item>
+          </template>
           <el-descriptions-item label="鏁村崟鎶樻墸棰�">{{
             formatAmount(detailData.totalDiscountAmount)
           }}</el-descriptions-item>
@@ -102,10 +121,10 @@
             detailData.createUserName || "--"
           }}</el-descriptions-item>
           <el-descriptions-item label="鍒涘缓鏃堕棿">{{
-            detailData.createTime || "--"
+            formatDate(detailData.createTime) || "--"
           }}</el-descriptions-item>
           <el-descriptions-item label="鏈�杩戞洿鏂版椂闂�">{{
-            detailData.updateTime || "--"
+            formatDate(detailData.updateTime) || "--"
           }}</el-descriptions-item>
           <el-descriptions-item label="澶囨敞" :span="3">{{
             detailData.remark || "--"
@@ -142,13 +161,14 @@
           />
           <el-table-column label="鍗曚綅" prop="unit" width="80" />
           <el-table-column label="鏁伴噺" prop="stockInNum" width="80" />
+          <el-table-column label="閿�鍞彂璐ф暟閲�" prop="saleOutQuantity" width="110" />
           <el-table-column label="鍙��璐ф暟閲�"
                            prop="unQuantity"
                            width="100" />
           <el-table-column label="宸查��璐ф暟閲�"
                            width="100">
             <template #default="scope">
-              {{ calcAlreadyReturned(scope.row) }}
+              {{ formatAmount(scope.row.totalReturnNum || 0) }}
             </template>
           </el-table-column>
           <!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="120" /> -->
@@ -289,6 +309,15 @@
     prop: "returnUserName",
     width: 110,
   },
+  {
+    label: "鍙戣揣绫诲瀷",
+    prop: "shippingType",
+    width: 100,
+    formatData: (val) => getShippingTypeLabel(val),
+  },
+  { label: "鍙戣揣杞︾墝鍙�", prop: "truckPlateDisplay", width: 140 },
+  { label: "蹇�掑叕鍙�", prop: "expressCompanyDisplay", width: 140 },
+  { label: "蹇�掑崟鍙�", prop: "expressNoDisplay", width: 150 },
 
   {
     label: "鏁村崟鎶樻墸棰�",
@@ -313,12 +342,14 @@
   {
     label: "鍒涘缓鏃堕棿",
     prop: "createTime",
-    width: 170,
+    width: 130,
+    formatData: (val) => formatDate(val),
   },
   {
     label: "鏈�杩戞洿鏂版椂闂�",
     prop: "updateTime",
-    width: 170,
+    width: 130,
+    formatData: (val) => formatDate(val),
   },
   {
     label: "澶囨敞",
@@ -341,6 +372,7 @@
       },
       {
         name: "鍒犻櫎",
+        disabled: (row) => !!row.stockOutApproved,
         clickFun: (row) => {
           handleDelete(row);
         },
@@ -422,7 +454,12 @@
   findPurchaseReturnOrderListPage({ ...searchForm.value, ...page })
     .then((res) => {
       tableLoading.value = false;
-      tableData.value = res.data.records;
+      tableData.value = (res.data.records || []).map((row) => ({
+        ...row,
+        truckPlateDisplay: String(row?.shippingType) === "1" ? (row?.truckPlateNo || "--") : "--",
+        expressCompanyDisplay: String(row?.shippingType) === "2" ? (row?.expressCompany || "--") : "--",
+        expressNoDisplay: String(row?.shippingType) === "2" ? (row?.expressNo || "--") : "--",
+      }));
       page.total = res.data.total;
     })
     .catch(() => {
@@ -450,6 +487,14 @@
   );
 };
 
+const getShippingTypeLabel = (value) => {
+  const shippingTypeMap = {
+    1: "璐ц溅",
+    2: "蹇��",
+  };
+  return shippingTypeMap[String(value)] || shippingTypeMap[value] || "--";
+};
+
 const formatAmount = (value) => {
   if (value === null || value === undefined || value === "") {
     return "--";
@@ -459,6 +504,11 @@
     return value;
   }
   return num.toFixed(2);
+};
+
+const formatDate = (value) => {
+  if (!value) return "";
+  return String(value).slice(0, 10);
 };
 
 /** 宸查��璐ф暟閲� = 鍏ュ簱琛屾�绘暟閲� 鈭� 褰撳墠鍙��璐ф暟閲忥紙鍓╀綑锛� */
@@ -478,4 +528,3 @@
   margin-top: unset;
 }
 </style>
-

--
Gitblit v1.9.3