Merge branch 'znh-small' into znh

zhongnanhuang
2 parents 1f86602e 77954e9c
Showing 6 changed files with 116 additions and 20 deletions
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/OrderReport/index.less
@@ -4,17 +4,29 @@ import {
   postServiceOrderEditOrder,
   postServiceOrderInvoicing,
 } from '@/services';
+import { enumToSelect } from '@/utils';
 import {
   DrawerForm,
   ProFormDatePicker,
+  ProFormSelect,
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
+import { useEffect, useState } from 'react';
+import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
  
-export default ({ mainOrder, subOrders, isEdit, onClose }) => {
+export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
+  const [invoicingStatus, setInvoicingStatus] = useState('');
   const subIds = subOrders.map((item) => item.id);
   console.log(subOrders);
+  useEffect(() => {
+    // 在组件挂载或数据变化时，更新组件状态
+    if (mainOrder) {
+      setInvoicingStatus(subOrders[0].invoicingStatus);
+    }
+  }, [mainOrder]);
+
   const [form] = Form.useForm<{ name: string; company: string }>();
   return (
     <DrawerForm<{
@@ -44,6 +56,8 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
           subIds: subIds,
           collectMoneyTime: form.getFieldValue('collectMoneyTime'),
           invoicingNotes: form.getFieldValue('invoicingNotes'),
+          invoicingStatus: form.getFieldValue('invoicingStatus'),
+          mainorderOrSubOrderInvoicing: isMainOrder,
         };
         if (isEdit) {
           res = await postServiceOrderEditOrder({ data: body });
@@ -59,6 +73,21 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
         return !val && onClose();
       }}
     >
+      {isMainOrder ? (
+        <ProFormSelect
+          placeholder="选择是否需要开票"
+          name="invoicingStatus"
+          width="lg"
+          label="是否需要开票"
+          options={enumToSelect(INVOCING_STATUS_OPTIONS_OLD)}
+          onChange={setInvoicingStatus}
+          // disabled={mainInfoDisbled}
+          rules={[{ required: true, message: '是否需要开票必填' }]}
+        />
+      ) : (
+        ''
+      )}
+
       <ProFormText
         width="lg"
         name="invoiceIdentificationNumber"
@@ -80,20 +109,29 @@ export default ({ mainOrder, subOrders, isEdit, onClose }) =&gt; {
         placeholder="请输入开户银行账号"
         disabled
       />
-      <ProFormDatePicker
-        width="lg"
-        name="invoicingTime"
-        label="开票时间"
-        disabled={isEdit}
-        rules={[{ required: !isEdit ? true : false, message: '这是必填项' }]}
-        initialValue={subOrders[0].invoicingTime}
-      />
-      <ProFormDatePicker
-        width="lg"
-        name="collectMoneyTime"
-        label="收款时间"
-        initialValue={subOrders[0].collectMoneyTime}
-      />
+
+      {invoicingStatus !== 'UN_INVOICE'
+        ? [
+            <ProFormDatePicker
+              key="invoicingTime"
+              width="lg"
+              name="invoicingTime"
+              label="开票时间"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0].invoicingTime}
+            />,
+            <ProFormDatePicker
+              key="collectMoneyTime"
+              width="lg"
+              name="collectMoneyTime"
+              label="收款时间"
+              initialValue={subOrders[0].collectMoneyTime}
+            />,
+          ]
+        : ''}
  
       <ProFormTextArea
         width="lg"
@@ -2,7 +2,11 @@ import { postServiceOrderQueryHistoryOrderRecord } from &#39;@/services&#39;;
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd';
 import { useEffect, useState } from 'react';
-import { HISTORY_OPT_TYPE, ORDER_STATUS_OPTIONS } from '../constant';
+import {
+  FINANCIAL_STATUS_OPTIONS,
+  HISTORY_OPT_TYPE,
+  ORDER_STATUS_OPTIONS,
+} from '../constant';
  
 export default ({ subOrders, onClose }) => {
   let subOrderIds = subOrders?.map((subOrder: any) => {
@@ -88,7 +92,10 @@ export default ({ subOrders, onClose }) =&gt; {
                                 history.status,
                                 ORDER_STATUS_OPTIONS,
                               ) === undefined
-                                ? '已开票'
+                                ? enumValueToLabel(
+                                    history.status,
+                                    FINANCIAL_STATUS_OPTIONS,
+                                  )
                                 : enumValueToLabel(
                                     history.status,
                                     ORDER_STATUS_OPTIONS,
@@ -27,6 +27,7 @@ import { cloneDeep } from &#39;lodash&#39;;
 import { useEffect, useRef, useState } from 'react';
 import {
   INVOCING_STATUS_OPTIONS,
+  INVOCING_STATUS_OPTIONS_OLD,
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
@@ -44,6 +45,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     return orderOptType === type;
   }
  
+  /**
+   *
+   * @returns 获取开票选项
+   */
+  function getInvoicingSelect() {
+    if (optType('edit') || optType('copy')) {
+      return enumToSelect(INVOCING_STATUS_OPTIONS_OLD);
+    }
+    return enumToSelect(INVOCING_STATUS_OPTIONS);
+  }
+
   const fileList: any = [];
  
   useEffect(() => {
@@ -77,6 +89,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     });
   }
  
+  //复制的时候，如果是不需要开票，要把开票信息清空
+  if (optType('copy') && data.invoicingStatus === 'UN_INVOICE') {
+    data.invoiceIdentificationNumber = undefined;
+  }
+
   if (subOrders !== undefined && subOrders.length > 0) {
     data.list = subOrders;
   }
@@ -447,7 +464,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         name="invoicingStatus"
         width="lg"
         label="是否需要开票"
-        options={enumToSelect(INVOCING_STATUS_OPTIONS)}
+        options={getInvoicingSelect()}
         // disabled={mainInfoDisbled}
         onChange={(_, option) => {
           setInvoicingStatus(option.value);
@@ -13,6 +13,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   CASH_ON_DELIVERY: '货到付款',
   UNPAID: '未付款',
   PLATFORM_SETTLEMENT: '平台结算',
+  WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
 };
  
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -23,13 +24,19 @@ export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
   EXPERIMENTAL_CONSUMABLES: '实验耗材事业部门',
 };
  
-export const INVOCING_STATUS_OPTIONS = {
+export const INVOCING_STATUS_OPTIONS_OLD = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
   COMMON_INVOICED: '普票',
   INVOICED: '需要开票',
 };
  
+export const INVOCING_STATUS_OPTIONS = {
+  UN_INVOICE: '不需开票',
+  SPECIALLY_INVOICED: '专票',
+  COMMON_INVOICED: '普票',
+};
+
 export const INVOCING_STATUS = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
@@ -84,6 +91,11 @@ export const ORDER_STATUS_OPTIONS = {
   CONFIRM_RECEIPT: '确认收货',
 };
  
+export const FINANCIAL_STATUS_OPTIONS = {
+  INVOICING: '已开票',
+  UN_INVOICING: '取消开票',
+};
+
 export const TAGS_COLOR = new Map<string, string>([
   ['UN_INVOICE', 'success'],
   ['INVOICED', 'processing'],
@@ -153,6 +165,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['INVOICING', '财务开票'],
   ['EDIT_ORDER', '财务编辑'],
   ['MODIFY_SEN_INFORMATION', '发货信息编辑'],
+  ['UN_INVOICING', '财务取消开票'],
 ]);
  
 export const MAIN_ORDER_COLUMNS = [
@@ -266,7 +279,7 @@ export const MAIN_ORDER_COLUMNS = [
   {
     title: '创建日期',
     dataIndex: 'createTime',
-    valueType: 'dateRange',
+    valueType: 'dateTimeRange',
     hideInTable: true,
     search: {
       transform: (value) => {
@@ -441,6 +441,7 @@ const OrderPage = () =&gt; {
                 setIsFinalcialEdit(false);
                 setOrderRow(record);
                 setSelectedRows([optRecord]);
+                setIsMainOrder(false);
               }}
             >
               开票
@@ -615,6 +616,12 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">联系人：</span>
                     <span className="text-slate-700">
                       {record.institutionContactName + ' '}
+                    </span>
+                  </span>
+                  <span>
+                    <span className="text-[#8C8C8C]">收货人：</span>
+                    <span className="text-slate-700">
+                      {record.customerName + ' '}
                       <ContainerTwoTone
                         className="hover:curcor-pointer"
                         onClick={() => {
@@ -782,10 +789,14 @@ const OrderPage = () =&gt; {
                         let selectedSubOrders = selectedRowObj[record.id];
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
+                          setIsMainOrder(true);
                           setSelectedRows(record.subOrderInformationLists);
+                        } else {
+                          setIsMainOrder(false);
                         }
                         setOrderRow(record);
                         setFinancialVisible(true);
+                        setIsFinalcialEdit(false);
                       }}
                     >
                       开票
@@ -1196,10 +1207,13 @@ const OrderPage = () =&gt; {
           isEdit={isFinalcialEdit}
           mainOrder={orderRow}
           subOrders={selectedRows}
+          isMainOrder={isMainOrder}
           onClose={() => {
             setFinancialVisible(false);
             setOrderRow({});
             refreshTable();
+            setIsMainOrder(false);
+            setIsFinalcialEdit(false);
           }}
         />
       )}
+.order-statictis-card .ant-pro-card-body {
+  padding-top: 0;
+}
+
+.order-statictis-card {
+  height: 100%;
+}