feat: update

zhongnanhuang
1 parent 6718e7eb
Showing 6 changed files with 172 additions and 85 deletions
src/pages/Order/components/DeliverModal.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/OrderPrint/OrderPrintModal.tsx
@@ -13,7 +13,12 @@ import { cloneDeep } from &#39;lodash&#39;;
 import { useEffect, useRef, useState } from 'react';
 import { LOGISTICS_STATUS_OPTIONS } from '../constant';
-const DeliverModal = ({ data: propsData, isSendProduct, onClose }) => {
+const DeliverModal = ({
+  data: propsData,
+  isSendProduct,
+  setVisible,
+  onClose,
+}) => {
   const [data, setData] = useState(propsData || {});
   const form = useRef();
@@ -69,7 +74,9 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
       dataIndex: 'packageNumber',
       render: (_, record, index) => (
         <InputNumber
+          min={1}
           value={record.packageNumber}
+          defaultValue={1}
           onChange={(value) => handleChange('packageNumber', index, value)}
         />
       ),
@@ -118,7 +125,8 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
             id: item.id,
             logisticsMethod: item.logisticsMethod,
             serialNumber: item.serialNumber,
-            packageNumber: item.packageNumber,
+            packageNumber:
+              item.packageNumber === undefined ? 1 : item.packageNumber,
           };
         });
         let body = { id: data[0].mainOrderId, list: list, flag: false };
@@ -133,7 +141,7 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
         }
       }}
       onCancel={() => {
-        onClose();
+        setVisible(false);
       }}
     >
       <strong>将物流方式和物流单号更新到下方所有订单</strong>
 import { postServiceOrderQueryHistoryOrderRecord } from '@/services';
 import { enumValueToLabel, formatDateTime } from '@/utils';
-import { Button, Col, Empty, Flex, Modal, Row } from 'antd';
+import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd';
 import { useEffect, useState } from 'react';
 import { HISTORY_OPT_TYPE, ORDER_STATUS_OPTIONS } from '../constant';
@@ -9,7 +9,8 @@ export default ({ subOrders, onClose }) =&gt; {
     return subOrder.id;
   });
   const [data, setData] = useState([]);
-  let i = 1;
+  const [loading, setLoading] = useState(true);
+  let i = 0;
   const handleOk = () => {
     onClose();
@@ -20,7 +21,7 @@ export default ({ subOrders, onClose }) =&gt; {
       data: { ids: subOrderIds },
     });
     setData(res.data);
