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/salesManagement/salesLedger/index.vue |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 4e1f8ee..4f6d40a 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -112,8 +112,8 @@
         <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
         <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip />
         <el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip />
-        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
-        <el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
+        <!-- <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
+        <el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip /> -->
         <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
           :formatter="formattedNumber" />
         <el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
@@ -173,24 +173,12 @@
             </el-form-item>
           </el-col>
 					<el-col :span="12">
-						<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
-							<el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
-						</el-form-item>
-					</el-col>
-        </el-row>
-        <el-row :gutter="30">
-					<el-col :span="12">
 						<el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
 							<el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
 															format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="12">
-						<el-form-item label="浠樻鏂瑰紡">
-							<el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
-						</el-form-item>
-					</el-col>
-				</el-row>
+        </el-row>
 				<el-row :gutter="30">
 					<el-col :span="12">
 						<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
@@ -551,6 +539,7 @@
 										<th>浜у搧鍚嶇О</th>
 										<th>瑙勬牸鍨嬪彿</th>
 										<th>鍗曚綅</th>
+										<th>UID鐮�</th>
 										<th>鍗曚环</th>
 										<th>闆跺敭鏁伴噺</th>
 										<th>闆跺敭閲戦</th>
@@ -561,6 +550,7 @@
 										<td>{{ product.productCategory || '' }}</td>
 										<td>{{ product.specificationModel || '' }}</td>
 										<td>{{ product.unit || '' }}</td>
+										<td>{{ product.uidNo || '' }}</td>
 										<td>{{ product.taxInclusiveUnitPrice || '0' }}</td>
 										<td>{{ product.quantity || '0' }}</td>
 										<td>{{ product.taxInclusiveTotalPrice || '0' }}</td>
@@ -974,7 +964,7 @@
 		if (node?.id !== null && node?.id !== undefined) return String(node.id);
 		if (node?.nodeType === "batch") return String(node.batchNo ?? node.label ?? "");
 		if (node?.nodeType === "customer") return String(node.customer ?? node.label ?? "");
-		if (node?.nodeType === "model") return String(node.model ?? node.label ?? "");
+		if (node?.nodeType === "model") return String(node.productModelId ?? node.model ?? node.label ?? "");
 		return String(node.productName ?? node.label ?? "");
 	};
 
@@ -1087,6 +1077,7 @@
 	const prevBatchNo = productForm.value.batchNo;
 	const prevCustomer = productForm.value.customer;
 
+	productForm.value.productModelId = modelNode.value;
 	productForm.value.specificationModel = modelNode.model ?? modelNode.label ?? "";
 	// 鏈変簺鎺ュ彛/鏍戞暟鎹噷鍙兘涓嶅寘鍚� unit锛岃繖绉嶆儏鍐典笅涓嶈瑕嗙洊缂栬緫鏃跺凡鍥炴樉鐨勫��
 	const nextUnit = modelNode.unit ?? "";
@@ -1354,8 +1345,9 @@
 		return {
 			// 鍙拌处瀛楁
 			productCategory: p.product || p.productName || "",
+			productModelId: p.productModelId || "",
 			specificationModel: p.specification || "",
-      uidNo: p.uidNo || "",
+			uidNo: p.uidNo || "",
 			unit: p.unit || "",
 			quantity: quantity,
 			taxRate: taxRate,
@@ -1906,6 +1898,7 @@
                   <th>浜у搧鍚嶇О</th>
                   <th>瑙勬牸鍨嬪彿</th>
                   <th>鍗曚綅</th>
+                  <th>UID鐮�</th>
                   <th>鍗曚环</th>
                   <th>闆跺敭鏁伴噺</th>
                   <th>闆跺敭閲戦</th>
@@ -1918,6 +1911,7 @@
                       <td>${product.productCategory || ''}</td>
                       <td>${product.specificationModel || ''}</td>
                       <td>${product.unit || ''}</td>
+                      <td>${product.uidNo || ''}</td>
                       <td>${product.taxInclusiveUnitPrice || '0'}</td>
                       <td>${product.quantity || '0'}</td>
                       <td>${product.taxInclusiveTotalPrice || '0'}</td>

--
Gitblit v1.9.3