Merge branch 'znh' into 'develop'

feat: update See merge request !26

Merge branch 'znh' into 'develop'
feat: update See merge request !26
zhongnanhuang
2 parents ef0f521b 1abb1273
Showing 5 changed files with 289 additions and 128 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/pages/OrderPrint/OrderPrintModal.tsx
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderApplyInvoicing } from '@/services';
+import { getAliYunOSSFileNameFromUrl } from '@/utils';
 import {
   ModalForm,
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
-export default ({ setCheckVisible, subOrders, onClose }) => {
+import { cloneDeep } from 'lodash';
+export default ({ setCheckVisible, isEdit, subOrders, onClose }) => {
+  const subOrder = cloneDeep(subOrders[0]);
+  let newListAnnex = subOrder.afterAnnexList?.map((path) => {
+    let i = 0;
+    return {
+      uid: i++,
+      name: getAliYunOSSFileNameFromUrl(path),
+      status: 'uploaded',
+      url: path,
+      response: { data: [path] },
+    };
+  });
+
+  subOrder.filePaths = newListAnnex;
+
   const [form] = Form.useForm<{
     applyInvoicingNotes: string;
     filePaths: any;
     subIds: any[];
+    afterInvoicingUpdate: boolean;
   }>();
   let subOrderIds = subOrders?.map((subOrder) => subOrder.id);
@@ -19,10 +36,12 @@ export default ({ setCheckVisible, subOrders, onClose }) =&gt; {
       applyInvoicingNotes: string;
       filePaths: any;
       subIds: any[];
+      afterInvoicingUpdate: boolean;
     }>
       width={500}
       open
-      title="申请开票"
+      title={isEdit ? '修改信息' : '申请开票'}
+      initialValues={subOrder}
       form={form}
       autoFocusFirstInput
       modalProps={{
@@ -46,6 +65,12 @@ export default ({ setCheckVisible, subOrders, onClose }) =&gt; {
           return { url: item.response.data[0] };
         });
+        if (isEdit) {
+          values.afterInvoicingUpdate = true;
+        } else {
+          values.afterInvoicingUpdate = false;
+        }
+
         const res = await postServiceOrderApplyInvoicing({ data: values });
         if (res.result === RESPONSE_CODE.SUCCESS) {
@@ -6,10 +6,11 @@ import {
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Form, Modal, UploadFile, message } from 'antd';
 import Upload, { RcFile, UploadProps } from 'antd/es/upload';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { CHECK_TYPE, COMFIR_RECEIPT_IMAGES_NUMBER } from '../constant';
 // import { cloneDeep } from 'lodash';
 import { PlusOutlined } from '@ant-design/icons';
+import { cloneDeep } from 'lodash';
 export default ({
   setCheckVisible,
   data,
@@ -39,66 +40,66 @@ export default ({
     setFileList(newFileList);
   };
-  // /** 粘贴快捷键的回调 */
-  // const onPaste = async (e: any) => {
-  //   /** 获取剪切板的数据clipboardData */
-  //   let clipboardData = e.clipboardData,
-  //     i = 0,
-  //     items,
-  //     item,
-  //     types;
+  /** 粘贴快捷键的回调 */
+  const onPaste = async (e: any) => {
+    /** 获取剪切板的数据clipboardData */
+    let clipboardData = e.clipboardData,
+      i = 0,
+      items,
+      item,
+      types;
-  //   /** 为空判断 */
-  //   if (clipboardData) {
-  //     items = clipboardData.items;
-  //     if (!items) {
-  //       message.info('您的剪贴板中没有照片');
-  //       return;
-  //     }
+    /** 为空判断 */
+    if (clipboardData) {
+      items = clipboardData.items;
+      if (!items) {
+        message.info('您的剪贴板中没有照片');
+        return;
+      }
-  //     item = items[0];
-  //     types = clipboardData.types || [];
-  //     /** 遍历剪切板的数据 */
-  //     for (; i < types.length; i++) {
-  //       if (types[i] === 'Files') {
-  //         item = items[i];
-  //         break;
-  //       }
-  //     }
+      item = items[0];
+      types = clipboardData.types || [];
+      /** 遍历剪切板的数据 */
+      for (; i < types.length; i++) {
+        if (types[i] === 'Files') {
+          item = items[i];
+          break;
+        }
+      }
-  //     /** 判断文件是否为图片 */
-  //     if (item && item.kind === 'file' && item.type.match(/^image\//i)) {
-  //       const imgItem = item.getAsFile();
-  //       const newFileList = cloneDeep(fileListObj.current);
-  //       let filteredArray = newFileList.filter(
-  //         (obj) => obj.status !== 'removed',
-  //       ); //过滤掉状态为已删除的照片
-  //       const listItem = {
-  //         ...imgItem,
-  //         status: 'done',
-  //         url: await getBase64(imgItem),
-  //         originFileObj: imgItem,
-  //       };
+      /** 判断文件是否为图片 */
+      if (item && item.kind === 'file' && item.type.match(/^image\//i)) {
+        const imgItem = item.getAsFile();
+        const newFileList = cloneDeep(fileListObj.current);
+        let filteredArray = newFileList.filter(
+          (obj) => obj.status !== 'removed',
+        ); //过滤掉状态为已删除的照片
+        const listItem = {
+          ...imgItem,
+          status: 'done',
+          url: await getBase64(imgItem),
+          originFileObj: imgItem,
+        };
-  //       if (filteredArray.length >= COMFIR_RECEIPT_IMAGES_NUMBER) {
-  //         message.info('发货凭证照片数量不能超过3');
-  //         return;
-  //       }
-  //       fileListObj.current = filteredArray;
-  //       filteredArray.push(listItem);
-  //       setFileList(filteredArray);
-  //       return;
-  //     }
-  //   }
+        if (filteredArray.length >= COMFIR_RECEIPT_IMAGES_NUMBER) {
+          message.info('发货照片数量不能超过3');
+          return;
+        }
+        fileListObj.current = filteredArray;
+        filteredArray.push(listItem);
+        setFileList(filteredArray);
+        return;
+      }
+    }
-  //   message.info('您的剪贴板中没有照片');
-  // };
-  // useEffect(() => {
-  //   document.addEventListener('paste', onPaste);
-  //   return () => {
-  //     document.removeEventListener('paste', onPaste);
-  //   };
-  // }, []);
+    message.info('您的剪贴板中没有照片');
+  };
+  useEffect(() => {
+    document.addEventListener('paste', onPaste);
+    return () => {
+      document.removeEventListener('paste', onPaste);
+    };
+  }, []);
   const uploadButton = (
     <div>
       <PlusOutlined />
@@ -277,16 +278,14 @@ export default ({
           //附件处理
           console.log(fileList);
-          let fileUrls = fileList?.map((file) => {
-            return { url: file.response?.data[0] };
-          });
+
           //财务审核
-          return doFinancailCheck({
-            checkNotes: values.name,
-            ids: subOrderIds,
-            checkPassOrReject: true,
-            invoicingCheckAnnex: fileUrls,
-          });
+          // return doFinancailCheck({
+          //   checkNotes: values.name,
+          //   ids: subOrderIds,
+          //   checkPassOrReject: true,
+          //   invoicingCheckAnnex: fileUrls,
+          // });
         }}
         onOpenChange={setCheckVisible}
       >
@@ -275,12 +275,16 @@ export const MAIN_ORDER_COLUMNS = [
         data: { name: 'institution', institution: keywords },
         params: params,
       });
-      let options = data.map((c: any) => {
-        return {
-          label: c.orderValue,
-          value: c.orderValue,
-        };
-      });
+      let options = data
+        .filter((c: any) => {
+          return c.orderName === 'institution';
+        })
+        .map((item: any) => {
+          return {
+            label: item.orderValue,
+            value: item.orderValue,
+          };
+        });
       return options;
     },
   },
@@ -301,12 +305,16 @@ export const MAIN_ORDER_COLUMNS = [
         },
         params: params,
       });
-      let options = data.map((c: any) => {
-        return {
-          label: c.orderValue,
-          value: c.orderValue,
-        };
-      });
+      let options = data
+        .filter((c: any) => {
+          return c.orderName === 'institutionCustomerUser';
+        })
+        .map((item: any) => {
+          return {
+            label: item.orderValue,
+            value: item.orderValue,
+          };
+        });
       return options;
     },
   },
@@ -4,6 +4,7 @@ import {
   postServiceOrderAfterSalesCompletion,
   postServiceOrderNoNeedSend,
   postServiceOrderOrderCancel,
+  postServiceOrderProcurePrint,
   postServiceOrderQueryServiceOrder,
 } from '@/services';
 import { orderExport } from '@/services/order';
@@ -102,7 +103,7 @@ const OrderPage = () =&gt; {
   const [deliverInfoDrawerVisible, setDeliverInfoDrawerVisible] =
     useState<boolean>(false);
   const [orderOptType, setOrderOptType] = useState<string>('');
-  const [isFinalcialEdit, setIsFinalcialEdit] = useState<boolean>(false);
+  const [isEdit, setIsEdit] = useState<boolean>(false);
   const [expandedRowKeys, setExpandedRowKeys] = useState<Key[]>([]);
   const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
   const [mainOrderAllItemKeys, setMainOrderAllItemKeys] = useState([]);
@@ -117,6 +118,10 @@ const OrderPage = () =&gt; {
   const [currentPage, setCurrentPage] = useState(1);
   const [orderCheckType, setOrderCheckType] = useState('');
   const [onlyShowCancelOrder, setOnlyShowCancelOrder] = useState(false);
+  const [onlyShowProcureToBeProcessed, setOnlyShowProcureToBeProcessed] =
+    useState(false);
+  const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] =
+    useState(false);
   const mainTableRef = useRef();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   const [messageApi, contextHolder] = message.useMessage();
@@ -158,6 +163,16 @@ const OrderPage = () =&gt; {
     refreshTable();
   }
+  function changeProcureToBeProcessed(e: any) {
+    setOnlyShowProcureToBeProcessed(e.target.checked);
+    refreshTable();
+  }
+
+  function changeFinancialToBeProcessed(e: any) {
+    setOnlyShowFinancialToBeProcessed(e.target.checked);
+    refreshTable();
+  }
+
   // const resize = () => {
   //   // 计算元素底部到视口顶部的距离
   //   let bottomDistance = document
@@ -432,6 +447,7 @@ const OrderPage = () =&gt; {
               </div>
               {/* 编辑备注按钮 */}
               <EditTwoTone
+                className="pl-1 hover:curcor-pointer"
                 onClick={() => {
                   setNotesEditVisible(true);
                   setOrderRow(optRecord);
@@ -709,19 +725,36 @@ const OrderPage = () =&gt; {
             )}
             {optRecord.subPath?.includes('procurePrint') ? (
-              <Button
+              <ButtonConfirm
                 className="p-0"
-                type="link"
-                onClick={async () => {
-                  setOrderPrintVisible(true);
-                  setSelectedRows([optRecord]);
-                  setOrderRow(record);
-                  setOrderCheckType(CHECK_TYPE.PROCURE);
+                title="确认打印？"
+                text="采购打印"
+                onConfirm={async () => {
+                  let res = await postServiceOrderProcurePrint({
+                    data: {
+                      ids: [optRecord.id],
+                    },
+                  });
+
+                  if (res.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    refreshTable();
+                  }
                 }}
-              >
-                采购打印
-              </Button>
+              />
             ) : (
+              // <Button
+              //   className="p-0"
+              //   type="link"
+              //   onClick={async () => {
+              //     setOrderPrintVisible(true);
+              //     setSelectedRows([optRecord]);
+              //     setOrderRow(record);
+              //     setOrderCheckType(CHECK_TYPE.PROCURE);
+              //   }}
+              // >
+              //   采购打印
+              // </Button>
               ''
             )}
@@ -733,7 +766,7 @@ const OrderPage = () =&gt; {
                   setFinancialVisible(true);
                   setOrderRow(record);
                   setSelectedRows([optRecord]);
-                  setIsFinalcialEdit(true);
+                  setIsEdit(true);
                 }}
               >
                 编辑
@@ -747,7 +780,7 @@ const OrderPage = () =&gt; {
                 type="link"
                 onClick={() => {
                   setFinancialVisible(true);
-                  setIsFinalcialEdit(false);
+                  setIsEdit(false);
                   setOrderRow(record);
                   setSelectedRows([optRecord]);
                   setIsMainOrder(false);
@@ -766,6 +799,7 @@ const OrderPage = () =&gt; {
                 onClick={() => {
                   setApplyForInvoicingVisible(true);
                   setSelectedRows([optRecord]);
+                  setIsEdit(false);
                 }}
               >
                 申请开票
@@ -963,7 +997,7 @@ const OrderPage = () =&gt; {
                     placement="topLeft"
                   >
                     <span className="text-[#8C8C8C]">
-                      销售申请开票备注：
+                      申请开票备注：
                       {optRecord.applyInvoicingNotes === undefined ||
                       optRecord.applyInvoicingNotes === null
                         ? '暂无备注'
@@ -973,6 +1007,17 @@ const OrderPage = () =&gt; {
                 </div>
                 {getAfterAnnexList()}
+
+                <Tooltip title="编辑">
+                  <EditTwoTone
+                    className="pl-1 hover:curcor-pointer"
+                    onClick={() => {
+                      setApplyForInvoicingVisible(true);
+                      setSelectedRows([optRecord]);
+                      setIsEdit(true);
+                    }}
+                  />
+                </Tooltip>
               </div>
               <Divider type="vertical" className="mx-5" />
               <div className="flex items-center max-w-[500px]">
@@ -1114,7 +1159,7 @@ const OrderPage = () =&gt; {
               </div>
               <Tooltip title="编辑">
                 <EditTwoTone
-                  className="hover:curcor-pointer"
+                  className="pl-1 hover:curcor-pointer"
                   onClick={() => {
                     setNotesEditVisible(true);
                     setOrderRow(record);
@@ -1344,7 +1389,7 @@ const OrderPage = () =&gt; {
                         }
                         setOrderRow(record);
                         setFinancialVisible(true);
-                        setIsFinalcialEdit(false);
+                        setIsEdit(false);
                       }}
                     >
                       开票
@@ -1378,6 +1423,7 @@ const OrderPage = () =&gt; {
                           }
                         }
                         setApplyForInvoicingVisible(true);
+                        setIsEdit(false);
                       }}
                     >
                       申请开票
@@ -1674,22 +1720,58 @@ const OrderPage = () =&gt; {
                   )}
                   {record.mainPath?.includes('procurePrint') ? (
-                    <Button
+                    <ButtonConfirm
                       className="p-0"
-                      type="link"
-                      onClick={() => {
-                        if (!selectedRowObj[record.id]?.length) {
-                          return message.error('请选择选择子订单');
+                      title="确认打印？"
+                      text="采购打印"
+                      onConfirm={async () => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
+                          if (
+                            selectedSubOrders[i].orderStatus !==
+                            'PROCURE_PROCESS_FOR_MINE'
+                          ) {
+                            message.error(
+                              '请选择采购待打印状态的子订单进行打印',
+                            );
+                            return false;
+                          }
+                        }
+
+                        const ids = selectedSubOrders?.map((item) => {
+                          return item.id;
+                        });
+                        let res = await postServiceOrderProcurePrint({
+                          data: {
+                            ids: ids,
+                          },
+                        });
+
+                        if (res.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(res.message);
+                          refreshTable();
                         }
-                        setSelectedRows(selectedRowObj[record.id]);
-                        setOrderRow(record);
-                        setOrderPrintVisible(true);
-                        setOrderCheckType(CHECK_TYPE.PROCURE);
                       }}
-                    >
-                      采购打印
-                    </Button>
+                    />
                   ) : (
+                    // <Button
+                    //   className="p-0"
+                    //   type="link"
+                    //   onClick={() => {
+                    //     if (!selectedRowObj[record.id]?.length) {
+                    //       return message.error('请选择选择子订单');
+                    //     }
+                    //     setSelectedRows(selectedRowObj[record.id]);
+                    //     setOrderRow(record);
+                    //     setOrderPrintVisible(true);
+                    //     setOrderCheckType(CHECK_TYPE.PROCURE);
+                    //   }}
+                    // >
+                    //   采购打印
+                    // </Button>
                     ''
                   )}
                 </Space>
@@ -1722,12 +1804,38 @@ const OrderPage = () =&gt; {
   );
   function toolBarRender() {
+    let roleCode = userInfo?.roleSmallVO?.code;
     let toolBtns = [];
     toolBtns.push(
       <Checkbox onChange={changeCancelOrderShow}>只看作废</Checkbox>,
     );
+    //采购可以筛选出需要处理的订单
+    if (roleCode === 'procure') {
+      toolBtns.push(
+        <Checkbox onChange={changeProcureToBeProcessed}>只看需处理</Checkbox>,
+      );
+    }
+
+    //财务可以将需要处理的订单排序到前面
+    if (roleCode === 'finance') {
+      toolBtns.push(
+        <Checkbox onChange={changeFinancialToBeProcessed}>排序</Checkbox>,
+      );
+    }
+
+    if (roleCode === 'admin') {
+      toolBtns.push(
+        <Checkbox onChange={changeProcureToBeProcessed}>
+          只看需处理（采购）
+        </Checkbox>,
+      );
+      toolBtns.push(
+        <Checkbox onChange={changeFinancialToBeProcessed}>排序</Checkbox>,
+      );
+    }
+
     //导出按钮配置
     const items: MenuProps['items'] = [
       {
@@ -1920,7 +2028,6 @@ const OrderPage = () =&gt; {
           sorter,
           filter,
         ) => {
-          //保存这个搜索条件
           //订单id处理
           if (params.id !== '') {
             if (params.id?.indexOf(',')) {
@@ -1930,6 +2037,19 @@ const OrderPage = () =&gt; {
               });
             }
           }
+          //采购是否只查看需要自己处理的
+          if (onlyShowProcureToBeProcessed) {
+            params.condition = 10;
+          }
+
+          //财务是否只查看需要自己处理的
+          if (onlyShowFinancialToBeProcessed) {
+            params.condition = 20;
+          }
+
+          //是否只查看已作废
+          params.isDeleteQueryOrder = onlyShowCancelOrder;
+          //保存这个搜索条件
           setSearchParam(params);
           const { data } = await postServiceOrderQueryServiceOrder({
             // ...params,
@@ -1937,7 +2057,7 @@ const OrderPage = () =&gt; {
             // @ts-ignore
             sorter,
             filter,
-            data: { ...params, isDeleteQueryOrder: onlyShowCancelOrder },
+            data: { ...params },
           });
           let mainOrderIds = data?.data?.map((d) => d.id);
@@ -1992,6 +2112,7 @@ const OrderPage = () =&gt; {
         <ApplyForInvoicingModal
           setCheckVisible={setApplyForInvoicingVisible}
           subOrders={selectedRows}
+          isEdit={isEdit}
           onClose={() => {
             setApplyForInvoicingVisible(false);
             setSelectedRows({});
@@ -2032,7 +2153,7 @@ const OrderPage = () =&gt; {
       {financialVisible && (
         <FinancialDrawer
-          isEdit={isFinalcialEdit}
+          isEdit={isEdit}
           mainOrder={orderRow}
           subOrders={selectedRows}
           isMainOrder={isMainOrder}
@@ -2040,14 +2161,14 @@ const OrderPage = () =&gt; {
             setFinancialVisible(false);
             setOrderRow({});
             setIsMainOrder(false);
-            setIsFinalcialEdit(false);
+            setIsEdit(false);
           }}
           onClose={() => {
             setFinancialVisible(false);
             setOrderRow({});
             refreshTable();
             setIsMainOrder(false);
-            setIsFinalcialEdit(false);
+            setIsEdit(false);
           }}
         />
       )}
@@ -45,10 +45,10 @@ export default ({
       return;
     }
     confirm({
-      title: '确认打印出货单',
+      title: '打印出货单',
       icon: <ExclamationCircleFilled />,
-      content: '您是否已打印出货单？',
-      okText: '是的我已打印',
+      content: '请确认订单信息是否正确。点击打印后订单状态将变为待发货状态。',
+      okText: '打印',
       okType: 'primary',
       okButtonProps: {},
       cancelText: '取消',
@@ -80,6 +80,15 @@ export default ({
         }
         if (res.result === RESPONSE_CODE.SUCCESS) {
+          //printJS打印出货单
+          printJS({
+            printable: 'printArea', // 元素id,不支持多个
+            scanStyles: false,
+            type: 'html',
+            targetStyle: ['* '],
+            targetStyles: ['*'],
+            style: printerCSS(),
+          });
           message.success(res.message);
           onClose();
         }
@@ -96,19 +105,18 @@ export default ({
       centered
       open
       onOk={() => {
-        //printJS打印出货单
-        printJS({
-          printable: 'printArea', // 元素id,不支持多个
-          scanStyles: false,
-          type: 'html',
-          targetStyle: ['* '],
-          targetStyles: ['*'],
-          style: printerCSS(),
-          onPrintDialogClose: () => {
-            showPropsConfirm();
-          },
-        });
-
+        if (isRePrint) {
+          printJS({
+            printable: 'printArea', // 元素id,不支持多个
+            scanStyles: false,
+            type: 'html',
+            targetStyle: ['* '],
+            targetStyles: ['*'],
+            style: printerCSS(),
+          });
+          setVisible(false);
+        }
+        showPropsConfirm();
         // onClose();
       }}
       onCancel={() => setVisible(false)}