feat: update 附件名称显示优化

zhongnanhuang
1 parent 4fa3b887
Showing 8 changed files with 132 additions and 32 deletions
src/access.ts
src/pages/Order/components/AfterSalesDrawer.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/ImportModal.tsx
src/pages/Order/components/ProcureCheckModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/utils/index.ts
@@ -3,7 +3,6 @@ export default (initialState: API.UserInfo) =&gt; {
   // 参考文档 https://umijs.org/docs/max/access
   const { roleSmallVO } = initialState;
  
-  console.log(roleSmallVO?.code === 'admin');
   return {
     canReadAdmin: roleSmallVO?.code === 'admin',
     canReadProcure: roleSmallVO?.code === 'procure',
@@ -6,6 +6,7 @@ import {
   ProFormDigit,
   ProFormSelect,
   ProFormTextArea,
+  ProFormUploadDragger,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
 import { AFTE_SALES_PLAN_OPTIONS } from '../constant';
@@ -13,12 +14,14 @@ export default ({ setVisible, mainOrder, subOrders, onClose }) =&gt; {
   let subOrderIds = subOrders?.map((item: { id: any }) => {
     return item.id;
   });
+
   let mainOrderId = mainOrder.id;
   const [form] = Form.useForm<{
     afterSalesNotes: string;
     afterSalesPlan: string;
     ids: [];
     totalPayment: number;
+    filePaths: any[];
   }>();
  
   return (
@@ -28,6 +31,7 @@ export default ({ setVisible, mainOrder, subOrders, onClose }) =&gt; {
       subOrderIds: [];
       totalPayment: number;
       mainId: number;
+      filePaths: any[];
     }>
       title="申请售后"
       open
@@ -49,6 +53,9 @@ export default ({ setVisible, mainOrder, subOrders, onClose }) =&gt; {
       onFinish={async (values) => {
         values.subOrderIds = subOrderIds;
         values.mainId = mainOrderId;
+        values.filePaths = values.filePaths?.map((file) => {
+          return { url: file.response.data[0] };
+        });
         let res = await postServiceOrderApplyAfterSales({ data: values });
         if (res?.result === RESPONSE_CODE.SUCCESS) {
           message.success(res.message);
@@ -80,6 +87,15 @@ export default ({ setVisible, mainOrder, subOrders, onClose }) =&gt; {
         name="afterSalesNotes"
         rules={[{ required: true, message: '售后原因必填' }]}
       />
+      <ProFormUploadDragger
+        key="filePaths"
+        label="附件"
+        name="filePaths"
+        action="/api/service/order/fileProcess"
+        fieldProps={{
+          headers: { Authorization: localStorage.getItem('token') },
+        }}
+      />
     </DrawerForm>
   );
 };
@@ -32,10 +32,8 @@ export default ({
       reader.onerror = (error) => reject(error);
     });
   const [fileList, setFileList] = useState<UploadFile[]>([]);
-  const [uploading, setUploading] = useState(false);
   const handleCancel = () => setPreviewOpen(false);
   const [messageApi, contextHolder] = message.useMessage();
-  console.log(uploading);
   const handleChange: UploadProps['onChange'] = ({ fileList: newFileList }) => {
     //fileListObj得在change里变化，change的参数是已经处理过的file数组
     //beforeUpload中的参数file是未处理过，还需要Base64拿到文件数据处理
@@ -295,7 +293,6 @@ export default ({
                     let values = { name: form.getFieldValue('name') };
                     doFinancailCheck(values, false);
                   }
-                  setUploading(false);
                 }}
               >
                 驳回
@@ -47,7 +47,6 @@ export default ({ onClose }) =&gt; {
       },
     });
  
-    console.log(res);
     if (res.result === RESPONSE_CODE.SUCCESS) {
       message.success(res.message);
       onClose();
@@ -95,6 +95,10 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
+        if (values.name === '0') {
+          message.error('选择转回仓库请点击转回仓库按钮！');
+          return;
+        }
         let procureIsPrintAndSend = false;
         if (values.name === '采购自行发货') {
           procureIsPrintAndSend = true;
@@ -117,9 +121,11 @@ export default ({ setCheckVisible, data, subOrders, onClose }) =&gt; {
         rules={[{ required: true, message: '供应商必填' }]}
         request={async () => {
           const res = await postServiceOrderQuerySupplier();
-          return res.data?.map((item) => {
+          let options = res.data?.map((item) => {
             return { label: item, value: item };
           });
+          options.push({ label: '转回仓库', value: '0' });
+          return options;
         }}
       />
     </ModalForm>
@@ -191,7 +191,7 @@ export const SALES_CODE_OPTIONS = [
   { label: 'X-Lulu', value: 'X-Lulu' },
   { label: 'X-P', value: 'X-P' },
   { label: 'TB', value: 'TB' },
-  { label: 'HCTB', value: 'HCTB' },
+  { label: 'TBHC', value: 'TBHC' },
   { label: 'TBC', value: 'TBC' },
   { label: 'G-Lisa', value: 'G-Lisa' },
   { label: 'G-Lynn', value: 'G-Lynn' },
@@ -46,7 +46,7 @@ import {
   message,
 } from 'antd';
 import { cloneDeep } from 'lodash';
-import { Key, useRef, useState } from 'react';
+import React, { Key, useRef, useState } from 'react';
 import OrderPrintModal from '../OrderPrint/OrderPrintModal';
 import AfterSalesDrawer from './components/AfterSalesDrawer';
 import ApplyForInvoicingModal from './components/ApplyForInvoicingModal';
@@ -332,6 +332,7 @@ const OrderPage = () =&gt; {
       if (orderStatus === 'AUDIT_FAILED') {
         return (
           <MyToolTip
+            key="key"
             title={optRecord.checkNotes}
             content={
               <>
@@ -357,6 +358,7 @@ const OrderPage = () =&gt; {
       ) {
         return (
           <MyToolTip
+            key="key"
             title={
               enumValueToLabel(
                 optRecord.afterSalesPlan,
@@ -386,6 +388,7 @@ const OrderPage = () =&gt; {
       if (orderStatus === 'PROCURE_CONVERT_WAREHOUSE_KEEPER') {
         return (
           <MyToolTip
+            key="key"
             title={optRecord.checkNotes}
             content={
               <>
@@ -406,7 +409,7 @@ const OrderPage = () =&gt; {
       }
  
       return (
-        <Tag color={TAGS_COLOR.get(optRecord.orderStatus)}>
+        <Tag key="key" color={TAGS_COLOR.get(optRecord.orderStatus)}>
           {enumValueToLabel(optRecord.orderStatus, ORDER_STATUS_OPTIONS)}
         </Tag>
       );
@@ -420,7 +423,7 @@ const OrderPage = () =&gt; {
       if (afterAnnexList?.length > 0) {
         for (let url of afterAnnexList) {
           links.push(
-            <a className="pl-2" href={url}>
+            <a key={i} className="pl-2" href={url}>
               附件{i++}
             </a>,
           );
@@ -443,11 +446,11 @@ const OrderPage = () =&gt; {
                 console.log(`current index: ${current}, prev index: ${prev}`),
             }}
           >
-            {invoicingCheckAnnexList.map((url) => (
-              <>
+            {invoicingCheckAnnexList.map((url, index) => (
+              <React.Fragment key={index}>
                 <Image className="max-h-[50px] max-w-[70px]" src={url} />{' '}
                 <Divider type="vertical" />
-              </>
+              </React.Fragment>
             ))}
           </Image.PreviewGroup>
         </div>
@@ -892,6 +895,23 @@ const OrderPage = () =&gt; {
               ''
             )}
  
+            {optRecord.subPath?.includes('afterSalesCheck') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setOrderRow(optRecord);
+                  setCheckVisible(true);
+                  setSelectedRows([optRecord]);
+                  setOrderCheckType(CHECK_TYPE.AFTER_SALES);
+                }}
+              >
+                售后审核
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('financeCheckOrder') ? (
               <Button
                 className="p-0"
@@ -1327,6 +1347,37 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space>
+                  {record.mainPath?.includes('procureConvertProcure') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+
+                        setSelectedRows(selectedSubOrders);
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
+                          if (
+                            !selectedSubOrders[i].subPath.includes(
+                              'procureConvertProcure',
+                            )
+                          ) {
+                            message.error('请选择允许转发的子订单进行转发');
+                            return;
+                          }
+                        }
+                        setSelectedRows(selectedSubOrders);
+                        setOrderCheckType(CHECK_TYPE.PROCURE);
+                        setProcureConvertModalVisible(true);
+                      }}
+                    >
+                      转发
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('sendProduct') ? (
                     <Button
                       className="p-0"
@@ -1596,7 +1647,6 @@ const OrderPage = () =&gt; {
                         if (selectedSubOrders === undefined) {
                           setSelectedRows(record.subOrderInformationLists);
                         }
-                        console.log(selectedRows);
                         for (let i = 0; i < selectedRows.length; i++) {
                           if (
                             selectedRows[i].orderStatus !== 'UNAUDITED' &&
@@ -1617,7 +1667,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
  
-                  {record.mainPath?.includes('') ? (
+                  {record.mainPath?.includes('afterSalesCheck') ? (
                     <Button
                       className="p-0"
                       type="link"
@@ -1628,8 +1678,10 @@ const OrderPage = () =&gt; {
                           setSelectedRows(record.subOrderInformationLists);
                         }
                         for (let i = 0; i < selectedRows.length; i++) {
-                          if (selectedRows[i].orderStatus !== 'UNAUDITED') {
-                            message.error('请选择未审核的子订单进行审核');
+                          if (
+                            selectedRows[i].orderStatus !== 'IN_AFTER_SALES'
+                          ) {
+                            message.error('请选择售后中的子订单进行审核');
                             return;
                           }
                         }
@@ -1702,10 +1754,6 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
                           setSelectedRows(record.subOrderInformationLists);
-                          console.log(
-                            'subOrderInformationLists：' +
-                              record.subOrderInformationLists,
-                          );
                         }
                         for (let i = 0; i < selectedRows.length; i++) {
                           if (
@@ -1737,10 +1785,6 @@ const OrderPage = () =&gt; {
                         setSelectedRows(selectedSubOrders);
                         if (selectedSubOrders === undefined) {
                           setSelectedRows(record.subOrderInformationLists);
-                          console.log(
-                            'subOrderInformationLists：' +
-                              record.subOrderInformationLists,
-                          );
                         }
                         for (let i = 0; i < selectedRows.length; i++) {
                           if (
@@ -1790,7 +1834,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
  
-                  {record.mainPath?.includes('afterSalesCompletion') ? (
+                  {/* {record.mainPath?.includes('afterSalesCompletion') ? (
                     <ButtonConfirm
                       className="p-0"
                       title="售后是否已完成？"
@@ -1832,7 +1876,7 @@ const OrderPage = () =&gt; {
                     />
                   ) : (
                     ''
-                  )}
+                  )} */}
  
                   {record.mainPath?.includes('orderCancel') ? (
                     <ButtonConfirm
@@ -1942,8 +1986,10 @@ const OrderPage = () =&gt; {
   );
  
   //判断是否是采购，是的话新增一个筛选条件
-  console.log(userInfo?.roleSmallVO?.code === 'procure');
-  if (userInfo?.roleSmallVO?.code === 'procure') {
+  if (
+    userInfo?.roleSmallVO?.code === 'procure' ||
+    userInfo?.roleSmallVO?.code === 'admin'
+  ) {
     mainOrdersColumns.push({
       title: '采购下单状态',
       dataIndex: 'procureOrderStatus',
@@ -67,7 +67,6 @@ function formatdate(inputDateTime: string) {
 }
  
 function formatSalesCode(salesCode: any) {
-  console.log('in');
   let newSalesCode = salesCode;
   if (newSalesCode.indexOf('_')) {
     newSalesCode = newSalesCode.split('_');
@@ -123,7 +122,15 @@ function appendFormData(formData: any, data: any, parentKey = null) {
     }
   }
 }
-
+function getName(str: string) {
+  let parts = str.split('-');
+  if (parts.length < 2) {
+    return null; // 字符串不包含'-'
+  }
+  let namePart = parts.slice(2).join('-') || parts[1];
+  let name = namePart.replace(/^\d+/, ''); // 移除名字前的数字
+  return name;
+}
 function getAliYunOSSFileNameFromUrl(url: string) {
   try {
     // 使用URL对象解析链接
@@ -135,7 +142,15 @@ function getAliYunOSSFileNameFromUrl(url: string) {
  
     // 检查文件名是否包含至少一个点（.）以确保是一个合法的文件名
     if (fileName.includes('.')) {
-      return fileName;
+      let originName = getName(fileName);
+      if (
+        originName === '' ||
+        originName === undefined ||
+        originName === null
+      ) {
+        return url;
+      }
+      return decodeURIComponent(originName);
     } else {
       throw new Error('Invalid file name in the URL');
     }
@@ -188,6 +203,27 @@ function copyToClipboard(text: string) {
   }
 }
  
+/**
+ * 按照前两个-，分割为数组
+ * @param str 字符串处理
+ * @returns
+ */
+function splitByFirstTwoDashes(str: string) {
+  let index1 = str.indexOf('-');
+  if (index1 === -1) {
+    return [str];
+  }
+  let index2 = str.indexOf('-', index1 + 1);
+  if (index2 === -1) {
+    return [str.slice(0, index1), str.slice(index1 + 1)];
+  }
+  return [
+    str.slice(0, index1),
+    str.slice(index1 + 1, index2),
+    str.slice(index2 + 1),
+  ];
+}
+
 export {
   appendFormData,
   blobToFile,
@@ -202,5 +238,6 @@ export {
   formatdate,
   getAliYunOSSFileNameFromUrl,
   getUserInfo,
+  splitByFirstTwoDashes,
   transImageFile,
 };