fix(order-page): 禁用一键审核功能

由于当前存在技术限制，无法实现一键审核功能。已将相关代码注释行修改以反映此情况，并防止潜在的错误操作。fix(order): 修复财务审核中流水号字段的错误解决了财务审核功能中，添加流水号字段后导致的接口调用失败问题。现在，`checkNotes`字段被正确地包含在提交给`postServiceOrderFinanceCheckOrder`的payload中。之前，由于字段顺序错误，导致接口调用失败。

fix(order-page): 禁用一键审核功能
由于当前存在技术限制，无法实现一键审核功能。已将相关代码注释行修改以反映此情况，并防止潜在的错误操作。fix(order): 修复财务审核中流水号字段的错误解决了财务审核功能中，添加流水号字段后导致的接口调用失败问题。现在，`checkNotes`字段被正确地包含在提交给`postServiceOrderFinanceCheckOrder`的payload中。之前，由于字段顺序错误，导致接口调用失败。
曾国涛
1 parent ac7b28d0
Showing 11 changed files with 75 additions and 536 deletions
src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceRecord/components/InvoiceRecordDetailModal.tsx
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Invoice/InvoiceVerification/components/InvoiceVerificationModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/waitProcessRecord/components/InvoiceRecordDetailModal.tsx
src/pages/Invoice/waitProcessRecord/index.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
@@ -83,7 +83,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
     {
       key: '3',
       label: '状态',
-      children: enumValueToLabel(invoiceInfo?.status, INVOICE_STATUS),
+      children: invoiceInfo?.statusText,
       span: 4,
     },
     {
@@ -220,10 +220,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
       width: 70,
       render: (text, record) => {
         let optBtns = [];
-        if (invoiceInfo?.status === 'VERIFIED') {
-          return [];
-        }
-
         optBtns.push(
           <ButtonConfirm
             key="delete"
@@ -357,7 +353,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
               onClick={() => {
                 setBankChooseModalVisible(true);
               }}
-              hidden={invoiceInfo?.status === 'VERIFIED'}
               type="primary"
             >
               添加
@@ -3,7 +3,7 @@ import EllipsisDiv from &#39;@/components/Div/EllipsisDiv&#39;;
 import AddInvoiceDrawerForm from '@/pages/Invoice/Invoice/components/AddInvoiceDrawerForm';
 import BankImportModal from '@/pages/Invoice/Invoice/components/BankImportModal';
 import InvoiceVerificationModal from '@/pages/Invoice/Invoice/components/InvoiceVerificationModal';
-import { INVOICE_COLUMNS, INVOICE_STATUS } from '@/pages/Invoice/constant';
+import { INVOICE_COLUMNS } from '@/pages/Invoice/constant';
 import { INVOCING_STATUS, PAYEE_OPTIONS } from '@/pages/Order/constant';
 import {
   postServiceInvoiceDeleteInvoice,
@@ -71,16 +71,6 @@ const InvoiceRecord = () =&gt; {
               />
             );
-          case 'status':
-            return (
-              <EllipsisDiv
-                text={enumValueToLabel(
-                  getTableCellText(textValue),
-                  INVOICE_STATUS,
-                )}
-              />
-            );
-
           case 'payee':
             return (
               <EllipsisDiv
@@ -107,7 +97,7 @@ const InvoiceRecord = () =&gt; {
       width: 120,
       render: (text, record) => {
         let btns = [];
-        if (record.path?.includes('writeOff')) {
+        if (record.paths?.includes('writeOff')) {
           btns.push(
             <a
               key="editable"
@@ -122,7 +112,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
-        if (record.path?.includes('queryInvoiceDetails')) {
+        if (record.paths?.includes('queryInvoiceDetails')) {
           btns.push(
             <Button
               className="p-0"
@@ -130,7 +120,7 @@ const InvoiceRecord = () =&gt; {
               type="link"
               onClick={() => {
                 setInvoiceVerificationVisible(true);
-                setInvoiceId(record.invoiceId);
+                setInvoiceId(record.id);
               }}
             >
               查看
@@ -138,7 +128,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
-        if (record.path?.includes('deleteInvoice')) {
+        if (record.paths?.includes('deleteInvoice')) {
           btns.push(
             <ButtonConfirm
               key="delete"
@@ -21,7 +21,7 @@ import {
 import { Button, Divider, Form, Space, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
-export default ({ id, setVisible }) => {
+export default ({ id, setVisible, reloadTable }) => {
   const [readOnly, setReadOnly] = useState(true);
   const [detailTableData, setDetailTableData] = useState([]);
   const [payees, setPayees] = useState([]);
@@ -124,6 +124,7 @@ export default ({ id, setVisible }) =&gt; {
                           message.success('提交成功');
                         }
                         setVisible(false);
+                        reloadTable();
                         return true;
                       }}
                     >
@@ -168,6 +169,7 @@ export default ({ id, setVisible }) =&gt; {
               },
             });
             if (result.result === RESPONSE_CODE.SUCCESS) {
+              reloadTable();
               message.success('提交成功');
             }
             return true;
@@ -239,7 +239,7 @@ const InvoiceRecord = () =&gt; {
     },
     {
       title: '开票状态',
-      key: 'invoiceRecordStatus',
+      key: 'status',
       valueType: 'select',
       dataIndex: 'status',
       filters: true,
@@ -474,6 +474,9 @@ const InvoiceRecord = () =&gt; {
           key="detail"
           id={invoiceRecord.id}
           setVisible={setInvoiceRecordDetailVisible}
+          reloadTable={() => {
+            processedRecordRef?.current?.reload();
+          }}
         />
       ) : (
         ''
@@ -357,7 +357,6 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
               onClick={() => {
                 setBankChooseModalVisible(true);
               }}
-              hidden={invoiceInfo?.status === 'VERIFIED'}
               type="primary"
             >
               添加
@@ -55,14 +55,9 @@ export const INVOICE_COLUMNS = [
   },
   {
     title: '状态',
-    dataIndex: 'status',
+    dataIndex: 'statusText',
     valueType: 'text',
-    width: 100,
-    valueEnum: enumToProTableEnumValue({
-      UNVERIFIED: '未核销',
-      VERIFIED: '已核销',
-      PARTIAL_VERIFICATION: '部分核销',
-    }),
+    width: 180,
   },
   {
     title: '购买方',
@@ -93,7 +88,14 @@ export const INVOICE_COLUMNS = [
     title: '金额',
     dataIndex: 'money',
     valueType: 'money',
-    hideInTable: true,
+    hideInSearch: true,
+    width: 100,
+  },
+  {
+    title: '开具类型',
+    dataIndex: 'invoicingTypeText',
+    valueType: 'invoicingTypeText',
+    hideInSearch: true,
     width: 100,
   },
   {
@@ -156,21 +158,6 @@ export const BANK_STATEMENT_COLUMNS = [
     editable: false,
   },
   {
-    dataIndex: 'statusText',
-    title: '状态',
-    valueType: 'select',
-    width: 100,
-    editable: false,
-    hideInSearch: true,
-  },
-  {
-    title: '状态',
-    width: 80,
-    dataIndex: 'status',
-    hideInTable: true,
-    valueEnum: convertToObjectWithTextAndStatus(BANKSTATEMENT_STATUS),
-  },
-  {
     dataIndex: 'serialNumber',
     title: '流水号',
     valueType: 'text',
-import { RESPONSE_CODE } from '@/constants/enum';
-import InvoiceDetailTable from '@/pages/Invoice/waitProcessRecord/components/InvoiceDetailTable';
-import {
-  postServiceConstGetPayeeEnum,
-  postServiceConstInvoiceType,
-  postServiceConstInvoicingType,
-  postServiceInvoiceGetInvoiceRecord,
-  postServiceInvoiceModifyRecord,
-} from '@/services';
-import { enumToSelect } from '@/utils';
-import {
-  ModalForm,
-  ProCard,
-  ProForm,
-  ProFormInstance,
-  ProFormList,
-  ProFormSelect,
-  ProFormText,
-  ProFormTextArea,
-} from '@ant-design/pro-components';
-import { Button, Divider, Form, Space, message } from 'antd';
-import { useEffect, useRef, useState } from 'react';
-
-export default ({ id, setVisible }) => {
-  const [readOnly, setReadOnly] = useState(true);
-  const [detailTableData, setDetailTableData] = useState([]);
-  const [payees, setPayees] = useState([]);
-  const [payeeNameOptions, setPayeeNameOptions] = useState([]);
-  const formRef = useRef<ProFormInstance>();
-  const [form] = Form.useForm();
-
-  useEffect(() => {
-    console.log('id' + id);
-    const getPayees = async () => {
-      let res = await postServiceConstGetPayeeEnum();
-      setPayees(res.data);
-      let payeeNameOptions = res.data.map((item) => {
-        return {
-          label: item.payeeName,
-          value: item.payeeName,
-        };
-      });
-      setPayeeNameOptions(payeeNameOptions);
-    };
-    getPayees();
-  }, []);
-  const getRecord = async (id) => {
-    let ret = await postServiceInvoiceGetInvoiceRecord({
-      query: {
-        id: id,
-      },
-    });
-    console.log(ret.data);
-    const updatedInvoiceDetails = ret.data.invoiceDetails?.map(
-      (item, index) => ({
-        ...item, // 保留原有属性
-        tid: index + 1, // 添加tid属性，这里以T开头，后面跟索引+1，仅作示例，实际可根据需求生成tid
-      }),
-    );
-    setDetailTableData(updatedInvoiceDetails);
-  };
-  useEffect(() => {
-    getRecord(id);
-  }, []);
-
-  const updateDetails = (values) => {
-    setDetailTableData(values);
-  };
-  return (
-    <>
-      <Space>
-        <ModalForm
-          open
-          title="发票详情"
-          formRef={formRef}
-          request={async () => {
-            let ret = await postServiceInvoiceGetInvoiceRecord({
-              query: {
-                id: id,
-              },
-            });
-            const data = ret.data;
-            const orderIdMap = data.orderIdMap;
-            const orderIdList = [];
-
-            // 使用Object.entries()遍历属性
-            Object.entries(orderIdMap).forEach(([key, value]) => {
-              const orderId = {
-                mainId: key,
-                subIds: value,
-              };
-              orderIdList.push(orderId);
-            });
-            return {
-              ...data,
-              orderIdList: orderIdList,
-            };
-          }}
-          submitter={{
-            render: () => {
-              return [
-                <Button
-                  type={readOnly ? 'primary' : 'default'}
-                  key="ok"
-                  onClick={() => {
-                    setReadOnly(!readOnly);
-                  }}
-                >
-                  {readOnly ? '编辑' : '取消编辑'}
-                </Button>,
-                <>
-                  {!readOnly && (
-                    <Button
-                      type="primary"
-                      key="submit"
-                      onClick={async () => {
-                        const result = await postServiceInvoiceModifyRecord({
-                          data: {
-                            ...form.getFieldsValue(),
-                            invoiceDetails: [...detailTableData],
-                          },
-                        });
-                        if (result.result === RESPONSE_CODE.SUCCESS) {
-                          message.success('提交成功');
-                        }
-                        setVisible(false);
-                        return true;
-                      }}
-                    >
-                      提交
-                    </Button>
-                  )}
-                </>,
-                /*<Button
-                                                                                                        type={'default'}
-                                                                                                        key="ok"
-                                                                                                        onClick={() => {
-                                                                                                            setVisible(false)
-                                                                                                        }}
-                                                                                                    >
-                                                                                                        取消
-                                                                                                    </Button>,*/
-              ];
-            },
-          }}
-          width={1200}
-          form={form}
-          autoFocusFirstInput
-          modalProps={{
-            destroyOnClose: true,
-            onCancel: () => {
-              setVisible(false);
-            },
-          }}
-          grid={true}
-          layout="horizontal"
-          rowProps={{
-            gutter: [0, 0],
-          }}
-          submitTimeout={2000}
-          onFinish={async (values) => {
-            const result = await postServiceInvoiceModifyRecord({
-              data: {
-                ...values,
-                invoiceDetails: {
-                  ...detailTableData,
-                },
-              },
-            });
-            if (result.result === RESPONSE_CODE.SUCCESS) {
-              message.success('提交成功');
-            }
-            return true;
-          }}
-        >
-          <ProCard
-            title="基础信息"
-            bordered
-            //
-            headStyle={{}}
-            headerBordered
-            size={'small'}
-          >
-            <ProForm.Group>
-              <ProFormText
-                readonly
-                name="id"
-                label="订单批号"
-                colProps={{
-                  span: 5,
-                }}
-                tooltip="最长为 24 位"
-                placeholder="请输入名称"
-              />
-
-              <ProFormText
-                readonly
-                width="md"
-                colProps={{
-                  span: 5,
-                }}
-                name="createByName"
-                label="销售代表"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly
-                width="md"
-                colProps={{
-                  span: 5,
-                }}
-                name="createTime"
-                label="申请时间"
-                placeholder="请输入名称"
-              />
-              <ProFormSelect
-                name="type"
-                label="发票类型"
-                colProps={{
-                  span: 5,
-                }}
-                readonly={readOnly}
-                request={async () => {
-                  let invoiceTypeRet = await postServiceConstInvoiceType();
-                  return enumToSelect(invoiceTypeRet.data);
-                }}
-                placeholder="Please select a country"
-                rules={[
-                  { required: true, message: 'Please select your country!' },
-                ]}
-              />
-              <ProFormSelect
-                name="invoicingType"
-                readonly={readOnly}
-                label="开具类型"
-                colProps={{
-                  span: 4,
-                }}
-                request={async () => {
-                  let invoicingTypeRet = await postServiceConstInvoicingType();
-                  let options = enumToSelect(invoicingTypeRet.data);
-                  return options;
-                }}
-                placeholder="Please select a country"
-                rules={[
-                  { required: true, message: 'Please select your country!' },
-                ]}
-              />
-              <ProFormList
-                label="订单号"
-                name="orderIdList"
-                creatorButtonProps={false}
-                itemRender={({}, { record }) => {
-                  console.log('record' + JSON.stringify(record));
-                  return (
-                    <Space>
-                      <Button
-                        key={record.mainId}
-                        className="pl-1 pr-0"
-                        type="link"
-                        target="_blank"
-                        href={'/order?id=' + record.mainId}
-                      >
-                        {record.mainId}
-                      </Button>
-                      (
-                      {record.subIds.map((item) => {
-                        return (
-                          <Button
-                            key={item}
-                            className="pl-1 pr-0"
-                            type="link"
-                            target="_blank"
-                            href={'/order?subOrderId=' + item}
-                          >
-                            {item}
-                          </Button>
-                        );
-                      })}
-                      )
-                      <Divider type="vertical" />
-                    </Space>
-                  );
-                }}
-              >
-                <ProFormText allowClear={false} width="xs" name={['name']} />
-              </ProFormList>
-            </ProForm.Group>
-          </ProCard>
-          <hr />
-          <ProCard title="购方信息" bordered headerBordered size={'small'}>
-            <ProForm.Group>
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyAName"
-                label="购方名称"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyATaxid"
-                label="购方税号"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                label="开户银行"
-                name={'partyAOpenBank'}
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyABankAccount"
-                label="银行账号"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyAAddress"
-                label="购方地址"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly={readOnly}
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyAPhoneNumber"
-                label="电话"
-                placeholder="请输入名称"
-              />
-            </ProForm.Group>
-          </ProCard>
-          <hr />
-          <ProCard title="销方信息" bordered headerBordered size={'small'}>
-            <ProForm.Group>
-              <ProFormSelect
-                readonly={readOnly}
-                width="md"
-                name="partyBName"
-                options={payeeNameOptions}
-                onChange={(value: any) => {
-                  let payee = payees.find((item: any) => {
-                    return item.payeeName === value;
-                  });
-                  console.log(JSON.stringify(payee));
-                  form.setFieldsValue({
-                    partyBTaxid: payee.taxId,
-                    partyBBankAccount: payee.bankAccount,
-                    partyBOpenBank: payee.openBank,
-                    partyBAddress: payee.address,
-                    partyBPhoneNumber: payee.phoneNumber,
-                  });
-                }}
-                label="销方名称"
-                colProps={{
-                  span: 8,
-                }}
-                placeholder="请输入名称"
-              />
-
-              <ProFormText
-                readonly
-                width="md"
-                name="partyBTaxid"
-                label="销方税号"
-                colProps={{
-                  span: 8,
-                }}
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly
-                width="md"
-                name="partyBOpenBank"
-                label="开户银行"
-                colProps={{
-                  span: 8,
-                }}
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly
-                width="md"
-                name="partyBBankAccount"
-                label="银行账号"
-                colProps={{
-                  span: 8,
-                }}
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyBAddress"
-                label="销方地址"
-                placeholder="请输入名称"
-              />
-              <ProFormText
-                readonly
-                width="md"
-                colProps={{
-                  span: 8,
-                }}
-                name="partyBPhoneNumber"
-                label="电话"
-                placeholder="请输入名称"
-              />
-            </ProForm.Group>
-          </ProCard>
-          <hr />
-          <ProCard title="发票明细" bordered headerBordered size={'small'}>
-            <InvoiceDetailTable
-              recordId={id}
-              details={detailTableData}
-              updateDetails={updateDetails}
-              readOnly={readOnly}
-            />
-          </ProCard>
-          <hr />
-          <ProCard title="备注" bordered headerBordered size={'small'}>
-            <ProFormTextArea
-              readonly={readOnly}
-              name="comment"
-              placeholder="请输入备注"
-            />
-          </ProCard>
-        </ModalForm>
-      </Space>
-    </>
-  );
-};
+import InvoiceRecordDetailModal from '@/pages/Invoice/InvoiceRecord/components/InvoiceRecordDetailModal';
 import InvoiceModal from '@/pages/Invoice/waitProcessRecord/components/InvoiceModal';
-import InvoiceRecordDetailModal from '@/pages/Invoice/waitProcessRecord/components/InvoiceRecordDetailModal';
 import InvoicingModal from '@/pages/Invoice/waitProcessRecord/components/InvoicingModal';
 import ManualInvoicingModal from '@/pages/Invoice/waitProcessRecord/components/ManualInvoicingModal';
 import { PAYEE_OPTIONS } from '@/pages/Order/constant';
@@ -258,7 +258,7 @@ const InvoiceRecord = () =&gt; {
     {
       title: '开票状态',
       valueType: 'select',
-      key: 'waitProcessRecordStatus',
+      key: 'status',
       dataIndex: 'status',
       filters: true,
       onFilter: true,
@@ -423,6 +423,9 @@ const InvoiceRecord = () =&gt; {
           key="detail"
           id={invoiceRecord.id}
           setVisible={setInvoiceRecordDetailVisible}
+          reloadTable={() => {
+            waitDealrecordActionRef?.current?.reload();
+          }}
         />
       ) : (
         ''
@@ -10,6 +10,7 @@ import {
 } from '@/services';
 import {
   ModalForm,
+  ProFormText,
   ProFormTextArea,
   ProList,
 } from '@ant-design/pro-components';
@@ -324,6 +325,7 @@ export default ({
       //财务审核
       const data = await postServiceOrderFinanceCheckOrder({
         data: {
+          ...values,
           checkNotes: values.name,
           ids: subOrderIds,
           checkPassOrReject: isAgree,
@@ -586,6 +588,7 @@ export default ({
           let type = '';
           type = computeType();
           doCheck({
+            ...values,
             pass: true,
             subOrderIds: subOrderIds,
             type: type,
@@ -674,6 +677,12 @@ export default ({
         )}
         {checkType(CHECK_TYPE.FINALCIAL) ? (
           <>
+            <ProFormText
+              width="md"
+              name="bankStatementSerialNumbersText"
+              label="流水号"
+              placeholder={'多个流水号用逗号隔开'}
+            />
             <div className="pb-4 text-xs decoration-gray-50">
               可复制照片粘贴
             </div>
@@ -11,7 +11,6 @@ import {
   postKingdeeRepMaterialUnit,
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
-  postResearchGroupsNameSet,
   postServiceOrderAddOrder,
   postServiceOrderAfterSalesQuerySnapshotOrder,
   postServiceOrderApplyAfterSales,
@@ -1203,37 +1202,45 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           placeholder="请输入单位"
           rules={[{ required: true, message: '单位必填' }]}
         />
-        <ProFormSelect
-          key={'institutionContactName'}
-          width="md"
-          showSearch
+        <ProFormText
+          width="lg"
+          key="institutionContactName"
           name="institutionContactName"
-          rules={[{ required: true, message: '请输入课题组名称!' }]}
-          request={async (value) => {
-            const keywords = value.keyWords;
-            const res = await postResearchGroupsNameSet({
-              data: {
-                groupName: keywords,
-              },
-            });
-            let options = res?.data?.map((c: any) => {
-              return {
-                label: c,
-                value: c,
-                key: c,
-              };
-            });
-            return options;
-          }}
-          fieldProps={{
-            filterOption() {
-              return true;
-            },
-          }}
-          debounceTime={1000}
-          label="课题组名称"
-          placeholder="请输入名称"
+          label="课题组"
+          placeholder="请输入课题组"
+          rules={[{ required: true, message: '课题组必填' }]}
         />
+        {/*<ProFormSelect
+            key={'institutionContactName'}
+            width="md"
+            showSearch
+            name="institutionContactName"
+            rules={[{ required: true, message: '请输入课题组名称!' }]}
+            request={async (value) => {
+              const keywords = value.keyWords;
+              const res = await postResearchGroupsNameSet({
+                data: {
+                  groupName: keywords,
+                },
+              });
+              let options = res?.data?.map((c: any) => {
+                return {
+                  label: c,
+                  value: c,
+                  key: c,
+                };
+              });
+              return options;
+            }}
+            fieldProps={{
+              filterOption() {
+                return true;
+              },
+            }}
+            debounceTime={1000}
+            label="课题组名称"
+            placeholder="请输入名称"
+        />*/}
         <div
           style={{
             display: 'flex',
@@ -4206,7 +4206,7 @@ const OrderPage = () =&gt; {
       onClick: () => {},
     };
-    //导出按钮配置
+    //一键审核按钮配置
     const auditItems: MenuProps['items'] = [
       {
         label: '后置审核',