diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 98488d09a..e680925dd 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -162,6 +162,12 @@ updateSort(schema.value) data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : '' }} + + + {{ + item.formatter(data[item.field]) + }} + {{ item.valueFilter(data[item.field]) }} {{ diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts index aa45d6b70..e4e5e9d9b 100644 --- a/src/types/descriptions.d.ts +++ b/src/types/descriptions.d.ts @@ -10,6 +10,7 @@ export interface DescriptionsSchema { labelClassName?: string dateFormat?: string // add by 星语:支持时间的格式化 valueFilter?: function // 展示的过滤函数 + formatter?: function // 展示的过滤函数 slotFilter?:boolean // 插槽自定义内容 dictType?: string // add by 星语:支持 dict 字典数据 sortDetailDefault?: string | number diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 7b65481c2..a01c78fde 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -400,25 +400,25 @@ @@ -449,7 +449,8 @@ import { PurchasePass, PurchasePassRules, SupplierinvoiceRequestDetailMain, - ClaimDetails + ClaimDetails, + accountantFormartDetail } from './supplierinvoiceRequestMain.data' import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain' import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail' diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 5734722c2..a96a11200 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1278,6 +1278,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, } ])) +export const accountantFormartDetail = ( cellValue) => { + if(!cellValue){ + return '' + } + cellValue = cellValue + '' || '' + cellValue = Number(cellValue).toFixed(2) + let x = cellValue.split('.') + let x1 = x[0] + let x2 = x.length > 1 ? '.' + x[1] : '' + const reg = /(\d+)(\d{3})/ + while(reg.test(x1)){ + x1 = x1.replace(reg, '$1,$2') + } + return x1+x2 +} /** * @returns {Array} 供应商发票在详情展示的主表字段 */ @@ -1345,6 +1360,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive