yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 8 months ago
parent
434182c1e5 5253fa675f
commit
d3fd8f94b3
1 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

44
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
View File

@ -1230,8 +1230,8 @@ export default {
// 加税点项目是否包含维修项目 // 加税点项目是否包含维修项目
if (this.formobj.invoiceVo.taxItems.includes('维修项目')) { if (this.formobj.invoiceVo.taxItems.includes('维修项目')) {
this.formobj.sitemVos.forEach((e) => { this.formobj.sitemVos.forEach((e) => {
// 是，销售价 = 原销售价 + 原销售价 * (1 + 税率) // 是，销售价 = 原销售价 * (1 + 税率)
e.price = Math.round((parseFloat(e.sitemPrice) + parseFloat(e.sitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 e.price = Math.round((parseFloat(e.sitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
this.computeYHAndXSJE(e) this.computeYHAndXSJE(e)
}) })
} else { } else {
@ -1253,8 +1253,8 @@ export default {
e.price = e.goodsDetailsPrice e.price = e.goodsDetailsPrice
this.computeYHAndJE(e) this.computeYHAndJE(e)
} else { } else {
// 商品进货价不含税则销售价 = 原销售价 + 原销售价 * (1 + 税率) // 商品进货价不含税则销售价 = 原销售价 * (1 + 税率)
e.price = Math.round((parseFloat(e.goodsDetailsPrice) + parseFloat(e.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 e.price = Math.round((parseFloat(e.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
this.computeYHAndJE(e) this.computeYHAndJE(e)
} }
}) })
@ -1271,8 +1271,8 @@ export default {
// 加税点项目是否包含其它附加项目 // 加税点项目是否包含其它附加项目
if (this.formobj.invoiceVo.taxItems.includes('其它附加项目')) { if (this.formobj.invoiceVo.taxItems.includes('其它附加项目')) {
this.formobj.aitemVos.forEach((e) => { this.formobj.aitemVos.forEach((e) => {
// 是，销售价 = 原销售价 + 原销售价 * (1 + 税率) // 是，销售价 = 原销售价 * (1 + 税率)
e.price = Math.round((parseFloat(e.aitemPrice) + parseFloat(e.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 e.price = Math.round((parseFloat(e.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
}) })
} else { } else {
this.formobj.aitemVos.forEach((k) => { this.formobj.aitemVos.forEach((k) => {
@ -1284,12 +1284,12 @@ export default {
// 附加项目，加税点项目是否包含附加项目 // 附加项目，加税点项目是否包含附加项目
if (this.formobj.invoiceVo.taxItems.includes('附加项目')) { if (this.formobj.invoiceVo.taxItems.includes('附加项目')) {
// 是 // 是
// 外出费开票金额 = 原外出费 + 原外出费 * (1 + 税率) // 外出费开票金额 = 原外出费 * (1 + 税率)
this.formobj.outKPAmount = Math.round((parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.outKPAmount = Math.round((parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// 厂家补助开票金额 = 原厂家补助 + 原厂家补助 * (1 + 税率) // 厂家补助开票金额 = 原厂家补助 * (1 + 税率)
this.formobj.subsidyKPAmount = Math.round((parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.subsidyKPAmount = Math.round((parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// 施救费开票金额 = 原施救费 + 原施救费 * (1 + 税率) // 施救费开票金额 = 原施救费 * (1 + 税率)
this.formobj.rescueKPAmount = Math.round((parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.rescueKPAmount = Math.round((parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
// 否 // 否
this.formobj.outKPAmount = '' this.formobj.outKPAmount = ''
@ -1349,8 +1349,8 @@ export default {
row.hours = value.hours row.hours = value.hours
row.sitemPrice = value.price row.sitemPrice = value.price
if (this.formobj.invoiceVo.isInvoicing === '1' && this.formobj.invoiceVo.taxItems.length > 0 && this.formobj.invoiceVo.taxItems.includes('维修项目')) { if (this.formobj.invoiceVo.isInvoicing === '1' && this.formobj.invoiceVo.taxItems.length > 0 && this.formobj.invoiceVo.taxItems.includes('维修项目')) {
// 是否开发票为是且选择加税点的项目中包含维修项目，则销售价 = 原销售价 + 原销售价 * ( 1 + 税率 ) // 是否开发票为是且选择加税点的项目中包含维修项目，则销售价 = 原销售价 * ( 1 + 税率 )
row.price = Math.round((parseFloat(row.sitemPrice) + parseFloat(row.sitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 row.price = Math.round((parseFloat(row.sitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
row.price = row.sitemPrice row.price = row.sitemPrice
} }
@ -1416,8 +1416,8 @@ export default {
// 附加项目，加税点项目是否包含附加项目 // 附加项目，加税点项目是否包含附加项目
if (this.formobj.invoiceVo.taxItems.includes('附加项目')) { if (this.formobj.invoiceVo.taxItems.includes('附加项目')) {
// 是 // 是
// 外出费开票金额 = 原外出费 + 原外出费 * (1 + 税率) // 外出费开票金额 = 原外出费 * (1 + 税率)
this.formobj.outKPAmount = Math.round((parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.outKPAmount = Math.round((parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
// 否 // 否
this.formobj.outKPAmount = '' this.formobj.outKPAmount = ''
@ -1428,8 +1428,8 @@ export default {
// 附加项目，加税点项目是否包含附加项目 // 附加项目，加税点项目是否包含附加项目
if (this.formobj.invoiceVo.taxItems.includes('附加项目')) { if (this.formobj.invoiceVo.taxItems.includes('附加项目')) {
// 是 // 是
// 厂家补助开票金额 = 原厂家补助 + 原厂家补助 * (1 + 税率) // 厂家补助开票金额 = 原厂家补助 * (1 + 税率)
this.formobj.subsidyKPAmount = Math.round((parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.subsidyKPAmount = Math.round((parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
// 否 // 否
this.formobj.subsidyKPAmount = '' this.formobj.subsidyKPAmount = ''
@ -1440,8 +1440,8 @@ export default {
// 附加项目，加税点项目是否包含附加项目 // 附加项目，加税点项目是否包含附加项目
if (this.formobj.invoiceVo.taxItems.includes('附加项目')) { if (this.formobj.invoiceVo.taxItems.includes('附加项目')) {
// 是 // 是
// 施救费开票金额 = 原施救费 + 原施救费 * (1 + 税率) // 施救费开票金额 = 原施救费 * (1 + 税率)
this.formobj.rescueKPAmount = Math.round((parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 this.formobj.rescueKPAmount = Math.round((parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
// 否 // 否
this.formobj.rescueKPAmount = '' this.formobj.rescueKPAmount = ''
@ -1479,8 +1479,8 @@ export default {
row.aitemName = value.aitemName row.aitemName = value.aitemName
row.aitemPrice = value.price row.aitemPrice = value.price
if (this.formobj.invoiceVo.isInvoicing === '1' && this.formobj.invoiceVo.taxItems.length > 0 && this.formobj.invoiceVo.taxItems.includes('其它附加项目')) { if (this.formobj.invoiceVo.isInvoicing === '1' && this.formobj.invoiceVo.taxItems.length > 0 && this.formobj.invoiceVo.taxItems.includes('其它附加项目')) {
// 是否开发票为是且选择加税点的项目中包含其它附加项目，则销售价 = 原销售价 + 原销售价 * ( 1 + 税率 ) // 是否开发票为是且选择加税点的项目中包含其它附加项目，则销售价 = 原销售价 * ( 1 + 税率 )
row.price = Math.round((parseFloat(row.aitemPrice) + parseFloat(row.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100 row.price = Math.round((parseFloat(row.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else { } else {
row.price = row.aitemPrice row.price = row.aitemPrice
} }

Write Preview
Loading…
Cancel
Save