feat: update

zhongnanhuang
1 parent b4bdf836
Showing 3 changed files with 75 additions and 37 deletions
src/pages/Order/components/Financial.tsx → src/pages/Order/components/FinancialReceiptsModal.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/index.tsx
@@ -2,7 +2,7 @@ import { ModalForm } from &#39;@ant-design/pro-components&#39;;
 import { Form } from 'antd';
  
 // import { cloneDeep } from 'lodash';
-export default ({ setCheckVisible, onClose }) => {
+export default ({ setVisible, onClose }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
  
   return (
@@ -21,14 +21,14 @@ export default ({ setCheckVisible, onClose }) =&gt; {
           cancelText: '取消',
           destroyOnClose: true,
           onCancel: () => {
-            setCheckVisible(false);
+            setVisible(false);
           },
         }}
         onFinish={async (values) => {
           console.log(values);
           onClose();
         }}
-        onOpenChange={setCheckVisible}
+        onOpenChange={setVisible}
       ></ModalForm>
     </>
   );
@@ -17,6 +17,9 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
     onClose();
   };
  
+  /**
+   * 获取历史记录
+   */
   const getHistory = async () => {
     let res = await postServiceOrderQueryHistoryOrderRecord({
       data: { ids: subOrderIds, isDeleteQueryOrder: isCancelledOrder },
@@ -25,6 +28,60 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
     setLoading(false);
   };
  
+  const getRecord = (history: any) => {
+    let record = [];
+    record.push(
+      <span className="pr-2 text-[#5E5E5E]">
+        {formatDateTime(history.createTime)}
+      </span>,
+    );
+
+    record.push(<span className="text-[#3b83e5]">{history.createByName}</span>);
+
+    record.push(<span>进行了</span>);
+
+    record.push(
+      <span className="text-[#3b83e5]">
+        {HISTORY_OPT_TYPE.get(history.record)}
+      </span>,
+    );
+
+    let label = enumValueToLabel(history.status, ORDER_STATUS_OPTIONS);
+
+    if (
+      history.record !== 'INVOICING' &&
+      history.record?.indexOf(':') === -1 &&
+      label !== undefined &&
+      label !== ''
+    ) {
+      record.push(
+        <>
+          <span>，订单状态为：</span>
+          <span className="text-[#3b83e5]">{label}</span>
+        </>,
+      );
+    }
+
+    if (history.record?.indexOf(':') !== -1) {
+      let values = history.record?.split(':');
+      //采购转发
+      if (values[0] === 'PROCURE_CONVERT_PROCURE') {
+        record.push(
+          <>
+            <span>采购转发，{history.createByName}将订单转发给了</span>
+            <span className="text-[#3b83e5]">{values[1]}</span>
+          </>,
+        );
+      }
+    }
+
+    if (history.notes !== null) {
+      record.push(<span className="pl-1">{'备注：' + history.notes}</span>);
+    }
+
+    return record;
+  };
+
   useEffect(() => {
     getHistory();
   }, []);
@@ -66,40 +123,7 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
                       {item.historySubOrderRecordDto?.map((history) => {
                         return (
                           <div className="py-1" key={history.id}>
-                            <span className="pr-2 text-[#5E5E5E]">
-                              {formatDateTime(history.createTime)}
-                            </span>
-                            <span className="text-[#3b83e5]">
-                              {history.createByName}
-                            </span>
-                            进行了
-                            <span className="text-[#3b83e5]">
-                              {HISTORY_OPT_TYPE.get(history.record)}
-                            </span>
-                            {history.record !== 'INVOICING' &&
-                            enumValueToLabel(
-                              history.status,
-                              ORDER_STATUS_OPTIONS,
-                            ) !== undefined
-                              ? '，订单状态为：'
-                              : ''}
-                            <span className="text-[#3b83e5]">
-                              {history.status === null ? '已作废' : ''}
-                              {history.status !== null &&
-                              history.status !== 'INVOICING'
-                                ? enumValueToLabel(
-                                    history.status,
-                                    ORDER_STATUS_OPTIONS,
-                                  )
-                                : ''}
-                            </span>
-                            {history.notes !== null ? (
-                              <span className="pl-1">
-                                {'备注：' + history.notes}
-                              </span>
-                            ) : (
-                              ''
-                            )}
+                            {getRecord(history)}
                           </div>
                         );
                       })}
@@ -56,6 +56,7 @@ import DeliverInfoDrawer from &#39;./components/DeliverInfoDrawer&#39;;
 import DeliverModal from './components/DeliverModal';
 import FinancialDrawer from './components/FinancialDrawer';
 import FinancialEditDrawer from './components/FinancialEditDrawer';
+import FinancialReceiptsModal from './components/FinancialReceiptsModal';
 import HistoryModal from './components/HistoryModal';
 import ImportModal from './components/ImportModal';
 import OrderDrawer from './components/OrderDrawer';
@@ -93,6 +94,8 @@ const OrderPage = () =&gt; {
   const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
   const [attachmentModalVisible, setAttachmentModalVisible] =
     useState<boolean>(false);
+  const [financialReceiptsModalVisible, setFinancialReceiptsModalVisible] =
+    useState(false);
   const [financialVisible, setFinancialVisible] = useState<boolean>(false);
   const [financialEditVisible, setFinancialEditVisible] =
     useState<boolean>(false);
@@ -2600,6 +2603,17 @@ const OrderPage = () =&gt; {
         />
       )}
  
+      {financialReceiptsModalVisible && (
+        <FinancialReceiptsModal
+          setVisible={setFinancialReceiptsModalVisible}
+          onClose={() => {
+            setFinancialReceiptsModalVisible(false);
+            setSelectedRows({});
+            refreshTable();
+          }}
+        />
+      )}
+
       {contextHolder}
     </PageContainer>
   );