Merge branch 'znh231124' into 'develop'

feat: update copyOrder,subOrderNotes See merge request !8

Merge branch 'znh231124' into 'develop'
feat: update copyOrder,subOrderNotes See merge request !8
zhongnanhuang
2 parents 1d3923f9 a7490fa1
Showing 11 changed files with 377 additions and 97 deletions
src/app.ts
src/pages/Login/index.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/components/SubOrderNotesEditModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/Order/type.d.ts
src/pages/OrderPrint/OrderPrintModal.tsx
src/services/request.ts
@@ -102,6 +102,10 @@ export const request: RequestConfig = {
           message.error(data.message);
         }
+        if (data.result === 401) {
+          history.push('/login');
+        }
+
         // do something
         return response;
       },
@@ -10,7 +10,7 @@ import {
   ProFormText,
 } from '@ant-design/pro-components';
 import { history, useModel } from '@umijs/max';
-import { theme } from 'antd';
+import { Button, theme } from 'antd';
 import { useEffect, useState } from 'react';
 export default () => {
@@ -41,9 +41,11 @@ export default () =&gt; {
                 data: { ...values, imgCaptchaUuid: uuid },
               });
-              setUserLocalInfo(res.data.token, res.data?.user);
               if (res.result === RESPONSE_CODE.SUCCESS) {
+                setUserLocalInfo(res.data.token, res.data?.user);
                 history.push('/order');
+              } else {
+                fetchCode();
               }
             }}
           >
@@ -96,6 +98,9 @@ export default () =&gt; {
                 fetchCode();
               }}
             />
+            <Button type="link" size="small" onClick={fetchCode}>
+              点击刷新
+            </Button>
             {/* <ProFormCheckbox noStyle name="autoLogin">
               自动登录
             </ProFormCheckbox> */}
@@ -2,15 +2,14 @@ import { RESPONSE_CODE } from &#39;@/constants/enum&#39;;
 import { postServiceOrderCheckOrder } from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
