Merge branch 'znh231206' into 'develop'

1208 See merge request !12

Merge branch 'znh231206' into 'develop'
1208 See merge request !12
zhongnanhuang
2 parents 1430dc10 deed1a0c
Showing 8 changed files with 241 additions and 68 deletions
.umirc.ts
src/app.ts
src/pages/Order/components/AttachmentModal.tsx
src/pages/Order/components/DeliverInfoDrawer.tsx
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.less
src/pages/Order/index.tsx
@@ -13,9 +13,9 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      target: 'http://localhost:8085/',
+      // target: 'http://localhost:8085/',
       // target: 'http://192.168.1.6:8085/',
-      // target: 'http://39.108.227.113:8085/',
+      target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
@@ -12,7 +12,7 @@ import &#39;./style/global.css&#39;;
 // 更多信息见文档：https://umijs.org/docs/api/runtime-config#getinitialstate
 export async function getInitialState(): Promise<{ name: string }> {
   // getUserInfo();
-  return { name: '@umijs/max' };
+  return { name: '' };
 }
 export const layout = () => {
 import { getAliYunOSSFileNameFromUrl } from '@/utils';
 import { ModalForm, ProFormUploadDragger } from '@ant-design/pro-components';
-import { Button, Form } from 'antd';
+import { Button, Empty, Form } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useState } from 'react';
@@ -52,28 +52,32 @@ export default ({ data, onClose }) =&gt; {
         },
       }}
     >
-      <ProFormUploadDragger
-        name="listAnnex"
-        action="/api/service/order/fileProcess"
-        disabled
-        fieldProps={{
-          headers: { Authorization: localStorage.getItem('token') },
-          // onRemove: (file) => {
-          //   const index = fileList[listMeta.index].indexOf(file);
-          //   console.log(index);
-          //   const newFileList = fileList.slice();
-          //   newFileList.splice(index, 1);
-          //   setFileList(newFileList);
-          // },
-          // beforeUpload: (file) => {
-          //   fileList[listMeta.index] = [...fileList[listMeta.index], file as RcFile];
-          //   setFileList(fileList);
-          //   return true;
-          // },
-          fileList,
-          // defaultFileList: itemFileList
-        }}
-      />
+      {newListAnnex?.length <= 0 ? (
+        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+      ) : (
+        <ProFormUploadDragger
+          name="listAnnex"
+          action="/api/service/order/fileProcess"
+          disabled
+          fieldProps={{
+            headers: { Authorization: localStorage.getItem('token') },
+            // onRemove: (file) => {
+            //   const index = fileList[listMeta.index].indexOf(file);
+            //   console.log(index);
+            //   const newFileList = fileList.slice();
+            //   newFileList.splice(index, 1);
+            //   setFileList(newFileList);
+            // },
+            // beforeUpload: (file) => {
+            //   fileList[listMeta.index] = [...fileList[listMeta.index], file as RcFile];
+            //   setFileList(fileList);
+            //   return true;
+            // },
+            fileList,
+            // defaultFileList: itemFileList
+          }}
+        />
+      )}
     </ModalForm>
   );
 };
