Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

# Conflicts: # src/pages/Order/OrderWarning/indexhide.tsx

Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front
# Conflicts: # src/pages/Order/OrderWarning/indexhide.tsx
boyang
2 parents 2043dafa 4226626f
Showing 8 changed files with 30 additions and 60 deletions
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceRecord/components/InvoiceModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/waitProcessRecord/components/Invoice.tsx
src/pages/Order/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderWarning/components/InvoicingDrawerForm.tsx
src/pages/Order/constant.ts
@@ -102,16 +102,20 @@ const InvoiceRecord = () =&gt; {
       fixed: 'right',
       width: 160,
       render: (text, record, _, action) => {
-        let btns = [
-          <a
-            key="editable"
-            onClick={() => {
-              action?.startEditable?.(record.id);
-            }}
-          >
-            编辑
-          </a>,
-        ];
+        let btns = [];
+
+        if (record.paths?.includes('edit')) {
+          btns.push(
+            <a
+              key="editable"
+              onClick={() => {
+                action?.startEditable?.(record.id);
+              }}
+            >
+              编辑
+            </a>,
+          );
+        }
         if (record.paths?.includes('writeOff') && !record.writeOffId) {
           btns.push(
-import Invoice from '@/pages/Invoice/InvoiceRecord/components/Invoice';
-import { postServiceInvoiceGetInvoiceRecord } from '@/services';
-import { ModalForm } from '@ant-design/pro-components';
-import { Form } from 'antd';
-import { useEffect, useState } from 'react';
-
-export default ({ recordId, getRecord, button }) => {
-  const [data, setData] = useState<any>({});
-  const getData = async () => {
-    let ret = await postServiceInvoiceGetInvoiceRecord({
-      query: {
-        id: recordId,
-      },
-    });
-    setData(ret.data);
-  };
-  useEffect(() => {
-    if (recordId) {
-      getData();
-    }
-  }, []);
-  const [form] = Form.useForm();
-  return (
-    <ModalForm
-      title="预览发票"
-      trigger={button ? button : <a type="primary">预览</a>}
-      onOpenChange={(open) => {
-        if (open) {
-          if (getRecord) {
-            setData(getRecord());
-          } else {
-            getData();
-          }
-        }
-      }}
-      width={1200}
-      form={form}
-      autoFocusFirstInput
-      submitter={false}
-      modalProps={{
-        destroyOnClose: true,
-      }}
-    >
-      <hr />
-      <Invoice data={data} />
-    </ModalForm>
-  );
-};
@@ -84,6 +84,7 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'orderTypeText',
     readonly: true,
     valueType: 'text',
+    hideInSearch: true,
     width: 180,
   },
   {
@@ -170,6 +171,13 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'invoicingTime',
     valueType: 'date',
     width: 150,
+    hideInSearch: true,
+  },
+  {
+    title: '开票日期',
+    dataIndex: 'invoicingTime',
+    valueType: 'date',
+    width: 150,
     search: {
       transform: (value) => {
         if (value) {
@@ -139,7 +139,9 @@ const ProjectContainer = styled.div`
   border-top: 2px solid #b16363;
   border-right: 2px solid #b16363;
   border-left: 2px solid #b16363;
+  max-height: 500px; /* 设置最大高度，根据需要调整 */
   overflow: auto;
+
   .single-project {
     width: 100%;
     height: 30px;
 // import { PlusOutlined } from '@ant-design/icons';
-import InvoiceModal from '@/pages/Invoice/InvoiceVerification/components/InvoiceModal';
+import InvoiceModal from '@/pages/Invoice/waitProcessRecord/components/InvoiceModal';
 import {
   postServiceConstGetPayeeEnum,
   postServiceConstInitInvoiceDetailNames,
@@ -4167,6 +4167,7 @@ const OrderPage = () =&gt; {
     if (
       roleCode === 'admin' ||
       roleCode === 'salesManager' ||
+      roles.includes('PROCURE') ||
       roleCode === 'salesRepresentative'
     ) {
       radios.push(<Radio value={70}>只看作废</Radio>);
 // import { PlusOutlined } from '@ant-design/icons';
-import InvoiceModal from '@/pages/Invoice/InvoiceVerification/components/InvoiceModal';
+import InvoiceModal from '@/pages/Invoice/waitProcessRecord/components/InvoiceModal';
 import {
   postServiceConstGetPayeeEnum,
   postServiceConstInitInvoiceDetailNames,
@@ -124,6 +124,9 @@ export const getNeedInvoicing = (subOrder: any) =&gt; {
   if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
     return '已开票';
   }
+  if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
+    return '已开票';
+  }
   if (subOrder.afterInvoicingStatus === 'REISSUE') {
     return '重新开票';
   }