Commit 05191c580a3b3f888979ed90dc9baa349a6c5076
Merge branch '云南五彩' of http://git.xlyprint.cn/xlyErp/xlyUmi into 云南五彩
Showing
1 changed file
with
1 additions
and
1 deletions
src/components/Common/commonBusiness.js
| @@ -845,7 +845,7 @@ export function getCalculateMoneyNew(app, masterData, tableDataRow, type, sField | @@ -845,7 +845,7 @@ export function getCalculateMoneyNew(app, masterData, tableDataRow, type, sField | ||
| 845 | const dProductForeignPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductForeignMoney / dProductQty : 0, dNetPrice); /* 外币价格 */ | 845 | const dProductForeignPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductForeignMoney / dProductQty : 0, dNetPrice); /* 外币价格 */ |
| 846 | const dProductPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductMoney / dProductQty : 0, dNetPrice); /* 本位币价格 */ | 846 | const dProductPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductMoney / dProductQty : 0, dNetPrice); /* 本位币价格 */ |
| 847 | let dProductNoTaxMoney = tableDataRow[`d${type}NoTaxMoney`] /* 不含税金额 */ | 847 | let dProductNoTaxMoney = tableDataRow[`d${type}NoTaxMoney`] /* 不含税金额 */ |
| 848 | - if (!app?.currentPane?.sModelsType?.includes('purchase/purchasecheck')) { | 848 | + if (!['purchase/purchasecheck', 'outside/outsideChecking'].includes(app?.currentPane?.sModelsType)) { |
| 849 | dProductNoTaxMoney = commonUtils.convertFixNum(dProductMoney / (1 + (dTaxRate / 100)), dNetMoney); | 849 | dProductNoTaxMoney = commonUtils.convertFixNum(dProductMoney / (1 + (dTaxRate / 100)), dNetMoney); |
| 850 | } | 850 | } |
| 851 | const dProductNoTaxPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductNoTaxMoney / dProductQty : 0, dNetPrice); /* 不含税价 */ | 851 | const dProductNoTaxPrice = commonUtils.convertFixNum(dProductQty !== 0 ? dProductNoTaxMoney / dProductQty : 0, dNetPrice); /* 不含税价 */ |