+import { Col, Drawer, Row } from 'antd';
+
+export default ({ data, onClose }) => {
+  console.log(data);
+  return (
+    <>
+      <Drawer
+        width={500}
+        title="基本信息"
+        placement="right"
+        onClose={onClose}
+        open
+      >
+        <Row gutter={[16, 24]}>
+          <Col span={6}>
+            <span className="text-[#333333]">收货人</span>
+          </Col>
+          <Col span={18}>{data.customerName}</Col>
+          <Col span={6}>
+            <span className="className='text-[#333333]'">联系方式</span>
+          </Col>
+          <Col span={18}>{data.customerContactNumber}</Col>
+
+          <Col span={6}>
+            <span className="className='text-[#333333]'">收货地址</span>
+          </Col>
+          <Col span={18}>{data.customerShippingAddress}</Col>
+
+          <Col span={6}>
+            <span className="className='text-[#333333]'">单位联系人</span>
+          </Col>
+          <Col span={18}>{data.institutionContactName}</Col>
+          <Col span={6}>
+            <span className="className='text-[#333333]'">单位名称</span>
+          </Col>
+          <Col span={18}>{data.institution}</Col>
+          <Col span={6}>
+            <span className="className='text-[#333333]'">开户银行</span>
+          </Col>
+          <Col span={18}>{data.bank}</Col>
+
+          <Col span={6}>
+            <span className="className='text-[#333333]'">银行账号</span>
+          </Col>
+          <Col span={18}>{data.bankAccountNumber}</Col>
+          <Col span={6}>
+            <span className="className='text-[#333333]'">开票识别号</span>
+          </Col>
+          <Col span={18}>{data.invoiceIdentificationNumber}</Col>
+        </Row>
+      </Drawer>
+    </>
+  );
+};
 import { postServiceOrderQueryHistoryOrderRecord } from '@/services';
-import { Button, Modal, Timeline } from 'antd';
+import { enumValueToLabel, formatDateTime } from '@/utils';
+import { Button, Col, Empty, Flex, Modal, Row } from 'antd';
+import { useEffect, useState } from 'react';
+import { HISTORY_OPT_TYPE, ORDER_STATUS_OPTIONS } from '../constant';
 export default ({ subOrders, onClose }) => {
   let subOrderIds = subOrders?.map((subOrder: any) => {
     return subOrder.id;
   });
+  const [data, setData] = useState([]);
+  let i = 1;
   const handleOk = () => {
     onClose();
@@ -14,9 +19,13 @@ export default ({ subOrders, onClose }) =&gt; {
     let res = await postServiceOrderQueryHistoryOrderRecord({
       data: { ids: subOrderIds },
     });
-    console.log(res);
+    setData(res.data);
+    console.log(data);
   };
-  getHistory();
+
+  useEffect(() => {
+    getHistory();
+  }, []);
   const handleCancel = () => {
     onClose();
@@ -35,23 +44,59 @@ export default ({ subOrders, onClose }) =&gt; {
           </>
         )}
       >
-        <Timeline
-          className="pt-10"
-          items={[
-            {
-              children: 'Create a services site 2015-09-01',
-            },
-            {
-              children: 'Solve initial network problems 2015-09-01',
-            },
-            {
-              children: 'Technical testing 2015-09-01',
-            },
-            {
-              children: 'Network problems being solved 2015-09-01',
-            },
-          ]}
-        />
+        <Row>
+          {data.map((item) => {
+            return (
+              <Col span={24} key="key">
+                <Flex vertical>
+                  <span className="py-2 text-[#5E5E5E]">{'商品' + i++}</span>
+                  <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]">
+                            {enumValueToLabel(
+                              history.status,
+                              ORDER_STATUS_OPTIONS,
+                            ) === undefined
+                              ? '已开票'
+                              : enumValueToLabel(
+                                  history.status,
+                                  ORDER_STATUS_OPTIONS,
+                                )}
+                          </span>
+                        </div>
+                      );
+                    })}
+                  </Flex>
+                </Flex>
+              </Col>
+            );
+          })}
+        </Row>
+        {data?.length <= 0 ? (
+          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+        ) : (
+          ''
+        )}
       </Modal>
     </>
   );
@@ -98,6 +98,18 @@ export const SALES_CODE_OPTIONS = [
   { label: 'JJ', value: 'JJ' },
 ];
