Browse Source

Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

intex_20241211
zhaoyiran 2 months ago
parent
commit
a378559d7f
  1. 1
      package.json
  2. 5
      src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue

1
package.json

@ -32,6 +32,7 @@
"cropperjs": "^1.6.1", "cropperjs": "^1.6.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"decimal.js": "^10.4.3",
"diagram-js": "^12.3.0", "diagram-js": "^12.3.0",
"echarts": "^5.4.3", "echarts": "^5.4.3",
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",

5
src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue

@ -59,7 +59,7 @@
// //
taxAmount:mainTaxAmount, taxAmount:mainTaxAmount,
// mainAdTaxAmount =+ // mainAdTaxAmount =+
adTaxAmount:(beforeTaxAmount+parseFloat(taxAmount)).toFixed(2) adTaxAmount:beforeTaxAmount+parseFloat(taxAmount)
}) })
} }
} }
@ -88,6 +88,7 @@
import { CustomerSaleInvoiceMain,CustomerSaleInvoiceMainRules,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceRequestMain.data' import { CustomerSaleInvoiceMain,CustomerSaleInvoiceMainRules,CustomerSaleInvoiceDetailRules,CustomerSaleInvoiceDetail} from './customerSaleInvoiceRequestMain.data'
import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
import * as CustomerStatementDetailApi from '@/api/wms/customerStatementDetail' import * as CustomerStatementDetailApi from '@/api/wms/customerStatementDetail'
import Decimal from "decimal.js"
// //
const emit = defineEmits([ const emit = defineEmits([
'buttonBaseClick','getList' 'buttonBaseClick','getList'
@ -281,7 +282,7 @@ const initTableDataPrice = ()=>{
tableData.value.forEach(item=>{ tableData.value.forEach(item=>{
item['sumPrice'] = (item['price'] + item['allocationPrice']).toFixed(5) item['sumPrice'] = (item['price'] + item['allocationPrice']).toFixed(5)
// *2 // *2
item['beforeTaxAmount'] = Number(item['sumPrice'])*item['qty'] item['beforeTaxAmount'] = Number(new Decimal(Number(item['sumPrice'])).mul(new Decimal(item['qty'])).toNumber().toFixed(2))
// taxAmount */100,2 // taxAmount */100,2
item['taxAmount'] = (item['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 // item['taxAmount'] = (item['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //

Loading…
Cancel
Save