chore: 为发票和银行流水页面添加导出按钮

在发票和银行流水页面添加了导出按钮，该按钮允许用户选择所需的数据并将其导出为Excel文件。使用了messageApi来显示导出过程的加载状态。增加了optionRender属性来在搜索配置中添加导出按钮，并确保按钮位于搜索区域的右侧。服务端点和文件： - 在`index.tsx`文件的Invoice页面中添加了导出功能。 - 在`index.tsx`文件的InvoiceVerification页面中添加了导出功能。 - 更新了`definition.ts`文件，对现有的类型定义没有做出修改，保持了一致性。与订单状态和流水号相关的配置。权限管理与页面加载优化 - 更新了发票和银行流水页面的权限控制逻辑，现在基于用户权限动态渲染操作按钮。 - 重构了分页设置，采用了更灵活的分页选项配置。 -优化了核销逻辑的判断条件，提高了代码的可读性。- 在发票和银行流水页面的组件中应用了新的权限检查机制。 - 调整了数据请求逻辑，以更好地处理分页和权限数据。另外，调整了路由配置，扩展了相关页面的访问权限，以适应更多用户角色。 BREAKING CHANGE: 动态权限控制逻辑的更新可能会影响依赖于之前静态按钮配置的代码。请检查相关组件以确保兼容性。

