Merge branch 'znh-small' into znh

zhongnanhuang
2 parents 50feec82 3860b9ab
Showing 3 changed files with 22 additions and 8 deletions
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -16,14 +16,20 @@ import { Form, message } from &#39;antd&#39;;
 import { useEffect, useState } from 'react';
 import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
-export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
+export default ({
+  mainOrder,
+  subOrders,
+  isEdit,
+  isMainOrder,
+  cancel,
+  onClose,
+}) => {
   const [invoicingStatus, setInvoicingStatus] = useState('');
   const subIds = subOrders.map((item) => item.id);
-  console.log(subOrders);
   useEffect(() => {
     // 在组件挂载或数据变化时，更新组件状态
     if (mainOrder) {
-      setInvoicingStatus(subOrders[0].invoicingStatus);
+      setInvoicingStatus(subOrders[0]?.invoicingStatus);
     }
   }, [mainOrder]);
@@ -70,7 +76,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) =&gt; {
         }
       }}
       onOpenChange={(val) => {
-        return !val && onClose();
+        return !val && cancel();
       }}
     >
       {isMainOrder ? (
@@ -81,6 +87,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) =&gt; {
           label="是否需要开票"
           options={enumToSelect(INVOCING_STATUS_OPTIONS_OLD)}
           onChange={setInvoicingStatus}
+          initialValue={subOrders[0]?.invoicingStatus}
           // disabled={mainInfoDisbled}
           rules={[{ required: true, message: '是否需要开票必填' }]}
         />
@@ -121,14 +128,14 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) =&gt; {
               rules={[
                 { required: !isEdit ? true : false, message: '这是必填项' },
               ]}
-              initialValue={subOrders[0].invoicingTime}
+              initialValue={subOrders[0]?.invoicingTime}
             />,
             <ProFormDatePicker
               key="collectMoneyTime"
               width="lg"
               name="collectMoneyTime"
               label="收款时间"
-              initialValue={subOrders[0].collectMoneyTime}
+              initialValue={subOrders[0]?.collectMoneyTime}
             />,
           ]
         : ''}
@@ -137,7 +144,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) =&gt; {
         width="lg"
         name="invoicingNotes"
         label="备注"
-        initialValue={subOrders[0].invoicingNotes}
+        initialValue={subOrders[0]?.invoicingNotes}
       />
     </DrawerForm>
   );
@@ -49,7 +49,7 @@ export const INVOCING_STATUS = {
  * @param subOrder
  */
 export const getNeedInvoicing = (subOrder: any) => {
-  if (subOrder.invoicingTime !== undefined) {
+  if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
     return '已开票';
   }
   if (subOrder.invoicingStatus === 'UN_INVOICE') {
@@ -327,6 +327,7 @@ const OrderPage = () =&gt; {
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
             <Tag
               color={
+                optRecord.invoicingTime === null ||
                 optRecord.invoicingTime === undefined
                   ? TAGS_COLOR.get(optRecord.invoicingStatus)
                   : 'success'
@@ -1240,6 +1241,12 @@ const OrderPage = () =&gt; {
           mainOrder={orderRow}
           subOrders={selectedRows}
           isMainOrder={isMainOrder}
+          cancel={() => {
+            setFinancialVisible(false);
+            setOrderRow({});
+            setIsMainOrder(false);
+            setIsFinalcialEdit(false);
+          }}
           onClose={() => {
             setFinancialVisible(false);
             setOrderRow({});