-export default ({ setCheckVisible, data, onClose }) => {
+export default ({ setCheckVisible, data, subOrders, onClose }) => {
   const [form] = Form.useForm<{ name: string; company: string }>();
   let subOrderIds: any[] = [];
-  const subOrderList = data.subOrderInformationLists;
   //是单条子订单审核
-  if (subOrderList === undefined) {
+  if (subOrders === null) {
     subOrderIds = [data.id];
   } else {
-    subOrderIds = subOrderList.map((subOrder) => subOrder.id);
+    subOrderIds = subOrders.map((subOrder) => subOrder.id);
   }
   async function doCheck(body: object) {
     const data = await postServiceOrderCheckOrder({
@@ -21,11 +21,11 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
     setData(propsData);
   }, [propsData]);
-  // const handleChange = (key: string, index: number) => (e) => {
-  //   const newData = cloneDeep(data);
-  //   newData[index][key] = e.target.value;
-  //   setData(newData);
-  // };
+  const handleChange = (key: string, index: number) => (e) => {
+    const newData = cloneDeep(data);
+    newData[index][key] = e.target.value;
+    setData(newData);
+  };
   const columns: ProColumns<any>[] = [
     {
       title: 'ID',
@@ -76,12 +76,11 @@ const DeliverModal = ({ data: propsData, onClose }) =&gt; {
       title: '物流单号',
       width: 150,
       key: 'serialNumber',
-      render: (_, record) => (
+      render: (_, record, index) => (
         <Input
           placeholder="请输入物流单号"
           value={record.serialNumber}
-          onChange={(event) => (record.serialNumber = event.target.value)}
-          // onChange={handleChange('productCode', index)}
+          onChange={handleChange('serialNumber', index)}
         />
       ),
     },
@@ -25,10 +25,25 @@ import {
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
 } from '../constant';
-export default ({ onClose, data, isAdd }) => {
+export default ({ onClose, data, subOrders, orderOptType }) => {
   const [invoicingStatus, setInvoicingStatus] = useState('');
-  if (!isAdd) {
+  /**
+   * 获取当前的操作类型boolean值
+   * @param type 操作类型，如果与当前匹配返回true
+   */
+  function optType(type: string) {
+    return orderOptType === type;
+  }
+
+  useEffect(() => {
+    // 在组件挂载或数据变化时，更新组件状态
+    if (data) {
+      setInvoicingStatus(data.invoicingStatus);
+    }
+  }, [data]);
+  let mainInfoDisbled = optType('edit');
+  if (optType('edit') || optType('copy')) {
     //订单修改和新增的子订单列表命名是list
     data.list = data.subOrderInformationLists;
     //主订单事业部默认显示子订单第一条的事业部
@@ -37,7 +52,9 @@ export default ({ onClose, data, isAdd }) =&gt; {
     data.paymentChannel = data.list[0].paymentChannel;
     data.invoicingStatus = data.list[0].invoicingStatus;
   }
-
+  if (subOrders !== undefined && subOrders.length > 0) {
+    data.list = subOrders;
+  }
   const [form] = Form.useForm<{
     salesCode: '';
     customerName: '';
@@ -98,14 +115,16 @@ export default ({ onClose, data, isAdd }) =&gt; {
   return (
     <DrawerForm<{
+      deleteSubOrderLists: any;
       name: string;
       company: string;
     }>
       open
       width="35%"
-      title={isAdd ? '新建订单' : '修改订单'}
+      title={optType('add') || optType('copy') ? '新建订单' : '修改订单'}
       initialValues={() => {
-        if (!isAdd) {
+        //编辑和复制回显数据
+        if (optType('edit') || optType('copy')) {
           return data;
         }
       }}
@@ -126,7 +145,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
       submitTimeout={2000}
       onFinish={async (values) => {
         let res = {};
-        if (isAdd) {
+        if (optType('add') || optType('copy')) {
           res = await postServiceOrderAddOrder({ data: values });
         } else {
           //计算已删除的子订单id
@@ -138,7 +157,10 @@ export default ({ onClose, data, isAdd }) =&gt; {
             return item.id;
           });
           console.log('curIds：' + curIds);
-          const diff = originIds.filter((item) => !curIds.includes(item));
+          let diff = originIds.filter((item) => !curIds.includes(item));
+          if (mainInfoDisbled) {
+            diff = [];
+          }
           values.deleteSubOrderLists = diff;
           res = await postServiceOrderUpdateOrder({ data: values });
         }
@@ -177,6 +199,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="收货人"
         placeholder="请输入收货人"
         rules={[{ required: true, message: '收货人必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -184,6 +207,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="联系方式"
         placeholder="请输入联系方式"
         rules={[{ required: true, message: '联系方式必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -191,6 +215,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="单位"
         placeholder="请输入单位"
         rules={[{ required: true, message: '单位必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -198,6 +223,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="单位联系人"
         placeholder="请输入单位联系人"
         rules={[{ required: true, message: '单位联系人必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormTextArea
         width="lg"
@@ -205,12 +231,14 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="收货地址"
         placeholder="请输入收货地址"
         rules={[{ required: true, message: '收货地址必填' }]}
+        disabled={mainInfoDisbled}
       />
-      <ProFormText
+      <ProFormDigit
         name="totalPayment"
         width="lg"
         label="支付总额（￥）"
         rules={[{ required: true, message: '支付总额必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入支付渠道"
@@ -219,6 +247,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="支付渠道"
         options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
         rules={[{ required: true, message: '支付渠道必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入支付方式"
@@ -227,6 +256,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="支付方式"
         options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
         rules={[{ required: true, message: '支付方式必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入所属事业部"
@@ -235,6 +265,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         label="所属事业部"
         options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
         rules={[{ required: true, message: '所属事业部必填' }]}
+        disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="选择是否需要开票"
@@ -242,28 +273,38 @@ export default ({ onClose, data, isAdd }) =&gt; {
         width="lg"
         label="是否需要开票"
         options={enumToSelect(INVOCING_STATUS_OPTIONS)}
+        disabled={mainInfoDisbled}
         onChange={(_, option) => {
+          console.log(option);
           setInvoicingStatus(option.value);
         }}
         rules={[{ required: true, message: '是否需要开票必填' }]}
       />
-      <ProFormText
-        width="lg"
-        name="invoiceIdentificationNumber"
-        label="开票信息"
-        hidden={invoicingStatus !== 'INVOICED'}
-        placeholder="请输入开票信息"
-        rules={[
-          {
-            required: invoicingStatus === 'INVOICED' ? true : false,
-            message: '开票信息必填',
-          },
-        ]}
-      />
-      {getUserInfo().roleSmallVO?.code === 'admin' ? (
+      {optType('add') || optType('copy') ? (
+        <ProFormText
+          width="lg"
+          name="invoiceIdentificationNumber"
+          label="开票信息"
+          disabled={mainInfoDisbled}
+          hidden={invoicingStatus !== 'INVOICED'}
+          placeholder="请输入开票信息"
+          rules={[
+            {
+              required: invoicingStatus === 'INVOICED' ? true : false,
+              message: '开票信息必填',
+            },
+          ]}
+        />
+      ) : (
+        ''
+      )}
+
+      {getUserInfo().roleSmallVO?.code === 'admin' &&
+      (optType('add') || optType('edit')) ? (
         <ProFormDateTimePicker
           width="lg"
           name="invoicingTime"
+          disabled={mainInfoDisbled}
           hidden={invoicingStatus === 'INVOICED'}
           label="开票时间"
           placeholder="请输入开票时间"
@@ -275,6 +316,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
         width="lg"
         name="bank"
         label="开户银行"
+        disabled={mainInfoDisbled}
         hidden={invoicingStatus !== 'INVOICED'}
         placeholder="请输入开户银行"
       />
@@ -283,12 +325,14 @@ export default ({ onClose, data, isAdd }) =&gt; {
         name="bankAccountNumber"
         hidden={invoicingStatus !== 'INVOICED'}
         label="银行账号"
+        disabled={mainInfoDisbled}
         placeholder="请输入银行账号"
       />
       <ProFormText
         width="lg"
         name="notes"
         label="备注"
+        disabled={mainInfoDisbled}
         placeholder="请输入备注"
       />
@@ -386,6 +430,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
       <h2>商品信息</h2>
       <ProFormList
+        creatorButtonProps={{ disabled: false }}
         name="list"
         label=""
         initialValue={[
@@ -432,7 +477,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
             >
               {[
                 <ProFormSelect
-                  key={listMeta.field.key}
+                  key="key"
                   label="商品名称"
                   width="lg"
                   showSearch
@@ -443,12 +488,18 @@ export default ({ onClose, data, isAdd }) =&gt; {
                     autoFillProductInfo(option, listMeta);
                   }}
                   request={async (value) => {
+                    console.log(value);
                     const { data } =
                       await postServiceOrderQueryProductInformation({
                         data: { productName: value.keyWords },
                       });
                     return data.map((p: any) => {
-                      return { ...p, label: p.productName, value: p.id };
+                      return {
+                        ...p,
+                        label: p.productName,
+                        value: p.productName,
+                        key: p.id,
+                      };
                     });
                   }}
                 />,
@@ -473,7 +524,7 @@ export default ({ onClose, data, isAdd }) =&gt; {
           label="商品参数"
           placeholder="请输入商品参数"
         />
-        <ProFormText
+        <ProFormDigit
           width="lg"
           name="quantity"
           label="商品数量"
@@ -503,12 +554,12 @@ export default ({ onClose, data, isAdd }) =&gt; {
           placeholder="请输入子订单金额"
           rules={[{ required: true, message: '子订单金额必填' }]}
         />
-        <ProFormText
+        {/* <ProFormText
           width="lg"
           name="serialNumber"
           label="物流单号"
           placeholder="请输入物流单号"
-        />
+        /> */}
         <ProFormText
           width="lg"
           name="notes"
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postServiceOrderDetails } from '@/services';
+import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+export default ({ setNotesEditVisible, data, 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: () => {
+          setNotesEditVisible(false);
+        },
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        let body = { id: data.id, notes: values.name };
+        const res = await postServiceOrderDetails({ data: body });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success(res.message);
+          onClose();
+        }
+      }}
+      onOpenChange={setNotesEditVisible}
+    >
+      <ProFormTextArea
+        width="lg"
+        name="name"
+        initialValue={data.notes}
+        placeholder="填写备注内容"
+      />
+    </ModalForm>
+  );
+};
@@ -20,8 +20,8 @@ export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
 };
 export const INVOCING_STATUS_OPTIONS = {
-  UN_INVOICE: '否',
-  INVOICED: '是',
+  UN_INVOICE: '不需开票',
+  INVOICED: '需要开票',
 };
 export const LOGISTICS_STATUS_OPTIONS = {
@@ -154,7 +154,7 @@ export const MAIN_ORDER_COLUMNS = [
     search: {
       transform: (value) => {
         return {
-          startTime: value[0],
+          beginTime: value[0],
           endTime: value[1],
         };
       },
@@ -175,8 +175,8 @@ export const MAIN_ORDER_COLUMNS = [
     search: {
       transform: (value) => {
         return {
-          startTime: value[0],
-          endTime: value[1],
+          invoicingBeginTime: value[0],
+          invoicingEndTime: value[1],
         };
       },
     },
@@ -5,7 +5,7 @@ import {
   postServiceOrderQueryServiceOrder,
 } from '@/services';
 import { orderExport } from '@/services/order';
-import { enumToProTableEnumValue, enumValueToLabel } from '@/utils';
+import { enumValueToLabel } from '@/utils';
 import { DownOutlined, EllipsisOutlined } from '@ant-design/icons';
 import {
   PageContainer,
@@ -33,6 +33,7 @@ import ConfirmReceiptModal from &#39;./components/ConfirmReceiptModal&#39;;
 import DeliverModal from './components/DeliverModal';
 import FinancialDrawer from './components/FinancialDrawer';
 import OrderDrawer from './components/OrderDrawer';
+import SubOrderNotesEditModal from './components/SubOrderNotesEditModal';
 import {
   INVOCING_STATUS_OPTIONS,
   LOGISTICS_STATUS_OPTIONS,
@@ -49,11 +50,12 @@ const OrderPage = () =&gt; {
   const [orderDrawerVisible, setOrderDrawerVisible] = useState<boolean>(false);
   const [checkVisible, setCheckVisible] = useState<boolean>(false);
   const [orderPrintVisible, setOrderPrintVisible] = useState<boolean>(false);
+  const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
   const [financialVisible, setFinancialVisible] = useState<boolean>(false);
   const [confirmReceiptVisible, setConfirmReceiptVisible] =
     useState<boolean>(false);
   const [deliverVisible, setDeliverVisible] = useState<boolean>(false);
-  const [isOrderAddOpt, setIsOrderAddOpt] = useState<boolean>(false);
+  const [orderOptType, setOrderOptType] = useState<string>('');
   const [isFinalcialEdit, setIsFinalcialEdit] = useState<boolean>(false);
   const [expandedRowKeys, setExpandedRowKeys] = useState<Key[]>([]);
   const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
@@ -66,12 +68,11 @@ const OrderPage = () =&gt; {
   const [selectedItems, setSelectedItems] = useState([]);
   const mainTableRef = useRef();
-  console.log(enumToProTableEnumValue(ORDER_STATUS_OPTIONS));
   const resize = () => {
     // 计算元素底部到视口顶部的距离
     let bottomDistance = document
       .getElementById('mainTable')
-      .getElementsByClassName('ant-table-thead')[0]
+      ?.getElementsByClassName('ant-table-thead')[0]
       .getBoundingClientRect().bottom;
     // 获取屏幕高度
     let screenHeight =
@@ -128,6 +129,30 @@ const OrderPage = () =&gt; {
               <div>订单编号：{record.id}</div>
             </Flex>
           </Checkbox>
+          <Space>
+            <div>销售代表：{record.salesCode}</div>
+
+            {rolePath?.includes('addOrder') ? (
+              <Button
+                type="primary"
+                size="small"
+                onClick={() => {
+                  setOrderOptType('copy');
+                  setOrderDrawerVisible(true);
+                  let copy = cloneDeep(record);
+                  copy.id = undefined;
+                  copy.subOrderInformationLists?.forEach((item) => {
+                    item.id = undefined;
+                  });
+                  setOrderRow(copy);
+                }}
+              >
+                复制
+              </Button>
+            ) : (
+              ''
+            )}
+          </Space>
         </Flex>
         {/* 收货、开票、备注信息 */}
         <Flex justify="space-between" className="px-2 py-4">
@@ -241,9 +266,34 @@ const OrderPage = () =&gt; {
                     className="p-0"
                     type="link"
                     onClick={() => {
+                      //勾选的子订单：如果有勾选，后面只校验有勾选的
+                      let selectedSubOrders = selectedRowObj[record.id];
+                      if (
+                        selectedSubOrders === undefined ||
+                        selectedSubOrders.length === 0
+                      ) {
+                        selectedSubOrders = record.subOrderInformationLists;
+                      }
+                      for (
+                        let index = 0;
+                        index < selectedSubOrders.length;
+                        index++
+                      ) {
+                        let orderStatus = selectedSubOrders[index].orderStatus;
+                        //是审核通过及之后的订单
+                        if (
+                          orderStatus !== 'UNAUDITED' &&
+                          orderStatus !== 'AUDIT_FAILED'
+                        ) {
+                          message.error(
+                            '请选择未审核或者审核失败的订单进行编辑',
+                          );
+                          return;
+                        }
+                      }
                       setOrderDrawerVisible(true);
                       setOrderRow(record);
-                      setIsOrderAddOpt(false);
+                      setOrderOptType('edit');
                     }}
                   >
                     编辑
@@ -257,6 +307,23 @@ const OrderPage = () =&gt; {
                     className="p-0"
                     type="link"
                     onClick={() => {
+                      console.log('!!!!!!!!!!!');
+                      let selectedSubOrders = selectedRowObj[record.id];
+                      setSelectedRows(selectedSubOrders);
+                      if (selectedSubOrders === undefined) {
+                        setSelectedRows(record.subOrderInformationLists);
+                      }
+                      for (let i = 0; i < selectedRows.length; i++) {
+                        if (
+                          selectedRows[i].orderStatus !== 'UNAUDITED' &&
+                          selectedRows[i].orderStatus !== 'AUDIT_FAILED'
+                        ) {
+                          message.error(
+                            '请选择未审核或者审核失败的子订单进行审核',
+                          );
+                          return;
+                        }
+                      }
                       setOrderRow(record);
                       setCheckVisible(true);
                     }}
@@ -329,15 +396,21 @@ const OrderPage = () =&gt; {
             if (item.component === 'tag') {
               return {
                 ...item,
-                render: (text: string) => {
+                render: (text: string, optRecord) => {
                   let label = enumValueToLabel(text, ORDER_STATUS_OPTIONS);
                   if (label === undefined) {
                     label = enumValueToLabel(text, INVOCING_STATUS_OPTIONS);
                   }
                   let color = 'gold';
-                  if (label === '已开票' || label === '已审核') {
+                  if (label === '需要开票' || label === '已审核') {
                     color = 'green';
                   }
+                  if (
+                    label === '需要开票' &&
+                    optRecord.invoicingTime !== undefined
+                  ) {
+                    label = '已开票';
+                  }
                   return <Tag color={color}>{label}</Tag>;
                 },
               };
@@ -469,6 +542,7 @@ const OrderPage = () =&gt; {
                       onClick={() => {
                         setOrderRow(optRecord);
                         setCheckVisible(true);
+                        setSelectedRows([optRecord]);
                       }}
                     >
                       审核
@@ -510,8 +584,15 @@ const OrderPage = () =&gt; {
               dataIndex: 'notes',
               key: 'notes',
               align: 'center',
-              render: () => (
-                <Button type="dashed" size="small">
+              render: (optTxt, optRecord) => (
+                <Button
+                  type="dashed"
+                  size="small"
+                  onClick={() => {
+                    setNotesEditVisible(true);
+                    setOrderRow(optRecord);
+                  }}
+                >
                   详情
                 </Button>
               ),
@@ -523,6 +604,8 @@ const OrderPage = () =&gt; {
               ...setSelectedRowObj,
               [record.id]: selectedRows,
             });
+            selectedRowObj[record.id] = selectedRows;
+            setSelectedRows(selectedRows);
           },
           // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
           // 注释该行则默认不显示下拉选项
@@ -599,14 +682,14 @@ const OrderPage = () =&gt; {
       onClick: () => {},
     };
-    if (rolePath.includes('addOrder')) {
+    if (rolePath?.includes('addOrder')) {
       toolBtns.push(
         <Button
           type="primary"
           key="out"
           onClick={() => {
             setOrderDrawerVisible(true);
-            setIsOrderAddOpt(true);
+            setOrderOptType('add');
           }}
         >
           新增
@@ -662,10 +745,10 @@ const OrderPage = () =&gt; {
                     history.push('/login');
                   },
                 },
-                {
-                  label: '修改密码',
-                  key: '2',
-                },
+                // {
+                //   label: '修改密码',
+                //   key: '2',
+                // },
               ],
             }}
           >
@@ -734,12 +817,13 @@ const OrderPage = () =&gt; {
       {orderDrawerVisible && (
         <OrderDrawer
           data={orderRow}
+          subOrders={selectedRows}
           onClose={() => {
             setOrderDrawerVisible(false);
             setOrderRow({});
             mainTableRef.current?.reload();
           }}
-          isAdd={isOrderAddOpt}
+          orderOptType={orderOptType}
         />
       )}
@@ -747,9 +831,23 @@ const OrderPage = () =&gt; {
         <CheckModal
           setCheckVisible={setCheckVisible}
           data={orderRow}
+          subOrders={selectedRows}
           onClose={() => {
             setCheckVisible(false);
             setOrderRow({});
+            setSelectedRows({});
+            mainTableRef.current?.reload();
+          }}
+        />
+      )}
+
+      {notesEditVisible && (
+        <SubOrderNotesEditModal
+          setNotesEditVisible={setNotesEditVisible}
+          data={orderRow}
+          onClose={() => {
+            setNotesEditVisible(false);
+            setOrderRow({});
             mainTableRef.current?.reload();
           }}
         />
@@ -15,43 +15,52 @@ export interface OrderType {
 }
 export interface OrderListItemType {
-  main_order_id: number;
-  sales_code: string;
-  customer_name: string;
-  customer_contact_number: string;
-  customer_shipping_address: string;
-  institution_contact_name: string;
+  mainPath: any;
+  totalPayment: ReactNode;
+  notes: ReactNode;
+  invoiceIdentificationNumber: ReactNode;
+  bankAccountNumber: ReactNode;
+  bank: ReactNode;
+  id: undefined;
+  subOrderInformationLists: any;
+  createTime: ReactNode;
+  mainOrderId: number;
+  salesCode: string;
+  customerName: string;
+  customerContactNumber: string;
+  customerShippingAddress: string;
+  institutionContactName: string;
   institution: string;
-  main_order_create_time: string;
-  main_order_update_time: string;
-  main_order_create_by_name: string;
-  main_order_update_by_name: any;
-  sub_orders: {
-    sub_order_id: number;
-    product_code: number;
-    product_name: string;
+  mainOrderCreateTime: string;
+  mainOrderUpdateTime: string;
+  mainOrderCreateByName: string;
+  mainOrderUpdateByName: any;
+  subOrders: {
+    subOrderId: number;
+    productCode: number;
+    productName: string;
     quantity: number;
-    product_price: number;
+    productPrice: number;
     unit: string;
     parameters: any;
-    total_payment: number;
-    sub_order_payment: number;
-    is_cancel: number;
-    logistics_status: string;
-    payment_status: string;
-    payment_method: string;
-    payment_channel: string;
-    payment_transaction_id: any;
-    invoice_information: any;
-    invoicing_status: string;
-    product_belong_department: string;
-    waybill_number: any;
+    totalPayment: number;
+    subOrderPayment: number;
+    isCancel: number;
+    logisticsStatus: string;
+    paymentStatus: string;
+    paymentMethod: string;
+    paymentChannel: string;
+    paymentTransactionId: any;
+    invoiceInformation: any;
+    invoicingStatus: string;
+    productBelongDepartment: string;
+    waybillNumber: any;
     notes: any;
-    examine_notes: any;
-    order_status: string;
-    sub_order_create_time: string;
-    sub_order_update_time: string;
-    sub_order_create_by_name: string;
-    sub_order_update_by_name: any;
+    examineNotes: any;
+    orderStatus: string;
+    subOrderCreateTime: string;
+    subOrderUpdateTime: string;
+    subOrderCreateByName: string;
+    subOrderUpdateByName: any;
   }[];
 }
@@ -77,8 +77,8 @@ export default ({ mainOrder, subOrders, onClose }) =&gt; {
           style={{ width: 'auto' }}
           onChange={handleChange}
           options={[
-            { value: 'Houjie', label: '科路得出货单' },
-            { value: 'Dalang', label: '大朗出货单' },
+            { value: 'Houjie', label: '科路得出货单-厚街' },
+            { value: 'Dalang', label: '科路得出货单-大朗' },
             { value: 'Zhuguang', label: '烛光出货单' },
           ]}
         />
@@ -5008,6 +5008,77 @@ export const postServiceOrderConfirmReceipt = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderDetails */
+export interface PostServiceOrderDetailsOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderDetails */
+export interface PostServiceOrderDetailsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderDetailsResponseSuccess =
+  PostServiceOrderDetailsResponse[200];
+/**
+ * @description
+ *   编辑订单详情(现在所有的角色在订单任何状态都可以进行修改)
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderDetails = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/details';
+  function request(
+    option: PostServiceOrderDetailsOption,
+  ): Promise<PostServiceOrderDetailsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderDetailsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderEditOrder */
 export interface PostServiceOrderEditOrderOption {
   /**