feat: update 当前生产分支

zhongnanhuang
1 parent e1f00000
Showing 7 changed files with 92 additions and 72 deletions
.umirc.ts
src/pages/Invoice/constant.tsx
src/pages/Invoice/index.less
src/pages/Invoice/index.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/index.tsx
src/pages/OrderPrint/components/HoujiePrinter.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,66 +20,62 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'invoiceNumber',
     title: '发票号码',
     valueType: 'text',
-    width: 80,
   },
   {
     dataIndex: 'invoiceStatus',
     title: '发票类型',
     valueType: 'select',
-    width: 80,
   },
   {
     title: '状态',
     dataIndex: 'status',
     valueType: 'text',
-    width: 80,
   },
   {
     title: '购买方',
     dataIndex: 'purchaser',
     valueType: 'text',
-    width: 80,
   },
   {
     title: '收款单位',
     dataIndex: 'payee',
     valueType: 'text',
-    width: 80,
   },
   {
     title: '联系人',
     dataIndex: 'contacts',
     valueType: 'text',
-    width: 80,
   },
   {
     title: '销售',
     dataIndex: 'sale',
     valueType: 'text',
-    width: 80,
   },
   {
     title: '金额',
     dataIndex: 'money',
     valueType: 'money',
-    width: 80,
   },
   {
     title: '开票日期',
     dataIndex: 'invoicingTime',
     valueType: 'date',
-    width: 80,
   },
   {
     title: '收款时间',
     dataIndex: 'collectionTime',
     valueType: 'dateTime',
-    width: 80,
+  },
+  {
+    title: '备注',
+    dataIndex: 'notes',
+    valueType: 'text',
   },
   {
     title: '操作',
     valueType: 'option',
     key: 'option',
+    fixed: 'right',
     render: (text, record, _, action) => [
       <a
         key="editable"
@@ -103,3 +99,8 @@ export const INVOICE_COLUMNS = [
     ],
   },
 ];
+
+export const INVOICE_STATUS = {
+  UNVERIFIED: '未核销',
+  VERIFIED: '已核销',
+};
+.invoice-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 14px;
+}
-import { INVOICE_COLUMNS, InvoiceItem } from '@/pages/Invoice/constant';
+import { INVOICE_COLUMNS, INVOICE_STATUS } from '@/pages/Invoice/constant';
 import { postServiceInvoiceQueryInvoice } from '@/services';
+import { enumValueToLabel } from '@/utils';
 import { getUserInfo } from '@/utils/user';
-import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons';
+import { EllipsisOutlined } from '@ant-design/icons';
 import {
   ActionType,
   PageContainer,
@@ -10,13 +11,18 @@ import {
 import { history } from '@umijs/max';
 import { Avatar, Button, Dropdown, Tag } from 'antd';
 import { useRef } from 'react';
+import { INVOCING_STATUS, PAYEE_OPTIONS } from '../Order/constant';
+import './index.less';
 const userInfo = getUserInfo();
 const InvoicePage = () => {
   const actionRef = useRef<ActionType>();
+  // const [pageSize, setPageSize] = useState(10);
+  // const [currentPage, setCurrentPage] = useState(1);
   return (
     <>
       <PageContainer
+        className="invoice-index"
         header={{
           title: '发票管理',
           extra: [
@@ -51,11 +57,33 @@ const InvoicePage = () =&gt; {
           ],
         }}
       >
-        <ProTable<InvoiceItem>
-          scroll={{ x: true }}
-          columns={INVOICE_COLUMNS}
+        <ProTable
+          columns={INVOICE_COLUMNS.map((item) => {
+            let newItem = { ...item };
+            if (item.dataIndex === 'invoiceStatus') {
+              newItem.render = (text) => {
+                return enumValueToLabel(text.props.text, INVOCING_STATUS);
+              };
+            }
+
+            if (item.dataIndex === 'status') {
+              newItem.render = (text) => {
+                return enumValueToLabel(text, INVOICE_STATUS);
+              };
+            }
+
+            if (item.dataIndex === 'payee') {
+              newItem.render = (text) => {
+                return enumValueToLabel(text, PAYEE_OPTIONS);
+              };
+            }
+            return newItem;
+          })}
           actionRef={actionRef}
           cardBordered
+          pagination={{
+            pageSize: 10,
+          }}
           request={async (params) => {
             const res = await postServiceInvoiceQueryInvoice({
               data: { ...params },
@@ -98,24 +126,9 @@ const InvoicePage = () =&gt; {
               return values;
             },
           }}
-          pagination={{
-            pageSize: 5,
-            onChange: (page) => console.log(page),
-          }}
           dateFormatter="string"
           headerTitle="发票列表"
-          toolBarRender={() => [
-            <Button
-              key="button"
-              icon={<PlusOutlined />}
-              onClick={() => {
-                actionRef.current?.reload();
-              }}
-              type="primary"
-            >
-              新建
-            </Button>,
-          ]}
+          scroll={{ x: true }}
         />
       </PageContainer>
     </>
@@ -8,14 +8,13 @@ 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, PAYEE_OPTIONS } from '../constant';
+import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
 export default ({
   mainOrder,
@@ -142,31 +141,32 @@ export default ({
               label="收款时间"
               initialValue={subOrders[0]?.collectMoneyTime}
             />,
-            <ProFormText
-              width="lg"
-              key="invoiceNumber"
-              name="invoiceNumber"
-              label="发票号码"
-              initialValue={subOrders[0]?.invoiceNumber}
-            />,
-            <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: '金额必填' }]}
+            // />,
           ]
         : ''}
@@ -1058,8 +1058,8 @@ const OrderPage = () =&gt; {
                 type="link"
                 onClick={() => {
                   setSelectedRows([optRecord]);
-                  setOrderDrawerVisible(true);
-                  // setAfterSalesDrawerVisible(true);
+                  // setOrderDrawerVisible(true);
+                  setAfterSalesDrawerVisible(true);
                   setOrderRow(record);
                   setOrderOptType('after-sales');
                 }}
@@ -1931,8 +1931,8 @@ const OrderPage = () =&gt; {
                             return;
                           }
                         }
-                        setOrderDrawerVisible(true);
-                        // setAfterSalesDrawerVisible(true);
+                        // setOrderDrawerVisible(true);
+                        setAfterSalesDrawerVisible(true);
                         setOrderRow(record);
                         setOrderOptType('after-sales');
                       }}
@@ -66,15 +66,15 @@ export default ({ mainOrder, subOrders }) =&gt; {
             style={{ msoWidthSource: 'userset', msoWidthAlt: 1120 }}
           />
           <col
-            width="151.50"
+            width="91.50"
             style={{ msoWidthSource: 'userset', msoWidthAlt: 2464 }}
           />
           <col
-            width="169.50"
+            width="139.50"
             style={{ msoWidthSource: 'userset', msoWidthAlt: 3616 }}
           />
           <col
-            width="165"
+            width="135"
             style={{ msoWidthSource: 'userset', msoWidthAlt: 3520 }}
           />
           <col
@@ -85,7 +85,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
             width="60"
             style={{ msoWidthSource: 'userset', msoWidthAlt: 2432 }}
           />
-          <col width="108" style={{ width: '95.00pt' }} />
+          <col width="250" />
           <tr height="42" style={{ height: '21.00pt' }}>
             <td height="42" style={{ height: '21.00pt' }}></td>
             <td