Browse Source

YT-1572销售开票金额,明细税额、含税金额,应保留2位小数

intex_20241211
张立 2 months ago
parent
commit
816358b165
  1. 31
      src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue
  2. 1
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  3. 35
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

31
src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue

@ -57,21 +57,8 @@
:detailButtonIsShowDelete="false" :detailButtonIsShowDelete="false"
:detailButtonIsShowAdd="false" :detailButtonIsShowAdd="false"
:otherHeadButttonData = "[defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-request-main:export` })]" :otherHeadButttonData = "[defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-request-main:export` })]"
:sumFormDataByForm=" @detailBasicFormOnChange="detailBasicFormOnChange"
(formRef, formModel) => {console.log('formModel====',formModel)
const { beforeTaxAmount = 0, taxAmount = 0 , qty=0,price,allocationPrice,taxRate=1} = formModel
formRef.value.setValues({
// = +,2
afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)),
// /-
allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)),
// = +
sumPrice:Number(Number(price)+Number(allocationPrice)),
// taxAmount */100,2
taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //
})
}
"
@buttonBaseClick="detailButtonBaseClick" @buttonBaseClick="detailButtonBaseClick"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
> >
@ -356,6 +343,20 @@ const onSearchChange = (field, value)=>{
} }
} }
} }
const detailBasicFormOnChange = (field, cur, formRef1) => {
console.log( formRef1.value.formModel)
const { beforeTaxAmount = 0, taxAmount = 0, qty = 0, price, allocationPrice, taxRate = 1 } = formRef1.value.formModel
formRef1.value.setValues({
// = +,2
afterTaxAmount: Number((Number(beforeTaxAmount) + Number(taxAmount)).toFixed(2)),
// /-
allocationPrice: Number(Number(Number(beforeTaxAmount)/Number(qty)) - Number(price)),
// = +
sumPrice:Number(Number(price)+Number(allocationPrice)),
// taxAmount */100,2
taxAmount: Number((Number(beforeTaxAmount) * Number(taxRate)))/100 //
})
}
const searchClick = async (data)=>{ const searchClick = async (data)=>{
console.log('查询',data) console.log('查询',data)
setSearchParams({...data,customerCode:data.customerCode.filter(item=>item!='ALL'),status:data.status.filter(item=>item!='')}) setSearchParams({...data,customerCode:data.customerCode.filter(item=>item!='ALL'),status:data.status.filter(item=>item!='')})

1
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -581,7 +581,6 @@ const buttonTableClick = async (val, row) => {
// //
// dialogVisible.value = true // dialogVisible.value = true
formLabelRef.value.open('create', row) formLabelRef.value.open('create', row)
tableObject.loading = false
detatableData.tableList.map((item) => { detatableData.tableList.map((item) => {
// 线 // 线
ItembasicApi.getItembasicPage({ ItembasicApi.getItembasicPage({

35
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -445,6 +445,8 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'cjbq') { // } else if (val == 'cjbq') { //
// //
tableObject.loading = true
try {
let isCreateLabel = false let isCreateLabel = false
await PackageApi.getPackagePage({ await PackageApi.getPackagePage({
requestNumber: row.number requestNumber: row.number
@ -524,7 +526,9 @@ const buttonTableClick = async (val, row) => {
} }
}) })
}) })
}finally {
tableObject.loading = false
}
} else if (val == 'mainHandle') { // } else if (val == 'mainHandle') { //
tableObject.loading = true tableObject.loading = true
// //
@ -725,22 +729,21 @@ const submitFormLabel = async (formType, submitData) => {
if(data.masterId){ if(data.masterId){
data.id = data.masterId data.id = data.masterId
} }
try {
console.log("aaaaa",data); formLabelRef.value.formLoading = true
data.subList=detatableData.tableList data.subList=detatableData.tableList
console.log("bbbbb",data); await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => { isCreateLabel.value = true
isCreateLabel.value = true message.success('创建标签成功')
message.success('创建标签成功')
}).catch(err => {
isCreateLabel.value = false
console.log(err)
message.error('创建标签失败')
})
} finally {
formLabelRef.value.formLoading = false formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false formLabelRef.value.dialogVisible = false
} }).catch(err => {
isCreateLabel.value = false
console.log(err)
formLabelRef.value.formLoading = false
message.error('创建标签失败')
})
} }
// Bom // Bom
@ -815,7 +818,7 @@ const labelPrint = async (row) => {
// //
const { getList:getListPrint } = tableMethods const { getList:getListPrint } = tableMethods
getListPrint() await getListPrint()
tableObject.loading = false tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns
tableColumns.forEach((item) => { tableColumns.forEach((item) => {

Loading…
Cancel
Save