From b4bdf836d5dc2305adb9310540d62c0c8f613e51 Mon Sep 17 00:00:00 2001
From: zhongnanhuang <zhongnanhuang@canrd.com>
Date: Tue, 9 Jan 2024 14:42:27 +0800
Subject: [PATCH] feat: update

---
 src/pages/Order/components/BaseModal.tsx    | 35 +++++++++++++++++++++++++++++++++++
 src/pages/Order/components/Financial.tsx    | 35 +++++++++++++++++++++++++++++++++++
 src/pages/Order/components/HistoryModal.tsx | 12 +++++++-----
 src/pages/Order/constant.ts                 |  2 ++
 4 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/Order/components/BaseModal.tsx
 create mode 100644 src/pages/Order/components/Financial.tsx

diff --git a/src/pages/Order/components/BaseModal.tsx b/src/pages/Order/components/BaseModal.tsx
new file mode 100644
index 0000000..fad98af
--- /dev/null
+++ b/src/pages/Order/components/BaseModal.tsx
@@ -0,0 +1,35 @@
+import { ModalForm } from '@ant-design/pro-components';
+import { Form } from 'antd';
+
+// import { cloneDeep } from 'lodash';
+export default ({ setCheckVisible, onClose }) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+
+  return (
+    <>
+      <ModalForm<{
+        name: string;
+        company: string;
+      }>
+        width={500}
+        open
+        title="标题"
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          okText: '通过',
+          cancelText: '取消',
+          destroyOnClose: true,
+          onCancel: () => {
+            setCheckVisible(false);
+          },
+        }}
+        onFinish={async (values) => {
+          console.log(values);
+          onClose();
+        }}
+        onOpenChange={setCheckVisible}
+      ></ModalForm>
+    </>
+  );
+};
diff --git a/src/pages/Order/components/Financial.tsx b/src/pages/Order/components/Financial.tsx
new file mode 100644
index 0000000..fad98af
--- /dev/null
+++ b/src/pages/Order/components/Financial.tsx
@@ -0,0 +1,35 @@
+import { ModalForm } from '@ant-design/pro-components';
+import { Form } from 'antd';
+
+// import { cloneDeep } from 'lodash';
+export default ({ setCheckVisible, onClose }) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+
+  return (
+    <>
+      <ModalForm<{
+        name: string;
+        company: string;
+      }>
+        width={500}
+        open
+        title="标题"
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          okText: '通过',
+          cancelText: '取消',
+          destroyOnClose: true,
+          onCancel: () => {
+            setCheckVisible(false);
+          },
+        }}
+        onFinish={async (values) => {
+          console.log(values);
+          onClose();
+        }}
+        onOpenChange={setCheckVisible}
+      ></ModalForm>
+    </>
+  );
+};
diff --git a/src/pages/Order/components/HistoryModal.tsx b/src/pages/Order/components/HistoryModal.tsx
index da17585..6fa6660 100644
--- a/src/pages/Order/components/HistoryModal.tsx
+++ b/src/pages/Order/components/HistoryModal.tsx
@@ -76,12 +76,14 @@ export default ({ subOrders, isCancelledOrder, onClose }) => {
                             <span className="text-[#3b83e5]">
                               {HISTORY_OPT_TYPE.get(history.record)}
                             </span>
-                            ,
-                            {history.record === 'INVOICING' ? '开票状态为' : ''}
-                            {history.record !== 'INVOICING' ? '订单状态为' : ''}
-                            :
+                            {history.record !== 'INVOICING' &&
+                            enumValueToLabel(
+                              history.status,
+                              ORDER_STATUS_OPTIONS,
+                            ) !== undefined
+                              ? ',订单状态为:'
+                              : ''}
                             <span className="text-[#3b83e5]">
-                              {history.status === 'INVOICING' ? '已开票' : ''}
                               {history.status === null ? '已作废' : ''}
                               {history.status !== null &&
                               history.status !== 'INVOICING'
diff --git a/src/pages/Order/constant.ts b/src/pages/Order/constant.ts
index 251eeb8..6c09fd6 100644
--- a/src/pages/Order/constant.ts
+++ b/src/pages/Order/constant.ts
@@ -277,6 +277,8 @@ export const HISTORY_OPT_TYPE = new Map<string, string>([
   ['PROCURE_SEND', '采购发货子订单'],
   ['NO_NEED_SEND', '不需要发货'],
   ['PROCURE_CONVERT_WAREHOUSE_KEEPER', '采购转仓库'],
+  ['PROCURE_CONVERT_PROCURE', '采购转发'],
+  ['MERGE_APPLY_INVOICING', '合并申请开票'],
 ]);
 
 export const MAIN_ORDER_COLUMNS = [
--
libgit2 0.23.3