Commit 9d96349e33c79371e9e06266bc0a2c30abb615f7

Authored by Min
1 parent 9b52c708

1.处理财务调整单金额计算,从外币金额开始算

src/components/Common/CommonBillEvent.js
@@ -4591,23 +4591,9 @@ export default (ChildComponent) => { @@ -4591,23 +4591,9 @@ export default (ChildComponent) => {
4591 } 4591 }
4592 /* 各种金额,税额,价格计算 */ 4592 /* 各种金额,税额,价格计算 */
4593 let models = name === 'materials' ? 'Materials' : 4593 let models = name === 'materials' ? 'Materials' :
4594 - sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials'; 4594 + sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('cashier/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
4595 4595
4596 - if( sModelsType?.includes('cashier/')) {  
4597 - tableDataRow.bSettleMoney = true;/* 收付款单 */  
4598 - if(sFieldName === 'dTotalMoney') {  
4599 - tableDataRow[`d${models}Money`] =tableDataRow.dTotalMoney;  
4600 - sFieldName = `d${models}Money`;  
4601 - } else if(sFieldName === 'dTotalForeignPrice') {  
4602 - tableDataRow[`d${models}ForeignPrice`] = tableDataRow.dTotalForeignPrice;  
4603 - sFieldName = `d${models}ForeignPrice`  
4604 - }  
4605 4596
4606 - }  
4607 - if( sModelsType === 'sales/adjust') {  
4608 - // tableDataRow.dProductMoney = tableDataRow.dTotalMoney;  
4609 - sFieldName = 'dProductForeignMoney';  
4610 - }  
4611 4597
4612 if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/') 4598 if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/')
4613 || sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/') || sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') { 4599 || sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/') || sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') {