diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 89bd8ce..fa4e25b 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -4605,8 +4605,8 @@ export default (ChildComponent) => { } if( sModelsType === 'sales/adjust') { - tableDataRow.dProductMoney = tableDataRow.dTotalMoney; - sFieldName = 'dProductMoney'; + // tableDataRow.dProductMoney = tableDataRow.dTotalMoney; + sFieldName = 'dProductForeignMoney'; } if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/') @@ -5046,9 +5046,9 @@ export default (ChildComponent) => { tableDataRow[`d${models}Money`] = tableDataRow.dTotalMoney; } - if( sModelsType === 'sales/adjust') { - tableDataRow.dProductMoney = tableDataRow.dTotalMoney; - controlField = 'dProductMoney'; + if( sModelsType === 'sales/adjust') { /* 财务调整单 */ + // tableDataRow.dProductMoney = tableDataRow.dTotalMoney; + controlField = 'dProductForeignMoney'; } tableDataRow = commonBusiness.getCalculateAllMoney(app, models, controlField, returnData.masterData, tableDataRow); tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;