Commit 9b52c708fcca3eff27cad29410ca8ec6f72fd333

Authored by Min
1 parent 23b7a6cc

1.处理财务调整单 外币,汇率计算

src/components/Common/CommonBillEvent.js
@@ -4605,8 +4605,8 @@ export default (ChildComponent) => { @@ -4605,8 +4605,8 @@ export default (ChildComponent) => {
4605 4605
4606 } 4606 }
4607 if( sModelsType === 'sales/adjust') { 4607 if( sModelsType === 'sales/adjust') {
4608 - tableDataRow.dProductMoney = tableDataRow.dTotalMoney;  
4609 - sFieldName = 'dProductMoney'; 4608 + // tableDataRow.dProductMoney = tableDataRow.dTotalMoney;
  4609 + sFieldName = 'dProductForeignMoney';
4610 } 4610 }
4611 4611
4612 if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/') 4612 if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/')
@@ -5046,9 +5046,9 @@ export default (ChildComponent) => { @@ -5046,9 +5046,9 @@ export default (ChildComponent) => {
5046 tableDataRow[`d${models}Money`] = tableDataRow.dTotalMoney; 5046 tableDataRow[`d${models}Money`] = tableDataRow.dTotalMoney;
5047 5047
5048 } 5048 }
5049 - if( sModelsType === 'sales/adjust') {  
5050 - tableDataRow.dProductMoney = tableDataRow.dTotalMoney;  
5051 - controlField = 'dProductMoney'; 5049 + if( sModelsType === 'sales/adjust') { /* 财务调整单 */
  5050 + // tableDataRow.dProductMoney = tableDataRow.dTotalMoney;
  5051 + controlField = 'dProductForeignMoney';
5052 } 5052 }
5053 tableDataRow = commonBusiness.getCalculateAllMoney(app, models, controlField, returnData.masterData, tableDataRow); 5053 tableDataRow = commonBusiness.getCalculateAllMoney(app, models, controlField, returnData.masterData, tableDataRow);
5054 tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType; 5054 tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;