From c9cc00d09c756f126710168f81eb7ceba0959ec2 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期五, 21 八月 2026 11:17:31 +0800
Subject: [PATCH] feat(personnel,production): 新增年龄自动计算及工单数量支持小数

---
 src/views/procurementManagement/procurementLedger/index.vue |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index d94b593..a33bfe0 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -121,6 +121,8 @@
               </el-table-column>
               <el-table-column label="鏁伴噺"
                                prop="quantity" />
+              <el-table-column label="閿�鍞彂璐ф暟閲�"
+                               prop="shippedQuantity" />
               <el-table-column label="鍙敤鏁伴噺"
                                prop="availableQuality" />
               <el-table-column label="閫�璐ф暟閲�"
@@ -194,6 +196,11 @@
                          width="200"
                          show-overflow-tooltip
                          :formatter="formattedNumber" />
+        <el-table-column label="瀹為檯鍚堝悓閲戦(鍏�)"
+                         prop="netContractAmount"
+                         width="200"
+                         show-overflow-tooltip
+                         :formatter="(_, __, cellValue) => formatMoney(cellValue)" />
         <el-table-column label="褰曞叆浜�"
                          prop="recorderName"
                          width="120"
@@ -214,7 +221,7 @@
             <el-button link
                        type="primary"
                        @click="openForm('edit', scope.row)"
-                       :disabled="scope.row.stockInStatus === '瀹屽叏鍏ュ簱'">缂栬緫
+                       :disabled="scope.row.approvalStatus === 3">缂栬緫
             </el-button>
             <el-button link
                        type="primary"
@@ -938,16 +945,7 @@
     },
   });
   const { form, rules } = toRefs(data);
-  const { form: searchForm } = useFormData({
-    ...data.searchForm,
-    // 璁剧疆褰曞叆鏃ユ湡鑼冨洿涓哄綋澶�
-    entryDate: [
-      dayjs().startOf("day").format("YYYY-MM-DD"),
-      dayjs().endOf("day").format("YYYY-MM-DD"),
-    ],
-    entryDateStart: dayjs().startOf("day").format("YYYY-MM-DD"),
-    entryDateEnd: dayjs().endOf("day").format("YYYY-MM-DD"),
-  });
+  const { form: searchForm } = useFormData(data.searchForm);
 
   // 浜у搧琛ㄥ崟寮规鏁版嵁
   const productFormVisible = ref(false);
@@ -1264,7 +1262,14 @@
   };
   // 涓昏〃鍚堣鏂规硶
   const summarizeMainTable = param => {
-    return proxy.summarizeTable(param, ["contractAmount"]);
+    return proxy.summarizeTable(param, ["contractAmount", "netContractAmount"]);
+  };
+  const formatMoney = value => {
+    if (value === null || value === undefined || value === "") {
+      return "--";
+    }
+    const num = Number(value);
+    return Number.isFinite(num) ? num.toFixed(2) : "--";
   };
   // 瀛愯〃鍚堣鏂规硶
   const summarizeProTable = param => {
@@ -1637,6 +1642,10 @@
   };
   // 鍒犻櫎浜у搧
   const deleteProduct = () => {
+    if (productData.value.length <= 1) {
+      proxy.$modal.msgWarning("閲囪喘鍙拌处鑷冲皯闇�瑕佷繚鐣欎竴鏉′骇鍝佹暟鎹�");
+      return;
+    }
     if (productSelectedRows.value.length === 0) {
       proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
       return;
@@ -1731,7 +1740,7 @@
       return;
     }
     const ids = selectedRows.value.map((item) => item.id);
-    
+
     ElMessageBox.confirm("纭鎵归噺鐢熸垚鏁版嵁锛�", "鎵归噺鐢熸垚", {
       confirmButtonText: "纭",
       cancelButtonText: "鍙栨秷",

--
Gitblit v1.9.3