-    console.log(data);
+    setLoading(false);
   };
   useEffect(() => {
@@ -36,6 +37,7 @@ export default ({ subOrders, onClose }) =&gt; {
       <Modal
         title="订单历史记录"
         open
+        width={650}
         onOk={handleOk}
         onCancel={handleCancel}
         footer={() => (
@@ -44,59 +46,69 @@ export default ({ subOrders, onClose }) =&gt; {
           </>
         )}
       >
-        <Row>
-          {data.map((item) => {
-            return (
-              <Col span={24} key="key">
-                <Flex vertical>
-                  <span className="py-2 text-[#5E5E5E]">{'商品' + i++}</span>
+        <Spin tip="加载中" spinning={loading}>
+          <Row className="max-h-[500px] overflow-auto" gutter={[0, 14]}>
+            {data.map((item) => {
+              return (
+                <Col span={24} key="key">
                   <Flex vertical>
-                    {item.historySubOrderRecordDto?.map((history) => {
-                      return (
-                        <div className="py-1" key="key">
-                          <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>
-                          ，
-                          {enumValueToLabel(
-                            history.status,
-                            ORDER_STATUS_OPTIONS,
-                          ) === undefined
-                            ? '子订单开票状态为'
-                            : '子订单状态为'}
-                          ：
-                          <span className="text-[#3b83e5]">
+                    <div>
+                      <span className="py-2 text-[#5E5E5E]">
+                        {'商品' + ++i}
+                      </span>
+                      <span className="text-[#8C8C8C]">
+                        -【{subOrders[i - 1].productName}】
+                      </span>
+                    </div>
+
+                    <Flex vertical>
+                      {item.historySubOrderRecordDto?.map((history) => {
+                        return (
+                          <div className="py-1" key="key">
+                            <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>
+                            ，
                             {enumValueToLabel(
                               history.status,
                               ORDER_STATUS_OPTIONS,
                             ) === undefined
-                              ? '已开票'
-                              : enumValueToLabel(
-                                  history.status,
-                                  ORDER_STATUS_OPTIONS,
-                                )}
-                          </span>
-                        </div>
-                      );
-                    })}
+                              ? '子订单开票状态为'
+                              : '子订单状态为'}
+                            ：
+                            <span className="text-[#3b83e5]">
+                              {enumValueToLabel(
+                                history.status,
+                                ORDER_STATUS_OPTIONS,
+                              ) === undefined
+                                ? '已开票'
+                                : enumValueToLabel(
+                                    history.status,
+                                    ORDER_STATUS_OPTIONS,
+                                  )}
+                            </span>
+                          </div>
+                        );
+                      })}
+                    </Flex>
                   </Flex>
-                </Flex>
-              </Col>
-            );
-          })}
-        </Row>
-        {data?.length <= 0 ? (
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-        ) : (
-          ''
-        )}
+                </Col>
+              );
+            })}
+          </Row>
+          {data?.length <= 0 ? (
+            <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+          ) : (
+            ''
+          )}
+        </Spin>
       </Modal>
     </>
   );
@@ -508,6 +508,12 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="备注"
         // disabled={mainInfoDisbled}
         placeholder="请输入备注"
+        rules={[
+          {
+            max: 120, // 最大长度为120个字符
+            message: '备注不能超过120个字符',
+          },
+        ]}
       />
       <h2>商品信息</h2>
@@ -730,6 +736,12 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   name="notes"
                   label="备注"
                   placeholder="请输入备注"
+                  rules={[
+                    {
+                      max: 120, // 最大长度为120个字符
+                      message: '备注不能超过120个字符',
+                    },
+                  ]}
                 />,
                 <>
                   <ProFormUploadDragger
@@ -27,6 +27,7 @@ export const INVOCING_STATUS_OPTIONS = {
   UN_INVOICE: '不需开票',
   SPECIALLY_INVOICED: '专票',
   COMMON_INVOICED: '普票',
+  INVOICED: '需要开票',
 };
 export const INVOCING_STATUS = {
@@ -86,6 +87,8 @@ export const ORDER_STATUS_OPTIONS = {
 export const TAGS_COLOR = new Map<string, string>([
   ['UN_INVOICE', 'success'],
   ['INVOICED', 'processing'],
+  ['SPECIALLY_INVOICED', 'processing'],
+  ['COMMON_INVOICED', 'processing'],
   ['AFTER_INVOICED', 'success'],
   ['UNAUDITED', 'warning'],
   ['AUDITED', 'processing'],
@@ -148,6 +151,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['PRINT_ORDER', '打印'],
   ['INVOICING', '财务开票'],
   ['EDIT_ORDER', '财务编辑'],
+  ['MODIFY_SEN_INFORMATION', '发货信息编辑'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -30,6 +30,7 @@ import {
   MenuProps,
   Space,
   Tag,
+  Tooltip,
   message,
 } from 'antd';
 import { cloneDeep } from 'lodash';
@@ -47,6 +48,7 @@ import OrderDrawer from &#39;./components/OrderDrawer&#39;;
 import OrderNotesEditModal from './components/OrderNotesEditModal';
 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
 import {
+  LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
   ORDER_STATUS_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
@@ -198,12 +200,18 @@ const OrderPage = () =&gt; {
       <Flex className="w-full border-b-indigo-500">
         <Flex vertical className="w-[31%]" gap="small">
           {/* 商品名称 */}
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={optRecord.productName}
+          >
             <span className="text-black font-medium ">
               {optRecord.productName}
             </span>
           </div>
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={optRecord.parameters}
+          >
             <span className="text-[#8C8C8C]">参数：{optRecord.parameters}</span>
           </div>
           <Flex title={optRecord.notes}>
@@ -224,15 +232,24 @@ const OrderPage = () =&gt; {
           </Flex>
         </Flex>
         <Flex className="w-[16%]" vertical gap="small">
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={optRecord.productPrice}
+          >
             <span className="text-[#8C8C8C]">单价：</span>
             <span className="text-slate-700">￥{optRecord.productPrice}</span>
           </div>
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={optRecord.quantity}
+          >
             <span className="text-[#8C8C8C]">数量：</span>
             <span className="text-slate-700">x{optRecord.quantity}</span>
           </div>
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={optRecord.subOrderPayment}
+          >
             <span className="text-[#8C8C8C]">合计：</span>
             <span className="text-slate-700">
               ￥{optRecord.subOrderPayment}
@@ -261,7 +278,13 @@ const OrderPage = () =&gt; {
         </Flex>
         <Flex className="w-[15%]" vertical gap="small">
           {/* 所属部门 */}
-          <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
+          <div
+            className="whitespace-no-wrap overflow-hidden overflow-ellipsis"
+            title={enumValueToLabel(
+              optRecord.productBelongBusiness,
+              PRODUCT_BELONG_DEPARTMENT_OPTIONS,
+            )}
+          >
             <span className="text-slate-700">
               {enumValueToLabel(
                 optRecord.productBelongBusiness,
@@ -300,9 +323,31 @@ const OrderPage = () =&gt; {
           {/* 物流信息 */}
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
-            <Button type="link" size="small" className="px-0">
-              物流信息
-            </Button>
+            {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
+            optRecord.orderStatus === 'SHIPPED' ? (
+              <Tooltip
+                color="#FFFFFF"
+                placement="bottom"
+                title={
+                  <div className="text-black px-5 py-4">
+                    {optRecord.serialNumber === undefined
+                      ? '暂无物流信息'
+                      : enumValueToLabel(
+                          optRecord.logisticsMethod,
+                          LOGISTICS_STATUS_OPTIONS,
+                        ) +
+                        '  ' +
+                        optRecord.serialNumber}
+                  </div>
+                }
+              >
+                <Button type="link" size="small" style={{ padding: 0 }}>
+                  物流信息
+                </Button>
+              </Tooltip>
+            ) : (
+              ''
+            )}
           </div>
         </Flex>
         <Flex className="w-[18%]" wrap="wrap" gap="small">
@@ -339,26 +384,6 @@ const OrderPage = () =&gt; {
             ''
           )}
-          {optRecord.subPath.includes('orderCancel') ? (
-            <ButtonConfirm
-              className="p-0"
-              title="确认作废？"
-              text="作废"
-              onConfirm={async () => {
-                let body = { ids: [optRecord.id], checkIsMainOrderId: false };
-                const data = await postServiceOrderOrderCancel({
-                  data: body,
-                });
-                if (data.result === RESPONSE_CODE.SUCCESS) {
-                  message.success(data.message);
-                  refreshTable();
-                }
-              }}
-            />
-          ) : (
-            ''
-          )}
-
           {optRecord.subPath.includes('modifySendInformation') ? (
             <Button
               className="p-0"
@@ -484,6 +509,26 @@ const OrderPage = () =&gt; {
           ) : (
             ''
           )}
+
+          {optRecord.subPath.includes('orderCancel') ? (
+            <ButtonConfirm
+              className="p-0"
+              title="确认作废？"
+              text="作废"
+              onConfirm={async () => {
+                let body = { ids: [optRecord.id], checkIsMainOrderId: false };
+                const data = await postServiceOrderOrderCancel({
+                  data: body,
+                });
+                if (data.result === RESPONSE_CODE.SUCCESS) {
+                  message.success(data.message);
+                  refreshTable();
+                }
+              }}
+            />
+          ) : (
+            ''
+          )}
         </Flex>
       </Flex>
     );
@@ -854,7 +899,7 @@ const OrderPage = () =&gt; {
           </Flex>
         </Flex>
-        <Flex className="p-0 py-[24px] pl-[23px] pr-[5px] bg-white rounded-b-lg">
+        <Flex className="p-0 pb-[24px] pt-[4px] pl-[23px] pr-[5px] bg-white rounded-b-lg">
           {expandedRowRender(record)}
         </Flex>
       </Flex>
@@ -1134,6 +1179,9 @@ const OrderPage = () =&gt; {
         <DeliverModal
           data={selectedRows}
           isSendProduct={isSendProduct}
+          setVisible={(b: boolean) => {
+            setDeliverVisible(b);
+          }}
           onClose={() => {
             setDeliverVisible(false);
             setOrderRow({});
@@ -1161,6 +1209,9 @@ const OrderPage = () =&gt; {
           mainOrder={orderRow}
           subOrders={selectedRows}
           isRePrint={isRePrintOrder}
+          setVisible={(b: boolean) => {
+            setOrderPrintVisible(b);
+          }}
           onClose={() => {
             setOrderPrintVisible(false);
             setOrderRow({});
@@ -10,7 +10,7 @@ import DalangPrinter from &#39;./components/DalangPrinter&#39;;
 import HoujiePrinter from './components/HoujiePrinter';
 import ZhuguangPrinter from './components/ZhuguangPrinter';
-export default ({ mainOrder, subOrders, isRePrint, onClose }) => {
+export default ({ mainOrder, subOrders, isRePrint, setVisible, onClose }) => {
   const [printerType, setPrinterType] = useState('Houjie');
   const { confirm } = Modal;
   const handleChange = (value: string) => {
@@ -67,7 +67,7 @@ export default ({ mainOrder, subOrders, isRePrint, onClose }) =&gt; {
         // onClose();
       }}
-      onCancel={() => onClose()}
+      onCancel={() => setVisible(false)}
       width={1000}
     >
       <Space direction="vertical" className="py-2">