Browse Source

HL-5861供应商发票申请及发票记录和价差查看界面的修改

hella_online_20240911
yufei_wang 2 months ago
parent
commit
363892e07b
  1. 1
      src/components/Descriptions/src/Descriptions.vue
  2. 6
      src/components/Detail/src/Detail.vue
  3. 1
      src/types/descriptions.d.ts
  4. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  5. 9
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  6. 19
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  7. 47
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  8. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
  9. 9
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

1
src/components/Descriptions/src/Descriptions.vue

@ -151,6 +151,7 @@ const showAll = () =>{
item.valueFilter(data[item.field])
}}</span>
</slot>
<slot v-else-if="item.slotFilter" :name="'Descriptions_'+item.field" :row="data">{{ data[item.field] }}</slot>
<slot v-else-if="item.dictType">
<div v-if="data[item.field]&&Array.isArray(data[item.field])" >
<DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>

6
src/components/Detail/src/Detail.vue

@ -23,7 +23,11 @@
:schema="allSchemas.detailSchema"
:columns="2"
width="200px"
/>
>
<template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
<slot :name="name" :row="row"></slot>
</template>
</Descriptions>
</ContentWrap>
<div class="flex">
<!-- 详情 -->

1
src/types/descriptions.d.ts

@ -10,5 +10,6 @@ export interface DescriptionsSchema {
labelClassName?: string
dateFormat?: string // add by 星语:支持时间的格式化
valueFilter?: function // 展示的过滤函数
slotFilter?:boolean // 插槽自定义内容
dictType?: string // add by 星语:支持 dict 字典数据
}

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