From 8deee9363e7a5d180bd77cdb2db0fa22dbb1702d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 01 四月 2026 14:59:07 +0800
Subject: [PATCH] fix: 优化库存管理

---
 src/views/procurementManagement/procurementLedger/index.vue |   78 +++++++++++++++++++++++++--------------
 1 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index ea4304b..d29677a 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -86,6 +86,7 @@
                                prop="productCategory" />
               <el-table-column label="瑙勬牸鍨嬪彿"
                                prop="specificationModel" />
+              <el-table-column label="UID鐮�" prop="uidNo" />
               <el-table-column label="鍗曚綅"
                                prop="unit" />
               <el-table-column label="鏁伴噺"
@@ -120,10 +121,10 @@
                          prop="supplierName"
                           width="160"
                          show-overflow-tooltip />
-        <el-table-column label="椤圭洰鍚嶇О"
+        <!-- <el-table-column label="椤圭洰鍚嶇О"
                          prop="projectName"
                          width="320"
-                         show-overflow-tooltip />
+                         show-overflow-tooltip /> -->
         <el-table-column label="瀹℃壒鐘舵��"
                          prop="approvalStatus"
                          width="100"
@@ -233,25 +234,8 @@
                 <el-option v-for="item in supplierList"
                            :key="item.id"
                            :label="item.supplierName"
-                           :value="item.id" />
+													 :value="item.id" >{{item.supplierName + '---' + item.supplierType}}</el-option>
               </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="椤圭洰鍚嶇О"
-                          prop="projectName">
-              <el-input v-model="form.projectName"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="浠樻鏂瑰紡">
-              <el-input v-model="form.paymentMethod"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -266,6 +250,24 @@
                               clearable />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="椤圭洰鍚嶇О"
+                          prop="projectName">
+              <el-input v-model="form.projectName"
+                        placeholder="璇疯緭鍏�"
+                        clearable />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="30">
+          <!-- <el-col :span="12">
+            <el-form-item label="浠樻鏂瑰紡">
+              <el-input v-model="form.paymentMethod"
+                        placeholder="璇疯緭鍏�"
+                        clearable />
+            </el-form-item>
+          </el-col> -->
+          
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
@@ -408,6 +410,8 @@
           <el-table-column label="鍗曚綅"
                            prop="unit"
                            width="70" />
+          <el-table-column label="UID鐮�" prop="uidNo" />
+          <el-table-column label="鎵规鍙�" prop="batchNo" />
           <el-table-column label="鏁伴噺"
                            prop="quantity"
                            width="70" />
@@ -568,6 +572,27 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="UID鐮侊細"
+                          prop="uidNo">
+              <el-input v-model="productForm.uidNo"
+                        placeholder="璇疯緭鍏�"
+                        disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="鎵规鍙凤細"
+                          prop="batchNo">
+              <el-input v-model="productForm.batchNo"
+                        placeholder="璇疯緭鍏�"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鍗曚綅锛�"
@@ -951,6 +976,8 @@
       productId: "",
       productCategory: "",
       productModelId: "",
+      uidNo: "",
+        batchNo: "",
       specificationModel: "",
       unit: "",
       quantity: "",
@@ -965,6 +992,7 @@
     productRules: {
       productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
       productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+      batchNo: [{ required: true, message: "璇疯緭鍏ユ壒娆″彿", trigger: "blur" }],
       unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       taxInclusiveUnitPrice: [
@@ -1555,9 +1583,11 @@
     if (index !== -1) {
       productForm.value.specificationModel = modelOptions.value[index].model;
       productForm.value.unit = modelOptions.value[index].unit;
+      productForm.value.uidNo = modelOptions.value[index].uidNo || "";
     } else {
       productForm.value.specificationModel = null;
       productForm.value.unit = null;
+      productForm.value.uidNo = "";
     }
   };
   const findNodeById = (nodes, productId) => {
@@ -1683,14 +1713,6 @@
   const handleDelete = () => {
     let ids = [];
     if (selectedRows.value.length > 0) {
-      // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-      const unauthorizedData = selectedRows.value.filter(
-        item => item.recorderName !== userStore.nickName
-      );
-      if (unauthorizedData.length > 0) {
-        proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-        return;
-      }
       ids = selectedRows.value.map(item => item.id);
     } else {
       proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");

--
Gitblit v1.9.3