feat: update

zhongnanhuang
1 parent 45673c12
Showing 4 changed files with 100 additions and 32 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -79,14 +79,14 @@ export default ({
   /**
    * 如果不是预付款的订单，并且付款公司未选中，那么默认选[任意]
    */
-  let paymentMethod = subOrders[0].paymentMethod;
-  let receivingCompany = subOrders[0].receivingCompany;
-  if (
-    paymentMethod !== 'PAYMENT_IN_ADVANCE' &&
-    (receivingCompany === null || receivingCompany === undefined)
-  ) {
-    form.setFieldValue('receivingCompany', 'ANY');
-  }
+  // let paymentMethod = subOrders[0].paymentMethod;
+  // let receivingCompany = subOrders[0].receivingCompany;
+  // if (
+  //   paymentMethod !== 'PAYMENT_IN_ADVANCE' &&
+  //   (receivingCompany === null || receivingCompany === undefined)
+  // ) {
+  //   form.setFieldValue('receivingCompany', 'ANY');
+  // }
  
   return (
     <ModalForm<{
@@ -12,7 +12,16 @@ import {
   ProFormText,
   ProTable,
 } from '@ant-design/pro-components';
-import { Button, Input, InputNumber, Modal, Select, message } from 'antd';
+import {
+  Button,
+  Col,
+  Input,
+  InputNumber,
+  Modal,
+  Row,
+  Select,
+  message,
+} from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 import { CHECK_TYPE, LOGISTICS_STATUS_OPTIONS } from '../constant';
@@ -56,39 +65,32 @@ const DeliverModal = ({
   const columns: ProColumns<any>[] = [
     {
       title: 'ID',
-      width: 80,
       dataIndex: 'id',
       render: (_, record) => <Input value={record.id} disabled />,
     },
     {
       title: '商品编号',
-      width: 80,
       dataIndex: 'productCode',
       render: (_, record) => <Input value={record.productCode} disabled />,
     },
     {
       title: '商品名称',
       dataIndex: 'productName',
-      align: 'right',
-      width: 80,
       render: (_, record) => <Input value={record.productName} disabled />,
     },
     {
       title: '商品参数',
       dataIndex: 'parameters',
-      align: 'right',
       width: 80,
       render: (_, record) => <Input value={record.parameters} disabled />,
     },
     {
       title: '商品数量',
-      width: 80,
       dataIndex: 'status',
       render: (_, record) => <InputNumber value={record.quantity} disabled />,
     },
     {
       title: '包裹数量',
-      width: 80,
       dataIndex: 'packageNumber',
       render: (_, record, index) => (
         <InputNumber
@@ -101,7 +103,6 @@ const DeliverModal = ({
     },
     {
       title: '物流方式',
-      width: 150,
       key: 'logisticsMethod',
       render: (_, record, index) => (
         <Select
@@ -110,14 +111,18 @@ const DeliverModal = ({
           value={record.logisticsMethod}
           options={enumToSelect(LOGISTICS_STATUS_OPTIONS)}
           onChange={(value) => {
-            handleChange('logisticsMethod', index, value);
-          }} //修改时更改record数据
+            handleChange('logisticsMethod', index, value); //修改时更改record数据
+            if (value === 'OTHER_LOGISTICS') {
+              message.info(
+                '您选择的是[其他物流方式]，请将该物流方式写在备注中',
+              );
+            }
+          }}
         />
       ),
     },
     {
       title: '物流单号',
-      width: 150,
       key: 'serialNumber',
       render: (_, record, index) => (
         <Input
@@ -129,6 +134,16 @@ const DeliverModal = ({
         />
       ),
     },
+    {
+      title: '物流备注',
+      dataIndex: 'packageNumber',
+      render: (_, record, index) => (
+        <Input.TextArea
+          value={record.logisticsNotes}
+          onChange={(value) => handleChange('logisticsNotes', index, value)}
+        />
+      ),
+    },
   ];
  
   return (
@@ -147,8 +162,23 @@ const DeliverModal = ({
               item.packageNumber === null || item.packageNumber === undefined
                 ? 1
                 : item.packageNumber,
+            logisticsNotes: item.logisticsNotes,
           };
         });
+
+        for (let item of list) {
+          let method = item.logisticsMethod;
+          let notes = item.logisticsNotes;
+          if (
+            method === 'OTHER_LOGISTICS' &&
+            (notes === '' || notes === undefined)
+          ) {
+            message.error(
+              '请检查：物流方式为[其他物流方式]的记录中，物流备注不能为空！请将实际的物流方式填写在备注中！',
+            );
+            return;
+          }
+        }
         let body = { id: data[0].mainOrderId, list: list, flag: false };
         if (isSendProduct) {
           body.flag = true;
@@ -179,23 +209,37 @@ const DeliverModal = ({
         className="mb-8"
         formRef={form}
       >
-        <ProFormSelect
-          placeholder="请输入物流方式"
-          name="logisticsMethod"
-          width="sm"
-          label="物流方式"
-          options={enumToSelect(LOGISTICS_STATUS_OPTIONS)}
-        />
-        <ProFormText name="serialNumber" label="物流单号"></ProFormText>
+        <Row gutter={[0, 6]}>
+          <Col>
+            <ProFormSelect
+              placeholder="请输入物流方式"
+              name="logisticsMethod"
+              width="sm"
+              label="物流方式"
+              options={enumToSelect(LOGISTICS_STATUS_OPTIONS)}
+            />
+            <ProFormText name="logisticsNotes" label="物流备注"></ProFormText>
+          </Col>
+          <Col>
+            <ProFormText name="serialNumber" label="物流单号"></ProFormText>
+          </Col>
+        </Row>
+
         <Button
           type="primary"
           onClick={() => {
             const values = form.current.getFieldsValue();
+            if (values.logisticsMethod === 'OTHER_LOGISTICS') {
+              message.info(
+                '自动填充成功！您选择的是其他物流方式，请将物流方式写在物流备注中！',
+              );
+            }
             let newData = cloneDeep(data);
             newData = newData.map((item) => ({
               ...item,
               logisticsMethod: values.logisticsMethod,
-              serialNumber: values.serialNumber, // 物流单号？
+              serialNumber: values.serialNumber,
+              logisticsNotes: values.logisticsNotes,
             }));
             setData(newData);
           }}
@@ -212,6 +256,7 @@ const DeliverModal = ({
         search={false}
         dateFormatter="string"
         options={false}
+        scroll={{ x: 1400 }}
       />
     </Modal>
   );
@@ -135,7 +135,7 @@ export const ORDER_STATUS_OPTIONS = {
   LEADER_AUDITED: '领导已审核',
   FINANCE_PROCESS: '财务已审核',
   AUDITED: '已审核',
-  PROCURE_UN_PROCESS: '采购未审核',
+  PROCURE_UN_PROCESS: '采购待审核',
   PROCURE_PROCESS: '采购已审核',
   PROCURE_PROCESS_FOR_MINE: '采购待打印',
   PROCURE_WAIT_SHIP: '采购待发货',
@@ -22,6 +22,7 @@ import { getUserInfo } from &#39;@/utils/user&#39;;
 import {
   ClockCircleTwoTone,
   ContainerTwoTone,
+  CopyOutlined,
   CopyTwoTone,
   DownOutlined,
   EditTwoTone,
@@ -723,7 +724,9 @@ const OrderPage = () =&gt; {
                           LOGISTICS_STATUS_OPTIONS,
                         ) +
                         '  ' +
-                        optRecord.serialNumber
+                        optRecord.serialNumber +
+                        '  ' +
+                        optRecord.logisticsNotes
                   }
                   content={
                     <Button type="link" size="small" style={{ padding: 0 }}>
@@ -1335,9 +1338,21 @@ const OrderPage = () =&gt; {
                       <span className="text-[#8C8C8C]">订单号：</span>
                       <span className="text-slate-700">{record.id}</span>
                     </div>
-                    <span>{formatDateTime(record.createTime)}</span>
                   </Space>
                 </Checkbox>
+                <Tooltip title="点击复制订单号">
+                  <CopyOutlined
+                    className="hover:cursor-pointer"
+                    style={{ color: '#8C8C8C' }}
+                    onClick={() => {
+                      copyToClipboard(record.id);
+                      message.info('订单号复制成功！');
+                    }}
+                  />
+                </Tooltip>
+                <Divider type="vertical" />
+                <span>{formatDateTime(record.createTime)}</span>
+                <Divider type="vertical" />
                 <Space split={<Divider type="vertical" />}>
                   <div>
                     <span className="text-[#8C8C8C]">代表：</span>
@@ -2355,6 +2370,14 @@ const OrderPage = () =&gt; {
       <Checkbox onChange={changeCancelOrderShow}>只看作废</Checkbox>,
     );
  
+    if (roleCode === 'warehouseKeeper') {
+      toolBtns.push(
+        <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
+          待审核
+        </Checkbox>,
+      );
+    }
+
     //采购可以筛选出需要处理的订单
     if (roleCode === 'procure') {
       toolBtns.push(