Browse Source

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

hella_online_20240906
zhaoxuebing 2 months ago
parent
commit
761a61cad4
  1. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  2. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
  3. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  4. 9
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  5. 19
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  6. 47
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  7. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
  8. 9
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

5
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -122,7 +122,10 @@ const { tableObject, tableMethods } = useTable({
//
const { getList, setSearchParams } = tableMethods
watch(()=>tableObject.currentPage,async ()=>{
tableObjectHead.currentPage = tableObject.currentPage
updateDateTableColumns()
})
//
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), //

5
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue

@ -130,7 +130,10 @@ const { tableObject, tableMethods } = useTable({
//
const { getList, setSearchParams } = tableMethods
watch(()=>tableObject.currentPage,async ()=>{
tableObjectHead.currentPage = tableObject.currentPage
updateDateTableColumns()
})
//
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), //

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@ -138,6 +138,18 @@
:apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
@buttonBaseClick="detailButtonBaseClick"
>
<!-- 价税合计尾差 -->
<template #Descriptions_totalTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
</template>
<!-- 未税尾差 -->
<template #Descriptions_beforeTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
</template>
<!-- 税额尾差 -->
<template #Descriptions_taxAmountDiff="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
</template>
<template #differencePrice="{row}">
<span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
</template>

9
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -1218,6 +1218,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
label: '财务过账日期',
@ -1251,6 +1254,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
label: '回转凭证号',
@ -1277,6 +1283,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{

19
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -86,7 +86,8 @@
totalTaxAmount = 0,
discountAmount1 = 0,
beforeTaxDiffAmount = 0,
taxAmountDiff = 0
taxAmountDiff = 0,
rebateTax=0
} = formModel
// 2X*2
if (formType == 'update') {
@ -131,7 +132,9 @@
adTaxAmount: beforeTaxAmount + totalTaxAmount, //6+
beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //--
taxAmountDiff: totalTaxAmount - taxAmount, // -
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff // =+
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // =+
rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
rebateTotal:rebateTax+discountAmount1
})
}
}
@ -309,6 +312,18 @@
@searchTableSuccessDetail="searchTableSuccessDetail"
@handleMainFefresh="handleMainFefresh"
>
<!-- 价税合计尾差 -->
<template #Descriptions_totalTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
</template>
<!-- 未税尾差 -->
<template #Descriptions_beforeTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
</template>
<!-- 税额尾差 -->
<template #Descriptions_taxAmountDiff="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
</template>
<template #differencePrice="{ row }">
<span :class="{ 'red-text': row.differencePrice != 0 }">{{ row.differencePrice }}</span>
</template>

47
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -434,7 +434,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// }
// },
{
label: '折扣金额',
label: '返利未税金额',
field: 'discountAmount1',
formatter: accountantFormart,
table: {
@ -470,6 +470,40 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
},
isTableForm:false,
},
{
label: '返利税额',
field: 'rebateTax',
formatter: accountantFormart,
table: {
width: 150
},
sortTableDefault:4,
form: {
component: 'InputNumber',
componentProps: {
precision: 2,
disabled: true,
}
},
isTableForm:false,
},
{
label: '返利价税合计',
field: 'rebateTotal',
formatter: accountantFormart,
table: {
width: 150
},
sortTableDefault:4,
form: {
component: 'InputNumber',
componentProps: {
precision: 2,
disabled: true,
}
},
isTableForm:false,
},
{
label: '发票税额',
field: 'totalTaxAmount',
@ -579,7 +613,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
precision: 2,
disabled: true,
}
},
}
},
// {
@ -1473,6 +1507,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
label: '财务过账日期',
@ -1506,6 +1543,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
@ -1541,6 +1581,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue

@ -120,6 +120,18 @@
@searchTableSuccessDetail="searchTableSuccessDetail"
@handleMainFefresh="handleMainFefresh"
>
<!-- 价税合计尾差 -->
<template #Descriptions_totalTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
</template>
<!-- 未税尾差 -->
<template #Descriptions_beforeTaxDiffAmount="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
</template>
<!-- 税额尾差 -->
<template #Descriptions_taxAmountDiff="{ row }">
<span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
</template>
<template #differencePrice="{row}">
<span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
</template>

9
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@ -1489,6 +1489,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
label: '财务过账日期',
@ -1522,6 +1525,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},
{
label: '参考凭证描述',
@ -1556,6 +1562,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isTable: false,
isSearch: false,
isDetail: true,
detail:{
slotFilter: true
}
},

Loading…
Cancel
Save