From 53e7b5182e230c225282f6753ba692ddf9a5e1aa Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 11 五月 2026 13:32:05 +0800
Subject: [PATCH] 销售台账,产品信息字段顺序变更,复制新建功能点逻辑调整

---
 src/views/salesManagement/salesLedger/index.vue |  131 +++++++++++++++++++++++--------------------
 1 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index c04304c..94e992d 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -664,6 +664,36 @@
               <span v-else>{{ scope.row.thickness ?? "" }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="妤煎眰缂栧彿"
+                           prop="floorCode"
+                           min-width="250"
+                           show-overflow-tooltip>
+            <template #default="scope">
+              <el-input v-if="scope.row.__editing"
+                        v-model="scope.row.floorCode"
+                        placeholder="璇疯緭鍏�"
+                        clearable
+                        style="width: 100%" />
+              <span v-else>{{ scope.row.floorCode ?? "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鍚◣鍗曚环(鍏�)"
+                           prop="taxInclusiveUnitPrice"
+                           min-width="160">
+            <template #default="scope">
+              <el-input-number v-if="scope.row.__editing"
+                               :step="0.01"
+                               :min="0"
+                               :precision="2"
+                               style="width: 100%"
+                               v-model="scope.row.taxInclusiveUnitPrice"
+                               placeholder="璇疯緭鍏�"
+                               clearable
+                               @change="() => handleInlineUnitPriceChange(scope.row)"
+                               @input="() => handleInlineUnitPriceChange(scope.row)" />
+              <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="瀹�(mm)"
                            prop="width"
                            min-width="160">
@@ -700,23 +730,6 @@
               <span v-else>{{ scope.row.height ?? "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)"
-                           prop="settlePieceArea"
-                           min-width="200">
-            <template #default="scope">
-              <el-input-number v-if="scope.row.__editing"
-                               controls-position="right"
-                               v-model="scope.row.settlePieceArea"
-                               :min="0"
-                               :step="1"
-                               :precision="4"
-                               style="width: 100%"
-                               placeholder="璇疯緭鍏�"
-                               clearable
-                               @change="() => handleInlineSettleAreaChange(scope.row)" />
-              <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="鏁伴噺"
                            prop="quantity"
                            min-width="150">
@@ -735,6 +748,23 @@
               <span v-else>{{ scope.row.quantity ?? "" }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)"
+                           prop="settlePieceArea"
+                           min-width="200">
+            <template #default="scope">
+              <el-input-number v-if="scope.row.__editing"
+                               controls-position="right"
+                               v-model="scope.row.settlePieceArea"
+                               :min="0"
+                               :step="1"
+                               :precision="4"
+                               style="width: 100%"
+                               placeholder="璇疯緭鍏�"
+                               clearable
+                               @change="() => handleInlineSettleAreaChange(scope.row)" />
+              <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="闈㈢Н(m虏)"
                            prop="actualTotalArea"
                            min-width="200">
@@ -748,23 +778,6 @@
                                style="width: 100%"
                                placeholder="鑷姩璁$畻" />
               <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="鍚◣鍗曚环(鍏�)"
-                           prop="taxInclusiveUnitPrice"
-                           min-width="160">
-            <template #default="scope">
-              <el-input-number v-if="scope.row.__editing"
-                               :step="0.01"
-                               :min="0"
-                               :precision="2"
-                               style="width: 100%"
-                               v-model="scope.row.taxInclusiveUnitPrice"
-                               placeholder="璇疯緭鍏�"
-                               clearable
-                               @change="() => handleInlineUnitPriceChange(scope.row)"
-                               @input="() => handleInlineUnitPriceChange(scope.row)" />
-              <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="绋庣巼(%)"
@@ -799,6 +812,19 @@
                            prop="taxExclusiveTotalPrice"
                            :formatter="formattedNumber"
                            min-width="120" />
+          <el-table-column label="鍔犲伐瑕佹眰"
+                           prop="processRequirement"
+                           min-width="160"
+                           show-overflow-tooltip>
+            <template #default="scope">
+              <el-input v-if="scope.row.__editing"
+                        v-model="scope.row.processRequirement"
+                        placeholder="璇疯緭鍏�"
+                        clearable
+                        style="width: 100%" />
+              <span v-else>{{ scope.row.processRequirement ?? "" }}</span>
+            </template>
+          </el-table-column>     
           <el-table-column label="鍙戠エ绫诲瀷"
                            prop="invoiceType"
                            min-width="120">
@@ -816,19 +842,6 @@
               <span v-else>{{ scope.row.invoiceType ?? "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="鍔犲伐瑕佹眰"
-                           prop="processRequirement"
-                           min-width="160"
-                           show-overflow-tooltip>
-            <template #default="scope">
-              <el-input v-if="scope.row.__editing"
-                        v-model="scope.row.processRequirement"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        style="width: 100%" />
-              <span v-else>{{ scope.row.processRequirement ?? "" }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="澶囨敞"
                            prop="remark"
                            min-width="140"
@@ -840,19 +853,6 @@
                         clearable
                         style="width: 100%" />
               <span v-else>{{ scope.row.remark ?? "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="妤煎眰缂栧彿"
-                           prop="floorCode"
-                           min-width="250"
-                           show-overflow-tooltip>
-            <template #default="scope">
-              <el-input v-if="scope.row.__editing"
-                        v-model="scope.row.floorCode"
-                        placeholder="璇疯緭鍏�"
-                        clearable
-                        style="width: 100%" />
-              <span v-else>{{ scope.row.floorCode ?? "" }}</span>
             </template>
           </el-table-column>
           <el-table-column label="閲嶇"
@@ -2218,10 +2218,17 @@
       row.thickness !== null && row.thickness !== undefined && row.thickness !== ""
         ? Number(row.thickness)
         : null;
+    copied.floorCode = row?.floorCode ?? row?.floor_code ?? "";
 
-    // 澶嶅埗鏂板缓浠呭甫鍑轰骇鍝佸ぇ绫讳笌瑙勬牸鍨嬪彿锛屽叾浠栨暟瀛楀瓧娈靛叏閮ㄧ暀绌猴紝閬垮厤鍑虹幇 0.00
+    const srcUnit = row?.taxInclusiveUnitPrice;
+    const unitNum =
+      srcUnit !== null && srcUnit !== undefined && srcUnit !== ""
+        ? Number(srcUnit)
+        : NaN;
+    copied.taxInclusiveUnitPrice = Number.isFinite(unitNum) ? unitNum : null;
+
+    // 澶嶅埗鏂板缓甯﹀嚭锛氫骇鍝佸ぇ绫汇�佽鏍煎瀷鍙枫�佸帤搴︺�佹ゼ灞傜紪鍙枫�佸崟浠凤紱鍏朵綑鏁伴噺/闈㈢Н/鎬讳环绛夌暀绌猴紝閬垮厤鍑虹幇 0.00
     copied.quantity = null;
-    copied.taxInclusiveUnitPrice = null;
     copied.taxInclusiveTotalPrice = null;
     copied.taxExclusiveTotalPrice = null;
     copied.width = null;

--
Gitblit v1.9.3