feat: update 财务编辑、报表排除大订单金额条件

zhongnanhuang
1 parent dfbe00fb
Showing 5 changed files with 82 additions and 11 deletions
src/pages/Order/components/FinancialEditDrawer.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/OrderReport/index.tsx
 // import { PlusOutlined } from '@ant-design/icons';
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderNoNeedInvoicingEdit } from '@/services';
-import { DrawerForm, ProFormDatePicker } from '@ant-design/pro-components';
+import { enumToSelect } from '@/utils';
+import {
+  DrawerForm,
+  ProFormDatePicker,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
 import { Form, message } from 'antd';
+import { useEffect, useState } from 'react';
+import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
-export default ({ subOrders, setVisible, onClose }) => {
+export default ({ mainOrder, subOrders, setVisible, onClose }) => {
+  const [invoicingStatus, setInvoicingStatus] = useState('');
+  useEffect(() => {
+    setInvoicingStatus(subOrders[0]?.invoicingStatus);
+  }, []);
   const subOrderIds = subOrders?.map((subOrder) => {
     return subOrder?.id;
   });
+  const mainOrderId = mainOrder.id;
   const [form] = Form.useForm<{
     collectMoneyTime: string;
     subIds: [];
@@ -35,14 +48,12 @@ export default ({ subOrders, setVisible, onClose }) =&gt; {
         destroyOnClose: true,
       }}
       submitTimeout={2000}
-      onFinish={async () => {
+      onFinish={async (values) => {
         let res = await postServiceOrderNoNeedInvoicingEdit({
           data: {
+            ...values,
+            mainOrderId: mainOrderId,
             subIds: subOrderIds,
-            collectMoneyTime: form.getFieldValue('collectMoneyTime'),
-            financialReceiptIssuanceTime: form.getFieldValue(
-              'financialReceiptIssuanceTime',
-            ),
           },
         });
         if (res.result === RESPONSE_CODE.SUCCESS) {
@@ -54,19 +65,69 @@ export default ({ subOrders, setVisible, onClose }) =&gt; {
         return !val && setVisible(val);
       }}
     >
+      <ProFormSelect
+        placeholder="选择是否需要开票"
+        name="invoicingStatus"
+        width="lg"
+        label="是否需要开票"
+        options={enumToSelect(INVOCING_STATUS_OPTIONS_OLD)}
+        onChange={setInvoicingStatus}
+        initialValue={subOrders[0]?.invoicingStatus}
+        // disabled={mainInfoDisbled}
+        rules={[{ required: true, message: '是否需要开票必填' }]}
+      />
+      {invoicingStatus !== 'UN_INVOICE' ? (
+        <>
+          <ProFormText
+            key="invoiceIdentificationNumber"
+            width="lg"
+            name="invoiceIdentificationNumber"
+            label="开票信息"
+            placeholder="请输入开票信息"
+            rules={[{ required: true, message: '开票信息必填' }]}
+          />
+          <ProFormText
+            key="bank"
+            width="lg"
+            name="bank"
+            label="开户银行"
+            placeholder="请输入开户银行"
+          />
+          <ProFormText
+            key="bankAccountNumber"
+            width="lg"
+            name="bankAccountNumber"
+            label="开户银行账号"
+            placeholder="请输入开户银行账号"
+          />
+        </>
+      ) : (
+        ''
+      )}
+
       <ProFormDatePicker
         key="financialReceiptIssuanceTime"
         width="lg"
         name="financialReceiptIssuanceTime"
-        rules={[{ required: true, message: '收据时间必填' }]}
         label="开收据时间"
+        rules={[
+          {
+            required: invoicingStatus === 'UN_INVOICE',
+            message: '开收据时间必填',
+          },
+        ]}
       />
       <ProFormDatePicker
         key="collectMoneyTime"
         width="lg"
         name="collectMoneyTime"
         label="收款时间"
-        rules={[{ required: true, message: '收款时间必填' }]}
+        rules={[
+          {
+            required: invoicingStatus === 'UN_INVOICE',
+            message: '收款时间必填',
+          },
+        ]}
       />
     </DrawerForm>
   );
@@ -254,6 +254,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         });
         values.list = list;
+        values.institution = values.institution?.trim();
+        values.institutionContactName = values.institutionContactName?.trim();
+
         if (optType('add') || optType('copy')) {
           res = await postServiceOrderAddOrder({ data: values });
         } else {
@@ -338,7 +338,7 @@ export const MAIN_ORDER_COLUMNS = [
     },
   },
   {
-    title: '单位联系人',
+    title: '课题组',
     dataIndex: 'institutionContactName',
     valueType: 'select',
     hideInTable: true,
@@ -667,10 +667,11 @@ const OrderPage = () =&gt; {
                 onClick={() => {
                   setFinancialEditVisible(true);
                   setSelectedRows([optRecord]);
+                  setOrderRow(record);
                   setIsMainOrder(false);
                 }}
               >
-                收款时间
+                编辑时间
               </Button>
             ) : (
               ''
@@ -2382,6 +2383,7 @@ const OrderPage = () =&gt; {
       {financialEditVisible && (
         <FinancialEditDrawer
+          mainOrder={orderRow}
           subOrders={selectedRows}
           setVisible={() => {
             setFinancialEditVisible(false);
@@ -2391,6 +2393,7 @@ const OrderPage = () =&gt; {
             setFinancialEditVisible(false);
             refreshTable();
             setIsMainOrder(false);
+            setOrderRow({});
           }}
         />
       )}
@@ -5,6 +5,7 @@ import { EllipsisOutlined } from &#39;@ant-design/icons&#39;;
 import {
   PageContainer,
   ProCard,
+  ProFormDigit,
   ProFormSelect,
   QueryFilter,
 } from '@ant-design/pro-components';
@@ -53,6 +54,7 @@ const OrderReportPage = () =&gt; {
       statisticsMethod: '',
       salesCode: form.getFieldValue('salesCode'),
       productBelongBusiness: form.getFieldValue('productBelongBusiness'),
+      maxAccount: form.getFieldValue('maxAccount'),
       // beginTime:"",
       // endTime:""
     };
@@ -163,6 +165,8 @@ const OrderReportPage = () =&gt; {
               label="所属事业部"
               options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
             />
+            <ProFormDigit label="排除大订单金额" name="maxAccount" min={0} />
+
             {/* <ProFormDateRangePicker
               key="dateRange"
               name="dateRange"