SCPtest供应商发票申请与供应商发票记录中，主数据查看列表样式改变

src/components/Descriptions/src/Descriptions.vue

@@ -127,6 +127,7 @@ const showAll = () =>{
             :label-align="labelAlign"
             :label-class-name="labelClassName"
             :width="width"
+            :span="item.span"
           >
             <template #label>
               <slot

src/components/Detail/src/Detail.vue

@@ -18,8 +18,8 @@
           :data="detailData"
           labelClassName="label-class-name"
           label-align="left"
-          direction="vertical"
+          :direction="direction"
-          :column="8"
+          :column="column"
           :schema="allSchemas.detailSchema"
           :columns="2"
           width="200px"
@@ -408,6 +408,16 @@ const props = defineProps({
     required: false,
     default: null
   },
+  direction:{
+    type: String,
+    required: false,
+    default: 'vertical'
+  },
+  column:{
+    type: Number,
+    required: false,
+    default: 8
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)

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

@@ -106,7 +106,9 @@
       hiddenDelete:true
     }"
     :isBasic="false"
-    :allSchemas="SupplierinvoiceRecordMain.allSchemas"
+    direction="horizontal"
+    :column="3"
+    :allSchemas="SupplierinvoiceRecordDetailMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
     :detailAllSchemasRules="SupplierinvoiceRecordDetailRules"
     :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage"
@@ -119,7 +121,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules } from './supplierinvoiceRecordMain.data'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data'
 import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
 import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'

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

@@ -755,7 +755,381 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   }
 ]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
 
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
   requestNumber: [

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

@@ -146,6 +146,8 @@
     :isOpenSearchTable="true"
     fieldTableColumn="poLine"
     :annexTable="detailAnnexTable"
+    direction="horizontal"
+    :column="3"
     :annexAlias="{
       hidden:true,
       label:t('ts.其他附件')
@@ -196,7 +198,7 @@
       })
     }"
     :isBasic="false" 
-    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
+    :allSchemas="SupplierinvoiceRequestDetailMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
     :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" 
     :searchTableParams="searchTableParams"
@@ -244,7 +246,8 @@ import dayjs from 'dayjs'
     SupplierinvoiceRequestFinance,
     SupplierinvoiceRequestFinanceRules,
     PurchasePass,
-    PurchasePassRules
+    PurchasePassRules,
+    SupplierinvoiceRequestDetailMain
   } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'

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

@@ -1042,7 +1042,381 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   }
 ]))
+/**
+ * @returns {Array} 供应商发票在详情展示的主表字段
+ */
+export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '汇总信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商信息',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: true,
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统价税合计',
+    field: 'afterTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '供应商创建日期',
+    field: 'supplierName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '订单类型',
+    field: 'orderType',
+    dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE,
+    dictClass: 'string',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '系统税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '发票号码',
+    field: 'goldenTaxInvoiceNumber',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '开票日期',
+    field: 'invoiceTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '采购价格审批时间',
+    field: 'procurementCreator',
+    sortTableDefault: 1003,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    sortTableDefault: 3,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价差通过说明',
+    field: 'balanceStatement',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计金额',
+    field: 'adTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
 
+  {
+    label: '财务审批人',
+    field: 'financialCreatorName',
+    sort: 'custom',
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税金额',
+    field: 'beforeTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '差额',
+    field: '',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务审批时间',
+    field: 'financialCreateTime',
+    formatter: dateFormatter,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '税额',
+    field: 'totalTaxAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '价税合计差额(价税合计-系统价税合计)',
+    field: 'totalTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '财务过账日期',
+    field: 'postingDate',
+    isTable: true,
+    sortTableDefault: 15,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+   
+  },
+  {
+    label: '折扣金额',
+    field: 'discountAmount1',
+    formatter: accountantFormart,
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '未税差额(未税金额-系统未税金额)',
+    field: 'beforeTaxDiffAmount',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+   
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+    detail:{
+      span:2
+    }
+  },
+  {
+    label: '税额差异',
+    field: 'taxAmountDiff',
+    formatter: accountantFormart,
+    
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+]))
 const singlePriceFormart = (row, column, cellValue) => {
   cellValue= Number(cellValue).toFixed(2)
   cellValue = cellValue + '' || ''