chore: 为发票和银行流水页面添加导出按钮
在发票和银行流水页面添加了导出按钮，该按钮允许用户选择所需的数据并将其导出为Excel文件。使用了messageApi来显示导出过程的加载状态。增加了optionRender属性来在搜索配置中添加导出按钮，并确保按钮位于搜索区域的右侧。服务端点和文件： - 在`index.tsx`文件的Invoice页面中添加了导出功能。 - 在`index.tsx`文件的InvoiceVerification页面中添加了导出功能。 - 更新了`definition.ts`文件，对现有的类型定义没有做出修改，保持了一致性。与订单状态和流水号相关的配置。权限管理与页面加载优化 - 更新了发票和银行流水页面的权限控制逻辑，现在基于用户权限动态渲染操作按钮。 - 重构了分页设置，采用了更灵活的分页选项配置。 -优化了核销逻辑的判断条件，提高了代码的可读性。- 在发票和银行流水页面的组件中应用了新的权限检查机制。 - 调整了数据请求逻辑，以更好地处理分页和权限数据。另外，调整了路由配置，扩展了相关页面的访问权限，以适应更多用户角色。 BREAKING CHANGE: 动态权限控制逻辑的更新可能会影响依赖于之前静态按钮配置的代码。请检查相关组件以确保兼容性。
曾国涛
1 parent 3fcc4455
Showing 7 changed files with 109 additions and 31 deletions
.umirc.ts
src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx
src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/constant.tsx
@@ -75,14 +75,14 @@ export default defineConfig({
           name: '发票核销',
           path: 'invoice',
           icon: 'BookOutlined',
-          access: 'canReadAdminAndFinance',
+          access: 'canReadAdminAndFinanceAndSales',
           component: './Invoice/Invoice',
         },
         {
           name: '银行流水',
           path: 'invoiceVerification',
           icon: 'BookOutlined',
-          access: 'canReadAdminAndFinance',
+          access: 'canReadAdminAndFinanceAndSales',
           component: './Invoice/InvoiceVerification',
         },
         {
@@ -24,6 +24,11 @@ export default ({ getRows, onFinish }) =&gt; {
       dataIndex: 'serialNumber',
     },
     {
+      title: '流水号',
+      hideInTable: true,
+      dataIndex: 'serialNumber',
+    },
+    {
       title: '收款时间',
       dataIndex: 'collectionDatetime',
       hideInSearch: true,
@@ -20,7 +20,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
   const [bankChooseModalVisible, setBankChooseModalVisible] = useState(false);
   const [invoiceInfo, setInvoiceInfo] = useState({});
   const [relationOrderIds, setRelationOrderIds] = useState([]);
-  const [setRelationBankStatements] = useState([]);
   const actionRef = useRef<ActionType>();
  
   const loadInvoiceData = async () => {
@@ -31,7 +30,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       setInvoiceInfo(res.data);
       setRelationOrderIds(res.data.mainOrderIds);
       console.log('bs:' + res.data.bankStatementDtos);
-      setRelationBankStatements(res.data.bankStatementDtos);
     }
   };
  
@@ -117,6 +115,18 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     },
     {
       key: '11',
+      label: '订单类型',
+      children: invoiceInfo?.orderTypeText,
+      span: 12,
+    },
+    {
+      key: '12',
+      label: '绑定流水号',
+      children: invoiceInfo?.serialNumbersTextByOrder,
+      span: 12,
+    },
+    {
+      key: '13',
       label: '备注',
       children: invoiceInfo?.notes,
       span: 24,
@@ -30,24 +30,29 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
       {
         title: '发票号码',
         dataIndex: 'invoiceNumber',
+        ellipsis: true,
       },
       {
         title: '收款方',
         dataIndex: 'payeeText',
+        ellipsis: true,
       },
       {
         title: '付款方',
         dataIndex: 'purchaser',
+        ellipsis: true,
       },
       {
         title: '金额',
         dataIndex: 'money',
         valueType: 'money',
+        ellipsis: true,
       },
       {
         title: '日期',
         dataIndex: 'invoicingTime',
         valueType: 'date',
+        ellipsis: true,
       },
     ];
     if (!readOnly) {
@@ -84,24 +89,29 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
       {
         title: '流水号',
         dataIndex: 'serialNumber',
+        ellipsis: true,
       },
       {
         title: '收款方',
         dataIndex: 'payeeText',
+        ellipsis: true,
       },
       {
         title: '付款方',
         dataIndex: 'payer',
+        ellipsis: true,
       },
       {
         title: '金额',
         dataIndex: 'amount',
         valueType: 'money',
+        ellipsis: true,
       },
       {
         title: '日期',
         dataIndex: 'collectionDatetime',
         valueType: 'date',
+        ellipsis: true,
       },
     ];
     columns.push({
@@ -24,6 +24,7 @@ const InvoiceRecord = () =&gt; {
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
   const [invoiceId, setInvoiceId] = useState(undefined);
+  const [perms, setPerms] = useState([]);
   const [messageApi, contextHolder] = message.useMessage();
   const reloadInvoiceTable = () => {
     invoiceActionRef.current?.reload();
@@ -101,7 +102,7 @@ const InvoiceRecord = () =&gt; {
       width: 160,
       render: (text, record) => {
         let btns = [];
-        if (!record.writeOffId) {
+        if (record.paths?.includes('writeOff') && !record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
               getData={() => {
@@ -120,7 +121,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
  
-        if (record.writeOffId) {
+        if (record.paths?.includes('writeOff') && record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
               getData={async () => {
@@ -192,13 +193,14 @@ const InvoiceRecord = () =&gt; {
         actionRef={invoiceActionRef}
         cardBordered
         pagination={{
-          pageSize: 10,
+          pageSizeOptions: ['10', '20', '50', '100'],
         }}
         request={async (params) => {
           const res = await postServiceInvoiceQueryInvoice({
             data: { ...params },
           });
           if (res) {
+            setPerms(res?.data?.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
@@ -254,18 +256,26 @@ const InvoiceRecord = () =&gt; {
         headerTitle="发票列表"
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
-          <AddInvoiceDrawerForm
-            onClose={() => {
-              invoiceActionRef.current?.reload();
-            }}
-            key="add"
-          ></AddInvoiceDrawerForm>,
-          <InvoiceWriteOffModal
-            readOnly={false}
-            getData={() => ({})}
-            key="writeOff"
-            triggerButton={<Button type="primary">核销</Button>}
-          />,
+          <>
+            {perms.includes('add') && (
+              <AddInvoiceDrawerForm
+                onClose={() => {
+                  invoiceActionRef.current?.reload();
+                }}
+                key="add"
+              ></AddInvoiceDrawerForm>
+            )}
+          </>,
+          <>
+            {perms.includes('writeOff') && (
+              <InvoiceWriteOffModal
+                readOnly={false}
+                getData={() => ({})}
+                key="writeOff"
+                triggerButton={<Button type="primary">核销</Button>}
+              />
+            )}
+          </>,
         ]}
       />
  
@@ -30,6 +30,7 @@ const InvoiceRecord = () =&gt; {
   const [bankImportModalVisible, setBankImportModalVisible] = useState(false);
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
+  const [perms, setPerms] = useState([]);
   const [messageApi, contextHolder] = message.useMessage();
   const [invoiceId] = useState(undefined);
   const [invoiceRecordDetailVisible, setInvoiceRecordDetailVisible] =
@@ -137,7 +138,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
  
-        if (record.writeOffId !== null) {
+        if (record.paths?.includes('writeOff') && record.writeOffId !== null) {
           btns.push(
             <InvoiceWriteOffModal
               getData={async () => {
@@ -192,7 +193,7 @@ const InvoiceRecord = () =&gt; {
         actionRef={bankActionRef}
         cardBordered
         pagination={{
-          pageSize: 10,
+          pageSizeOptions: ['10', '20', '50', '100'],
         }}
         editable={{
           type: 'multiple',
@@ -209,6 +210,7 @@ const InvoiceRecord = () =&gt; {
             data: { ...params },
           });
           if (res) {
+            setPerms(res?.data?.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
@@ -264,16 +266,20 @@ const InvoiceRecord = () =&gt; {
         headerTitle="银行流水列表"
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
-          <Button
-            key="button"
-            icon={<PlusOutlined />}
-            onClick={() => {
-              setBankImportModalVisible(true);
-            }}
-            type="primary"
-          >
-            导入
-          </Button>,
+          <>
+            {perms.includes('writeOff') && (
+              <Button
+                key="button"
+                icon={<PlusOutlined />}
+                onClick={() => {
+                  setBankImportModalVisible(true);
+                }}
+                type="primary"
+              >
+                导入
+              </Button>
+            )}
+          </>,
         ]}
       />
  
@@ -78,6 +78,43 @@ export const INVOICE_COLUMNS = [
     hideInTable: true,
   },
   {
+    title: '订单状态',
+    dataIndex: 'orderTypeText',
+    valueType: 'text',
+    width: 180,
+  },
+  {
+    title: '绑定流水号',
+    dataIndex: 'serialNumbersTextByOrder',
+    hideInSearch: true,
+    valueType: 'text',
+    width: 180,
+  },
+  {
+    title: '是否预付款',
+    dataIndex: 'orderIsPrePay',
+    valueType: 'select',
+    valueEnum: {
+      true: {
+        text: '是',
+        status: true,
+      },
+      false: {
+        text: '否',
+        status: false,
+      },
+    },
+    hideInTable: true,
+    width: 180,
+  },
+  {
+    title: '绑定流水号',
+    dataIndex: 'serialNumberLike',
+    hideInTable: true,
+    valueType: 'text',
+    width: 180,
+  },
+  {
     title: '购买方',
     dataIndex: 'purchaser',
     valueType: 'text',