From 9d96349e33c79371e9e06266bc0a2c30abb615f7 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Wed, 23 Jul 2025 10:11:23 +0800
Subject: [PATCH] 1.处理财务调整单金额计算，从外币金额开始算

---
 src/components/Common/CommonBillEvent.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js
index fa4e25b..8eef526 100644
--- a/src/components/Common/CommonBillEvent.js
+++ b/src/components/Common/CommonBillEvent.js
@@ -4591,23 +4591,9 @@ export default (ChildComponent) => {
         }
         /* 各种金额，税额，价格计算 */
         let models = name === 'materials' ? 'Materials' :
-          sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
+          sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('cashier/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
 
-        if( sModelsType?.includes('cashier/')) {
-          tableDataRow.bSettleMoney = true;/* 收付款单 */
-          if(sFieldName === 'dTotalMoney') {
-            tableDataRow[`d${models}Money`] =tableDataRow.dTotalMoney;
-            sFieldName = `d${models}Money`;
-          } else if(sFieldName === 'dTotalForeignPrice') {
-            tableDataRow[`d${models}ForeignPrice`] = tableDataRow.dTotalForeignPrice;
-            sFieldName = `d${models}ForeignPrice`
-          }
 
-        }
-        if( sModelsType === 'sales/adjust') {
-          // tableDataRow.dProductMoney = tableDataRow.dTotalMoney;
-          sFieldName = 'dProductForeignMoney';
-        }
 
         if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/')
           || sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/') || sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') {
--
libgit2 0.22.2