From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ea656cf..d40b1bf 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -161,7 +161,7 @@
                                prop="taxRate" />
               <el-table-column label="鍚◣鍗曚环(鍏�)"
                                prop="taxInclusiveUnitPrice"
-                               :formatter="sensitiveUnitPriceFormatter" />
+                               :formatter="sensitiveAmountFormatter" />
               <el-table-column label="鍚◣鎬讳环(鍏�)"
                                prop="taxInclusiveTotalPrice"
                                :formatter="sensitiveAmountFormatter" />
@@ -455,8 +455,8 @@
           <el-table-column label="绋庣巼(%)"
                            prop="taxRate" />
           <el-table-column label="鍚◣鍗曚环(鍏�)"
-                            prop="taxInclusiveUnitPrice"
-                            :formatter="unitPriceFormatter" />
+                           prop="taxInclusiveUnitPrice"
+                           :formatter="formattedNumber" />
           <el-table-column label="鍚◣鎬讳环(鍏�)"
                            prop="taxInclusiveTotalPrice"
                            :formatter="formattedNumber" />
@@ -668,7 +668,7 @@
                                :min="0"
                                v-model="productForm.taxInclusiveUnitPrice"
                                style="width: 100%"
-                               :precision="6"
+                               :precision="2"
                                placeholder="璇疯緭鍏�"
                                clearable
                                @change="calculateFromUnitPrice" />
@@ -722,7 +722,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+<!--          <el-col :span="12">
             <el-form-item label="鏄惁鐢熶骇锛�"
                           prop="isProduction">
               <el-radio-group v-model="productForm.isProduction">
@@ -732,7 +732,7 @@
                           :value="false" />
               </el-radio-group>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
       </el-form>
     </FormDialog>
@@ -1402,12 +1402,6 @@
     }
     return parseFloat(cellValue).toFixed(2);
   };
-  const unitPriceFormatter = (row, column, cellValue) => {
-    if (cellValue === undefined || cellValue === null || cellValue === "") {
-      return "0.000000";
-    }
-    return parseFloat(cellValue).toFixed(6);
-  };
   const findLedgerRecordByRow = row => {
     if (!row) return null;
     if (
@@ -1460,12 +1454,6 @@
       return "*****";
     }
     return formattedNumber(row, column, cellValue);
-  };
-  const sensitiveUnitPriceFormatter = (row, column, cellValue) => {
-    if (!isCurrentUserMaintainer(row)) {
-      return "*****";
-    }
-    return unitPriceFormatter(row, column, cellValue);
   };
   // 鑾峰彇tree瀛愭暟鎹�
   const getModels = value => {
@@ -1746,7 +1734,7 @@
         unit: p.unit || "",
         quantity: quantity,
         taxRate: taxRate,
-        taxInclusiveUnitPrice: unitPrice.toFixed(6),
+        taxInclusiveUnitPrice: unitPrice.toFixed(2),
         taxInclusiveTotalPrice: taxInclusiveTotalPrice,
         taxExclusiveTotalPrice: taxExclusiveTotalPrice,
         invoiceType: "澧炴櫘绁�",
@@ -2478,7 +2466,7 @@
     isCalculating.value = true;
 
     // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
-    productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(6);
+    productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
 
     // 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
     if (productForm.value.taxRate) {
@@ -2520,7 +2508,7 @@
     // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
     productForm.value.taxInclusiveUnitPrice = (
       inclusiveTotalPrice / quantity
-    ).toFixed(6);
+    ).toFixed(2);
 
     isCalculating.value = false;
   };

--
Gitblit v1.9.3