From cb2e3013e8c9db6b60dc89517575a4ffc52d7bdb Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 17 四月 2026 11:52:37 +0800
Subject: [PATCH] 销售表格增加客户备注字段

---
 src/views/salesManagement/salesLedger/index.vue |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index b88986c..9455101 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -180,7 +180,7 @@
                   {{ scope.row.perimeter ?? "" }}
                 </template>
               </el-table-column>
-              <el-table-column label="鎬婚潰绉�(cm虏)"
+              <el-table-column label="鎬婚潰绉�(m虏)"
                                prop="actualTotalArea"
                                min-width="100">
                 <template #default="scope">
@@ -351,6 +351,10 @@
                          show-overflow-tooltip />
         <el-table-column label="澶囨敞"
                          prop="remarks"
+                         width="200"
+                         show-overflow-tooltip />
+        <el-table-column label="瀹㈡埛澶囨敞"
+                         prop="customerRemarks"
                          width="200"
                          show-overflow-tooltip />
         <el-table-column fixed="right"
@@ -820,12 +824,12 @@
                                type="primary"
                                size="small"
                                @click="openOtherAmountInline(scope.row)">
-                      鍏朵粬閲戦({{ (scope.row.salesProductProcessList || []).length || 0 }})
+                      棰濆鍔犲伐({{ (scope.row.salesProductProcessList || []).length || 0 }})
                     </el-button>
                   </template>
                   <div style="display:flex; align-items:center; justify-content:space-between; gap: 10px; margin-bottom: 8px;">
                     <div style="font-weight: 600; color:#303133;">
-                      鍏朵粬閲戦
+                      棰濆鍔犲伐
                     </div>
                     <el-button type="primary"
                                plain
@@ -840,7 +844,7 @@
                     <el-select v-model="scope.row.__inlineOtherAmountAddId"
                                filterable
                                clearable
-                               placeholder="璇烽�夋嫨鍏朵粬閲戦椤圭洰"
+                               placeholder="璇烽�夋嫨棰濆鍔犲伐椤圭洰"
                                style="width: 100%;">
                       <el-option v-for="item in otherAmountSelectOptions"
                                  :key="item.id"
@@ -887,7 +891,7 @@
                   </div>
                   <div v-else
                        style="color:#909399; font-size: 13px;">
-                    鏆傛棤鍏朵粬閲戦
+                    鏆傛棤棰濆鍔犲伐
                   </div>
                 </el-popover>
               </template>
@@ -910,12 +914,12 @@
                                size="small"
                                :disabled="isProductShipped(scope.row)"
                                @click="openOtherAmountInline(scope.row)">
-                      鍏朵粬閲戦({{ (scope.row.salesProductProcessList || []).length || 0 }})
+                      棰濆鍔犲伐({{ (scope.row.salesProductProcessList || []).length || 0 }})
                     </el-button>
                   </template>
                   <div style="display:flex; align-items:center; justify-content:space-between; gap: 10px; margin-bottom: 8px;">
                     <div style="font-weight: 600; color:#303133;">
-                      鍏朵粬閲戦
+                      棰濆鍔犲伐
                     </div>
                     <el-button type="primary"
                                plain
@@ -931,7 +935,7 @@
                     <el-select v-model="scope.row.__inlineOtherAmountAddId"
                                filterable
                                clearable
-                               placeholder="璇烽�夋嫨鍏朵粬閲戦椤圭洰"
+                               placeholder="璇烽�夋嫨棰濆鍔犲伐椤圭洰"
                                style="width: 100%;"
                                :disabled="isProductShipped(scope.row)">
                       <el-option v-for="item in otherAmountSelectOptions"
@@ -981,7 +985,7 @@
                   </div>
                   <div v-else
                        style="color:#909399; font-size: 13px;">
-                    鏆傛棤鍏朵粬閲戦
+                    鏆傛棤棰濆鍔犲伐
                   </div>
                 </el-popover>
               </template>
@@ -1954,6 +1958,30 @@
       proxy.$modal.msgWarning("璇烽�夋嫨浜у搧澶х被");
       return false;
     }
+    if (row.width <= 0) {
+      proxy.$modal.msgWarning("瀹藉繀椤诲ぇ浜�0");
+      return false;
+    }
+    if (row.height <= 0) {
+      proxy.$modal.msgWarning("楂樺繀椤诲ぇ浜�0");
+      return false;
+    }
+    if (row.settlePieceArea <= 0) {
+      proxy.$modal.msgWarning("缁撶畻鍗曠墖闈㈢Н蹇呴』澶т簬0");
+      return false;
+    }
+    if (row.quantity <= 0) {
+      proxy.$modal.msgWarning("鏁伴噺蹇呴』澶т簬0");
+      return false;
+    }
+    if (row.actualTotalArea <= 0) {
+      proxy.$modal.msgWarning("闈㈢Н蹇呴』澶т簬0");
+      return false;
+    }
+    if (row.taxInclusiveUnitPrice <= 0) {
+      proxy.$modal.msgWarning("鍚◣鍗曚环蹇呴』澶т簬0");
+      return false;
+    }
     if (!row.productModelId) {
       proxy.$modal.msgWarning("璇烽�夋嫨瑙勬牸鍨嬪彿");
       return false;

--
Gitblit v1.9.3