fix: 采购订单部分样式

src/pages/transaction/components/paymentInfoCard/index.tsx

@@ -20,7 +20,7 @@ const PaymentInfoCard: React.FC<PaymentInfoCardProps> = (props) => {
   const { currencyTypeName, paymentTypeName, ...rest } = props;
   return (
     <CustomizeColumn
-      title="付款方式"
+      title="付款信息"
       column={2}
       data={[
         {

src/pages/transaction/purchaseOrder/orderCollectSrm/components/requisitionModalTable/index.tsx

@@ -37,6 +37,16 @@ const RequisitionModalTable:React.FC<ContractModalTableProps> = (props) => {
     }
   }
 
+  /** 弹窗内 表格组件 参数 */
+  const standardTableProps = {
+    columns: requisitionColumns,
+    fetchTableData,
+    tableProps: {
+      rowKey: 'requisitionId',
+      scroll: { x: 1200 },
+    }
+  }
+
   useEffect(() => {
     if (currentRef) {
       currentRef.current = {
@@ -49,20 +59,18 @@ const RequisitionModalTable:React.FC<ContractModalTableProps> = (props) => {
 
   return (
     <ModalTable
-      modalTitle={ intl.formatMessage({ id: 'transaction_components.guanlianqinggoudan' }) }
+      modalTitle={ intl.formatMessage({
+        id: 'transaction_components.guanlianqinggoudan',
+        defaultMessage: '关联请购单',
+      }) }
       width={ 900 }
-      columns={ requisitionColumns }
       visible={ visible }
       cancel={ () => setVisible(false) }
-      fetchTableData={ fetchTableData }
-      tableProps={{
-        rowKey: 'requisitionId',
-        scroll: { x: 1200 }
-      }}
       resetModal={{
         destroyOnClose: true,
         footer: null
       }}
+      { ...standardTableProps }
       { ...restProps }
     />
   )

src/pages/transaction/purchaseOrder/orderCollectSrm/constant/index.tsx

@@ -251,45 +251,38 @@ export const materialInfoColumns: any[] = [
   {
     title: 'ID',
     dataIndex: 'id',
-
     key: 'id',
     className: 'commonHide'
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.code'}),
     dataIndex: 'code',
-
     key: 'code',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.name1'}),
     dataIndex: 'name',
-
     key: 'name',
     render: (t, r) => `${t}/${r.type}`
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.category'}),
     dataIndex: 'category',
-
     key: 'category',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.brand'}),
     dataIndex: 'brand',
-
     key: 'brand',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.unit'}),
     dataIndex: 'unit',
-
     key: 'unit',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.relevanceProductId'}),
     dataIndex: 'relevanceProductId',
-
     key: 'relevanceProductId',
     render: (t, r) => t ? `${t}/${r.relevanceProductName || ''}/${r.relevanceProductType || ''}/${r.relevanceProductCategory || ''}/${r.relevanceProductBrand || ''}` : ''
   },
@@ -303,7 +296,6 @@ export const materialInfoColumns: any[] = [
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.quantity'}),
     dataIndex: 'quantity',
-
     key: 'quantity',
     formItem: 'input',
     editable: true,
@@ -312,21 +304,18 @@ export const materialInfoColumns: any[] = [
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.taxInclusive'}),
     dataIndex: 'tax',
-
     key: 'tax',
     render: (t, r) => t ? getIntl().formatMessage({id: 'purchaseOrder.yes'}) : getIntl().formatMessage({id: 'purchaseOrder.no'})
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.taxRate'}),
     dataIndex: 'taxRate',
-
     key: 'taxRate',
     render: (t, r) => t ? `${t}%` : null
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.readyAddOrder.productInfoColumns.price'}),
     dataIndex: 'amount',
-
     key: 'amount',
     render: (t, r) => t ? `${Number(t).toFixed(2)}` : null
   },
@@ -334,7 +323,6 @@ export const materialInfoColumns: any[] = [
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.logistics'}),
     dataIndex: 'logistics',
-
     key: 'logistics',
     formItem: 'select',
     editable: true,
@@ -352,45 +340,38 @@ export const materialInfoColumnsByRequisition: any[] = [
   {
     title: 'ID',
     dataIndex: 'id',
-    align: 'center',
     key: 'id',
     className: 'commonHide'
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.code'}),
     dataIndex: 'code',
-    align: 'center',
     key: 'code',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.name1'}),
     dataIndex: 'name',
-    align: 'center',
     key: 'name',
     render: (t, r) => `${t}/${r.type}`
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.category'}),
     dataIndex: 'category',
-    align: 'center',
     key: 'category',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.brand'}),
     dataIndex: 'brand',
-    align: 'center',
     key: 'brand',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.unit'}),
     dataIndex: 'unit',
-    align: 'center',
     key: 'unit',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.relevanceProductId'}),
     dataIndex: 'relevanceProductId',
-    align: 'center',
     key: 'relevanceProductId',
     render: (t, r) => t ? `${t}/${r.relevanceProductName || ''}/${r.relevanceProductType || ''}/${r.relevanceProductCategory || ''}/${r.relevanceProductBrand || ''}` : ''
   },
@@ -404,27 +385,23 @@ export const materialInfoColumnsByRequisition: any[] = [
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.quantity'}),
     dataIndex: 'quantity',
-    align: 'center',
     key: 'quantity',
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.taxInclusive'}),
     dataIndex: 'tax',
-    align: 'center',
     key: 'tax',
     render: (t, r) => t ? getIntl().formatMessage({id: 'purchaseOrder.yes'}) : getIntl().formatMessage({id: 'purchaseOrder.no'})
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.taxRate'}),
     dataIndex: 'taxRate',
-    align: 'center',
     key: 'taxRate',
     render: (t, r) => t ? `${t}%` : null
   },
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.readyAddOrder.productInfoColumns.price'}),
     dataIndex: 'amount',
-    align: 'center',
     key: 'amount',
     render: (t, r) => t ? `${Number(t).toFixed(2)}` : null
   },
@@ -432,7 +409,6 @@ export const materialInfoColumnsByRequisition: any[] = [
   {
     title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.constant.logistics'}),
     dataIndex: 'logistics',
-    align: 'center',
     key: 'logistics',
     formItem: 'select',
     editable: true,
@@ -440,13 +416,11 @@ export const materialInfoColumnsByRequisition: any[] = [
   {
     title: '关联单据',
     dataIndex: 'relative',
-    align: 'center',
     key: 'relative',
   },
   {
     title: '备注',
     dataIndex: 'remark',
-    align: 'center',
     key: 'remark',
     formItem: 'input',
     editable: true,

src/pages/transaction/purchaseOrder/orderCollectSrm/schema/index.ts

@@ -310,6 +310,7 @@ export const orderMaterials: ISchema = {
         columns: "{{materialColumns}}",
         components: "{{materialComponents}}",
         prefix: "{{materialAddButton}}",
+        scroll: { x: 1200 },
       },
     },
     // 仅合同下单时备用参数数据