feat: update固定列调整

zhongnanhuang
1 parent ac326715
Showing 4 changed files with 48 additions and 36 deletions
.umirc.ts
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.tsx
src/pages/Order/components/FinancialDrawer.tsx
@@ -45,13 +45,13 @@ export default defineConfig({
       icon: 'LineChartOutlined',
       access: 'canReadAdmin',
     },
-    // {
-    //   name: '发票管理',
-    //   path: '/invoiceManage',
-    //   component: './Invoice',
-    //   icon: 'BookOutlined',
-    //   access: 'canReadAdmin',
-    // },
+    {
+      name: '发票管理',
+      path: '/invoiceManage',
+      component: './Invoice',
+      icon: 'BookOutlined',
+      access: 'canReadAdmin',
+    },
     {
       name: '打印',
       path: '/print',
@@ -20,62 +20,74 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'invoiceNumber',
     title: '发票号码',
     valueType: 'text',
+    width: 100,
   },
   {
     dataIndex: 'invoiceStatus',
     title: '发票类型',
     valueType: 'select',
+    width: 100,
   },
   {
     title: '状态',
     dataIndex: 'status',
     valueType: 'text',
+    width: 100,
   },
   {
     title: '购买方',
     dataIndex: 'purchaser',
     valueType: 'text',
+    width: 180,
   },
   {
     title: '收款单位',
     dataIndex: 'payee',
     valueType: 'text',
+    width: 180,
   },
   {
     title: '联系人',
     dataIndex: 'contacts',
     valueType: 'text',
+    width: 100,
   },
   {
     title: '销售',
     dataIndex: 'sale',
     valueType: 'text',
+    width: 100,
   },
   {
     title: '金额',
     dataIndex: 'money',
     valueType: 'money',
+    width: 100,
   },
   {
     title: '开票日期',
     dataIndex: 'invoicingTime',
     valueType: 'date',
+    width: 150,
   },
   {
     title: '收款时间',
     dataIndex: 'collectionTime',
     valueType: 'dateTime',
+    width: 200,
   },
   {
     title: '备注',
     dataIndex: 'notes',
     valueType: 'text',
+    width: 250,
   },
   {
     title: '操作',
     valueType: 'option',
     key: 'option',
     fixed: 'right',
+    width: 120,
     render: (text, record, _, action) => [
       <a
         key="editable"
@@ -15,10 +15,9 @@ import { INVOCING_STATUS, PAYEE_OPTIONS } from &#39;../Order/constant&#39;;
 import './index.less';
 const userInfo = getUserInfo();
+// const
 const InvoicePage = () => {
   const actionRef = useRef<ActionType>();
-  // const [pageSize, setPageSize] = useState(10);
-  // const [currentPage, setCurrentPage] = useState(1);
   return (
     <>
       <PageContainer
@@ -128,7 +127,7 @@ const InvoicePage = () =&gt; {
           }}
           dateFormatter="string"
           headerTitle="发票列表"
-          scroll={{ x: true }}
+          scroll={{ x: 1400, y: 420 }}
         />
       </PageContainer>
     </>
@@ -8,13 +8,14 @@ import { enumToSelect } from &#39;@/utils&#39;;
 import {
   DrawerForm,
   ProFormDatePicker,
+  ProFormDigit,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
 import { useEffect, useState } from 'react';
-import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
+import { INVOCING_STATUS_OPTIONS_OLD, PAYEE_OPTIONS } from '../constant';
 export default ({
   mainOrder,
@@ -141,32 +142,32 @@ export default ({
               label="收款时间"
               initialValue={subOrders[0]?.collectMoneyTime}
             />,
-            // <ProFormText
-            //   width="lg"
-            //   key="invoiceNumber"
-            //   name="invoiceNumber"
-            //   label="发票号码"
-            //   initialValue={subOrders[0]?.invoiceNumber}
-            //   rules={[{ required: true, message: '发票号码必填' }]}
-            // />,
-            // <ProFormSelect
-            //   key="payee"
-            //   placeholder="选择收款单位"
-            //   name="payee"
-            //   width="lg"
-            //   label="收款单位"
-            //   options={enumToSelect(PAYEE_OPTIONS)}
-            //   initialValue={subOrders[0]?.payee}
-            //   rules={[{ required: true, message: '收款单位必填' }]}
-            // />,
+            <ProFormText
+              width="lg"
+              key="invoiceNumber"
+              name="invoiceNumber"
+              label="发票号码"
+              initialValue={subOrders[0]?.invoiceNumber}
+              rules={[{ required: true, message: '发票号码必填' }]}
+            />,
+            <ProFormSelect
+              key="payee"
+              placeholder="选择收款单位"
+              name="payee"
+              width="lg"
+              label="收款单位"
+              options={enumToSelect(PAYEE_OPTIONS)}
+              initialValue={subOrders[0]?.payee}
+              rules={[{ required: true, message: '收款单位必填' }]}
+            />,
-            // <ProFormDigit
-            //   key="money"
-            //   name="money"
-            //   width="lg"
-            //   label="金额"
-            //   rules={[{ required: true, message: '金额必填' }]}
-            // />,
+            <ProFormDigit
+              key="money"
+              name="money"
+              width="lg"
+              label="金额"
+              rules={[{ required: true, message: '金额必填' }]}
+            />,
           ]
         : ''}