sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HL-5587 @王宇飞最新版本字段名称代码以及计算公式----N+1最新版本

hella_online_20240828
wangyufei 3 months ago
parent
9fe1d446ea
commit
d03a055fbb
3 changed files with 178 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 131
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  2. 104
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  3. 123
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

131
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
View File

@ -120,7 +120,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true isSearch: true
}, },
{ {
label: '未税差额', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -131,7 +131,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm:false isTableForm:false
}, },
{ {
label: '税额差异', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -142,7 +142,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm:false isTableForm:false
}, },
{ {
label: '价税合计差额', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -154,7 +154,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '系统税额', label: '供应商维护税额',
field: 'taxAmount', field: 'taxAmount',
formatter: accountantFormart, formatter: accountantFormart,
sort: 'custom', sort: 'custom',
@ -167,7 +167,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -178,7 +178,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm:false isTableForm:false
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -189,7 +189,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm:false isTableForm:false
}, },
{ {
label: '价税合计金额', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -226,12 +226,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sortTableDefault:5, sortTableDefault:5,
}, },
{ {
label: '系统价税合计',//税后金额 label: '供应商维护价税合计',//税后金额
field: 'afterTaxAmount', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:9, sortTableDefault:9,
form: { form: {
@ -261,12 +261,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '系统未税金额', label: '供应商维护未税金额',
field: 'amount', field: 'amount',
formatter: accountantFormart, formatter: accountantFormart,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:8, sortTableDefault:8,
form: { form: {
@ -836,7 +836,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '供应商信息', label: '供应商信息',
@ -845,7 +845,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: 'SCP系统数据', label: 'SCP系统数据',
@ -854,9 +854,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -880,10 +880,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '系统价税合计', label: '系统未税金额',
field: 'afterTaxAmount', field: 'purchaseAmountTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -893,7 +892,6 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
{ {
label: '财务凭证号', label: '财务凭证号',
field: 'voucherNumber', field: 'voucherNumber',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -912,10 +910,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '系统未税金额', label: '价差合计',
field: 'amount', field: 'differencePriceTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -948,9 +945,8 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '系统税额', label: '',
field: 'taxAmount', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -979,15 +975,23 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '系统采购价格', label: '',
field: 'purchaseAmountTotalMain', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
// {
// label: '尾差',
// field: 'totalDifference',
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: false,
// },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreatorName', field: 'procurementCreatorName',
@ -1011,9 +1015,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '总价差', label: '供应商维护价税合计',
field: 'differencePriceTotalMain', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1023,14 +1028,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
{ {
label: '采购价格审批时间', label: '采购价格审批时间',
field: 'procurementCreateTime', field: 'procurementCreateTime',
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sortTableDefault: 1003, sortTableDefault: 1003,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
}, },
{ {
label: '税率(%)', label: '税率(%)',
@ -1045,8 +1050,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
}, },
}, },
{ {
label: '', label: '供应商维护未税金额',
field: '', field: 'amount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1065,7 +1072,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1076,15 +1083,15 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '', label: '供应商维护税额',
field: '', field: 'taxAmount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{ {
label: '财务审批人', label: '财务审批人',
field: 'financialCreatorName', field: 'financialCreatorName',
@ -1097,7 +1104,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1108,29 +1115,29 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '尾差', label: '',
field: 'totalDifference', field: '',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务审批时间', label: '财务审批时间',
field: 'financialCreateTime', field: 'financialCreateTime',
formatter: dateFormatter, formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1141,15 +1148,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计差额(价税合计-系统价税合计)', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务过账日期', label: '财务过账日期',
@ -1174,7 +1180,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '未税差额(未税金额-系统未税金额)', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1182,13 +1188,13 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1209,7 +1215,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isDetail: true, isDetail: true,
}, },
{ {
label: '税额差异（税额-系统税额）', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
@ -1217,21 +1223,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
// {
// label: '创建时间',
// field: 'createTime',
// formatter: dateFormatter,
// sortTableDefault:1000,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: true,
// }
])) ]))
//表单校验 //表单校验
export const SupplierinvoiceRecordMainRules = reactive({ export const SupplierinvoiceRecordMainRules = reactive({

104
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
View File

@ -251,11 +251,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isForm: false, isForm: false,
}, },
{ {
label: '系统未税金额', label: '供应商维护未税金额',
field: 'amount', field: 'amount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:8, sortTableDefault:8,
form: { form: {
@ -306,7 +306,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// isTableForm:false // isTableForm:false
// }, // },
// { // {
// label: '价税合计金额', // label: '发票价税合计',
// field: 'adTaxAmount', // field: 'adTaxAmount',
// formatter: accountantFormart, // formatter: accountantFormart,
// table: { // table: {
@ -317,7 +317,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// isTableForm:false // isTableForm:false
// }, // },
{ {
label: '系统税额', label: '供应商维护税额',
field: 'taxAmount', field: 'taxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -337,11 +337,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
{ {
label: '系统价税合计', label: '供应商维护价税合计',
field: 'afterTaxAmount', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:7, sortTableDefault:7,
form: { form: {
@ -442,7 +442,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -459,7 +459,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -476,7 +476,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '价税合计金额', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -519,7 +519,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
sortTableDefault:5, sortTableDefault:5,
}, },
{ {
label: '未税差额', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -536,7 +536,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '税额差异', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -553,7 +553,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '价税合计差额', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -1132,7 +1132,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '供应商信息', label: '供应商信息',
@ -1141,7 +1141,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: 'SCP系统数据', label: 'SCP系统数据',
@ -1150,9 +1150,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -1176,10 +1176,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统价税合计', label: '系统未税金额',
field: 'afterTaxAmount', field: 'purchaseAmountTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1207,10 +1206,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统未税金额', label: '价差合计',
field: 'amount', field: 'differencePriceTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1243,9 +1241,8 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统税额', label: '',
field: 'taxAmount', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1274,15 +1271,23 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统采购价格', label: '',
field: 'purchaseAmountTotalMain', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
// {
// label: '尾差',
// field: 'totalDifference',
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: false,
// },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreatorName', field: 'procurementCreatorName',
@ -1306,9 +1311,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '总价差', label: '供应商维护价税合计',
field: 'differencePriceTotalMain', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1340,8 +1346,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
}, },
}, },
{ {
label: '', label: '供应商维护未税金额',
field: '', field: 'amount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1360,7 +1368,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1371,15 +1379,15 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '', label: '供应商维护税额',
field: '', field: 'taxAmount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{ {
label: '财务审批人', label: '财务审批人',
field: 'financialCreatorName', field: 'financialCreatorName',
@ -1392,7 +1400,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1403,13 +1411,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '尾差', label: '',
field: 'totalDifference', field: '',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务审批时间', label: '财务审批时间',
@ -1425,7 +1433,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1436,15 +1444,14 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计差额(价税合计-系统价税合计)', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务过账日期', label: '财务过账日期',
@ -1469,7 +1476,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '未税差额(未税金额-系统未税金额)', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1477,8 +1484,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -1503,7 +1511,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '税额差异（税额-系统税额）', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
@ -1511,7 +1519,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },

123
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
View File

@ -242,11 +242,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isForm: false, isForm: false,
}, },
{ {
label: '系统未税金额', label: '供应商维护未税金额',
field: 'amount', field: 'amount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:8, sortTableDefault:8,
form: { form: {
@ -286,7 +286,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// isTableForm:false // isTableForm:false
// }, // },
// { // {
// label: '税额', // label: '发票税额',
// field: 'totalTaxAmount', // field: 'totalTaxAmount',
// formatter: accountantFormart, // formatter: accountantFormart,
// table: { // table: {
@ -297,7 +297,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// isTableForm:false // isTableForm:false
// }, // },
// { // {
// label: '价税合计金额', // label: '发票价税合计',
// field: 'adTaxAmount', // field: 'adTaxAmount',
// formatter: accountantFormart, // formatter: accountantFormart,
// table: { // table: {
@ -308,7 +308,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
// isTableForm:false // isTableForm:false
// }, // },
{ {
label: '系统税额', label: '供应商维护税额',
field: 'taxAmount', field: 'taxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -328,11 +328,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
{ {
label: '系统价税合计', label: '供应商维护价税合计',
field: 'afterTaxAmount', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
width: 150 width: 160
}, },
sortTableDefault:7, sortTableDefault:7,
form: { form: {
@ -433,7 +433,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -450,7 +450,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -467,7 +467,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '价税合计金额', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -510,7 +510,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
sortTableDefault:5, sortTableDefault:5,
}, },
{ {
label: '未税差额', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -527,7 +527,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '税额差异', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -544,7 +544,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isTableForm:false, isTableForm:false,
}, },
{ {
label: '价税合计差额', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
table: { table: {
@ -1146,7 +1146,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '供应商信息', label: '供应商信息',
@ -1155,7 +1155,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: 'SCP系统数据', label: 'SCP系统数据',
@ -1164,9 +1164,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isSearch: false, isSearch: false,
isTable: false, isTable: false,
isDetail: true, isDetail: false,
}, },
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -1190,10 +1190,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统价税合计', label: '系统未税金额',
field: 'afterTaxAmount', field: 'purchaseAmountTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1203,7 +1202,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
{ {
label: '财务凭证号', label: '财务凭证号',
field: 'voucherNumber', field: 'voucherNumber',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1214,6 +1212,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
label: '供应商名称', label: '供应商名称',
field: 'supplierName', field: 'supplierName',
sort: 'custom', sort: 'custom',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1221,10 +1220,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统未税金额', label: '价差合计',
field: 'amount', field: 'differencePriceTotalMain',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1257,9 +1255,8 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统税额', label: '',
field: 'taxAmount', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1288,15 +1285,23 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '系统采购价格', label: '',
field: 'purchaseAmountTotalMain', field: '',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
// {
// label: '尾差',
// field: 'totalDifference',
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: false,
// },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreatorName', field: 'procurementCreatorName',
@ -1320,9 +1325,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '总价差', label: '供应商维护价税合计',
field: 'differencePriceTotalMain', field: 'afterTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1354,8 +1360,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
}, },
}, },
{ {
label: '', label: '供应商维护未税金额',
field: '', field: 'amount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1374,7 +1382,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计', label: '发票价税合计',
field: 'adTaxAmount', field: 'adTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1385,15 +1393,15 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '', label: '供应商维护税额',
field: '', field: 'taxAmount',
formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{ {
label: '财务审批人', label: '财务审批人',
field: 'financialCreatorName', field: 'financialCreatorName',
@ -1406,7 +1414,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '未税金额', label: '发票未税金额',
field: 'beforeTaxAmount', field: 'beforeTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1417,13 +1425,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '尾差', label: '',
field: 'totalDifference', field: '',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务审批时间', label: '财务审批时间',
@ -1439,7 +1447,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '税额', label: '发票税额',
field: 'totalTaxAmount', field: 'totalTaxAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1450,15 +1458,14 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '价税合计差额(价税合计-系统价税合计)', label: '价税合计尾差',
field: 'totalTaxDiffAmount', field: 'totalTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '财务过账日期', label: '财务过账日期',
@ -1483,7 +1490,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '未税差额(未税金额-系统未税金额)', label: '未税尾差',
field: 'beforeTaxDiffAmount', field: 'beforeTaxDiffAmount',
formatter: accountantFormart, formatter: accountantFormart,
@ -1491,13 +1498,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1518,7 +1525,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isDetail: true, isDetail: true,
}, },
{ {
label: '税额差异（税额-系统税额）', label: '税额尾差',
field: 'taxAmountDiff', field: 'taxAmountDiff',
formatter: accountantFormart, formatter: accountantFormart,
@ -1526,21 +1533,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: false, isDetail: true,
}, },
// {
// label: '创建时间',
// field: 'createTime',
// formatter: dateFormatter,
// sortTableDefault:1000,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: true,
// },
])) ]))
const singlePriceFormart = (row, column, cellValue) => { const singlePriceFormart = (row, column, cellValue) => {

Write Preview
Loading…
Cancel
Save