feat: update

zhongnanhuang
1 parent 412f08e8
Showing 4 changed files with 79 additions and 5 deletions
src/pages/Order/components/BaseModal.tsx
src/pages/Order/components/Financial.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/constant.ts
+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>
+    </>
+  );
+};
+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>
+    </>
+  );
+};
@@ -76,12 +76,14 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
                             <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'
@@ -277,6 +277,8 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['PROCURE_SEND', '采购发货子订单'],
   ['NO_NEED_SEND', '不需要发货'],
   ['PROCURE_CONVERT_WAREHOUSE_KEEPER', '采购转仓库'],
+  ['PROCURE_CONVERT_PROCURE', '采购转发'],
+  ['MERGE_APPLY_INVOICING', '合并申请开票'],
 ]);
  
 export const MAIN_ORDER_COLUMNS = [