+export const HISTORY_OPT_TYPE = new Map<string, string>([
+  ['DELETE', '作废'],
+  ['UPDATE', '编辑'],
+  ['ADD', '创建'],
+  ['SEND', '发货'],
+  ['CHECK', '审核'],
+  ['CONFIRM_RECEIPT', '确认收货'],
+  ['PRINT_ORDER', '打印'],
+  ['INVOICING', '财务开票'],
+  ['EDIT_ORDER', '财务编辑'],
+]);
+
 export const MAIN_ORDER_COLUMNS = [
   {
     title: '订单列表',
 // 嵌套表格去掉左方多余部分
-.ant-table .ant-table-middle {
+.order-page-container .ant-table .ant-table-middle {
   margin-inline: 0 !important;
 }
-td {
+.order-page-container td {
   font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
     'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
     'WenQuanYi Micro Hei', sans-serif;
@@ -15,9 +15,9 @@ td {
   padding: 0 !important;
 }
-table:hover,
-tr:hover,
-thead:hover {
+.order-page-container table:hover,
+.order-page-container tr:hover,
+.order-page-container thead:hover {
   background: none !important;
 }
@@ -25,7 +25,7 @@ thead:hover {
   background: none !important;
 }
-.ant-pro-card {
+.order-page-container .ant-pro-card {
   background-color: transparent;
 }
@@ -33,15 +33,26 @@ thead:hover {
   padding: 10px 0 0;
 }
+.order-page-container .ant-pagination {
+  background-color: #fff !important;
+  padding: 10px;
+  border-radius: 8px;
+}
+
+.order-page-container .ant-pro-table .ant-form {
+  background-color: #fff;
+  border-radius: 8px;
+}
+
 #main-table .ant-table-tbody {
   background-color: #f5f5f5;
 }
-.ant-pro-card-body {
+.order-page-container .ant-pro-card-body {
   padding: 0 !important;
 }
-.ant-table-thead .ant-table-cell {
+.order-page-container .ant-table-thead .ant-table-cell {
   background-color: #fff !important;
   border-radius: 8px !important;
 }
@@ -8,6 +8,7 @@ import { orderExport } from &#39;@/services/order&#39;;
 import { enumValueToLabel, formatDateTime } from '@/utils';
 import {
   ClockCircleTwoTone,
+  ContainerTwoTone,
   CopyTwoTone,
   DownOutlined,
   EditTwoTone,
@@ -37,6 +38,7 @@ import OrderPrintModal from &#39;../OrderPrint/OrderPrintModal&#39;;
 import AttachmentModal from './components/AttachmentModal';
 import CheckModal from './components/CheckModal';
 import ConfirmReceiptModal from './components/ConfirmReceiptModal';
+import DeliverInfoDrawer from './components/DeliverInfoDrawer';
 import DeliverModal from './components/DeliverModal';
 import FinancialDrawer from './components/FinancialDrawer';
 import HistoryModal from './components/HistoryModal';
@@ -77,6 +79,8 @@ const OrderPage = () =&gt; {
   const [confirmReceiptVisible, setConfirmReceiptVisible] =
     useState<boolean>(false);
   const [deliverVisible, setDeliverVisible] = useState<boolean>(false);
+  const [deliverInfoDrawerVisible, setDeliverInfoDrawerVisible] =
+    useState<boolean>(false);
   const [orderOptType, setOrderOptType] = useState<string>('');
   const [isFinalcialEdit, setIsFinalcialEdit] = useState<boolean>(false);
   const [expandedRowKeys, setExpandedRowKeys] = useState<Key[]>([]);
@@ -198,11 +202,14 @@ const OrderPage = () =&gt; {
             </span>
           </div>
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
-            <span className="text-gray-500">参数：{optRecord.parameters}</span>
+            <span className="text-[#8C8C8C]">参数：{optRecord.parameters}</span>
           </div>
           <Flex title={optRecord.notes}>
             <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
-              <span className="text-gray-500">备注：{optRecord.notes}</span>
+              <span className="text-[#8C8C8C]">
+                备注：
+                {optRecord.notes === undefined ? '暂无备注' : optRecord.notes}
+              </span>
             </div>
             <EditTwoTone
               onClick={() => {
@@ -215,15 +222,15 @@ const OrderPage = () =&gt; {
         </Flex>
         <Flex className="w-[16%]" vertical gap="small">
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
-            <span className="text-gray-500">单价：</span>
+            <span className="text-[#8C8C8C]">单价：</span>
             <span className="text-slate-700">￥{optRecord.productPrice}</span>
           </div>
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
-            <span className="text-gray-500">数量：</span>
+            <span className="text-[#8C8C8C]">数量：</span>
             <span className="text-slate-700">x{optRecord.quantity}</span>
           </div>
           <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
-            <span className="text-gray-500">合计：</span>
+            <span className="text-[#8C8C8C]">合计：</span>
             <span className="text-slate-700">
               ￥{optRecord.subOrderPayment}
             </span>
@@ -306,6 +313,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();
+                }
+              }}
+            />
+          ) : (
+            ''
+          )}
+
           {optRecord.subPath.includes('modifySendInformation') ? (
             <Button
               className="p-0"
@@ -498,7 +525,7 @@ const OrderPage = () =&gt; {
                 >
                   <Space split={<Divider type="vertical" />}>
                     <div>
-                      <span className="text-gray-500">订单号：</span>
+                      <span className="text-[#8C8C8C]">订单号：</span>
                       <span className="text-slate-700">{record.id}</span>
                     </div>
                     <span>{formatDateTime(record.createTime)}</span>
@@ -506,17 +533,24 @@ const OrderPage = () =&gt; {
                 </Checkbox>
                 <Space split={<Divider type="vertical" />}>
                   <div>
-                    <span className="text-gray-500">代表：</span>
+                    <span className="text-[#8C8C8C]">代表：</span>
                     <span className="text-slate-700">{record.salesCode}</span>
                   </div>
                   <span>
-                    <span className="text-gray-500">单位：</span>
+                    <span className="text-[#8C8C8C]">单位：</span>
                     <span className="text-slate-700">{record.institution}</span>
                   </span>
                   <span>
-                    <span className="text-gray-500">联系人：</span>
+                    <span className="text-[#8C8C8C]">联系人：</span>
                     <span className="text-slate-700">
-                      {record.institutionContactName}
+                      {record.institutionContactName + ' '}
+                      <ContainerTwoTone
+                        className="hover:curcor-pointer"
+                        onClick={() => {
+                          setDeliverInfoDrawerVisible(true);
+                          setOrderRow(record);
+                        }}
+                      />
                     </span>
                   </span>
                 </Space>
@@ -525,8 +559,10 @@ const OrderPage = () =&gt; {
             <Flex className="pl-6" align="center">
               <div title={record.notes}>
                 <div className="max-w-md whitespace-no-wrap overflow-hidden overflow-ellipsis">
-                  <span className="text-gray-500">备注：</span>
-                  <span className="ml-2">{record.notes}</span>
+                  <span className="text-[#8C8C8C]">备注：</span>
+                  <span className="ml-2">
+                    {record.notes === undefined ? '暂无备注' : record.notes}
+                  </span>
                 </div>
               </div>
               <EditTwoTone
@@ -543,7 +579,7 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Flex wrap="wrap" gap="middle" align="center">
                 <div>
-                  <span className="text-gray-500">总金额：￥</span>
+                  <span className="text-[#8C8C8C]">总金额：￥</span>
                   <span className="text-lg font-medium">
                     {record.totalPayment}
                   </span>
@@ -764,7 +800,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath.includes('OrderCancel') ? (
+                  {record.mainPath.includes('orderCancel') ? (
                     <ButtonConfirm
                       className="p-0"
                       title="确认作废？"
@@ -925,6 +961,7 @@ const OrderPage = () =&gt; {
   return (
     <PageContainer
+      className="order-page-container"
       header={{
         title: '订单管理',
         extra: [
@@ -1154,6 +1191,16 @@ const OrderPage = () =&gt; {
         />
       )}
+      {deliverInfoDrawerVisible && (
+        <DeliverInfoDrawer
+          data={orderRow}
+          onClose={() => {
+            setDeliverInfoDrawerVisible(false);
+            setOrderRow({});
+          }}
+        />
+      )}
+
       {contextHolder}
     </PageContainer>
   );