feat: update

zhongnanhuang
1 parent 0eb3d08e
Showing 5 changed files with 44 additions and 27 deletions
src/pages/Order/components/DeliverInfoDrawer.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/utils/order.ts
 import { enumValueToLabel } from '@/utils';
 import { getReceivingCompanyOptions } from '@/utils/order';
 import { Col, Drawer, Row } from 'antd';
+import { PAYEE_OPTIONS } from '../constant';
 export default ({ data, onClose }) => {
   console.log(data);
@@ -47,7 +48,7 @@ export default ({ data, onClose }) =&gt; {
           <Col span={18}>
             {enumValueToLabel(
               data.receivingCompany,
-              getReceivingCompanyOptions(),
+              getReceivingCompanyOptions(PAYEE_OPTIONS),
             )}
           </Col>
@@ -168,7 +168,7 @@ export default ({
                 销售申请开票时选择了：
                 {enumValueToLabel(
                   subOrders[0].receivingCompany,
-                  getReceivingCompanyOptions(),
+                  getReceivingCompanyOptions(PAYEE_OPTIONS),
                 )}
               </span>
               <span
@@ -520,7 +520,9 @@ export const MAIN_ORDER_COLUMNS = [
     dataIndex: 'receivingCompany',
     valueType: 'select',
     hideInTable: true,
-    valueEnum: enumToProTableEnumValue(getReceivingCompanyOptions()),
+    valueEnum: enumToProTableEnumValue(
+      getReceivingCompanyOptions(PAYEE_OPTIONS),
+    ),
   },
   {
     title: '开票日期',
@@ -77,6 +77,7 @@ import {
   LOGISTICS_STATUS_OPTIONS,
   MAIN_ORDER_COLUMNS,
   ORDER_STATUS_OPTIONS,
+  PAYEE_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
   PAYMENT_METHOD_OPTIONS,
   PROCURE_ORDER_STATUS,
@@ -146,6 +147,10 @@ const OrderPage = () =&gt; {
   const [onlyShowCancelOrder, setOnlyShowCancelOrder] = useState(false);
   const [onlyShowProcureToBeProcessed, setOnlyShowProcureToBeProcessed] =
     useState(false);
+  const [
+    showCurrentLeaderNeedAuditOrders,
+    setShowCurrentLeaderNeedAuditOrders,
+  ] = useState(false);
   const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map
   const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合
   const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] =
@@ -199,6 +204,11 @@ const OrderPage = () =&gt; {
     refreshTable();
   }
+  function changeShowCurrentLeaderNeedAuditOrders(e: any) {
+    setShowCurrentLeaderNeedAuditOrders(e.target.checked);
+    refreshTable();
+  }
+
   function changeFinancialToBeProcessed(e: any) {
     setOnlyShowFinancialToBeProcessed(e.target.checked);
     refreshTable();
@@ -1365,11 +1375,11 @@ const OrderPage = () =&gt; {
               </Flex>
             </Flex>
             <Flex className="pl-6" align="center">
-              {userInfo.roleSmallVO.code === 'finance' ? (
+              {userInfo?.roleSmallVO?.code === 'finance' ? (
                 <div
                   title={enumValueToLabel(
                     record.receivingCompany,
-                    getReceivingCompanyOptions(),
+                    getReceivingCompanyOptions(PAYEE_OPTIONS),
                   )}
                   className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[400px]"
                 >
@@ -1378,7 +1388,7 @@ const OrderPage = () =&gt; {
                     {record.receivingCompany !== null
                       ? enumValueToLabel(
                           record.receivingCompany,
-                          getReceivingCompanyOptions(),
+                          getReceivingCompanyOptions(PAYEE_OPTIONS),
                         )
                       : '暂无'}
                   </span>
@@ -1387,7 +1397,7 @@ const OrderPage = () =&gt; {
                 ''
               )}
-              {userInfo.roleSmallVO.code === 'finance' ? (
+              {userInfo?.roleSmallVO?.code === 'finance' ? (
                 <Divider type="vertical" />
               ) : (
                 ''
@@ -1803,8 +1813,8 @@ const OrderPage = () =&gt; {
                             selectedSubOrders[index].orderStatus;
                           //仓库管理员在审核之后的任何时候都可以编辑
                           if (
-                            userInfo.roleSmallVO.code !== 'warehouseKeeper' &&
-                            userInfo.roleSmallVO.code !== 'admin'
+                            userInfo?.roleSmallVO?.code !== 'warehouseKeeper' &&
+                            userInfo?.roleSmallVO?.code !== 'admin'
                           ) {
                             //是审核通过及之后的订单
                             if (
@@ -1820,7 +1830,7 @@ const OrderPage = () =&gt; {
                           } else {
                             //仓库管理员只能编辑是还未审核的订单
                             if (
-                              userInfo.roleSmallVO.code !== 'admin' &&
+                              userInfo?.roleSmallVO?.code !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
@@ -2312,7 +2322,7 @@ const OrderPage = () =&gt; {
        * 采购的订单状态筛选内容
        */
       if (
-        userInfo.roleSmallVO.code === 'procure' &&
+        userInfo?.roleSmallVO?.code === 'procure' &&
         item.dataIndex === 'orderStatus'
       ) {
         item.valueEnum = enumToProTableEnumValue(
@@ -2357,12 +2367,24 @@ const OrderPage = () =&gt; {
       toolBtns.push(
         <Checkbox onChange={changeFinancialToBeProcessed}>排序</Checkbox>,
       );
+
+      toolBtns.push(
+        <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
+          待审核
+        </Checkbox>,
+      );
     }
     if (roleCode === 'salesRepresentative' || roleCode === 'salesManager') {
       toolBtns.push(
         <Checkbox onChange={changeSalesCreateProcessed}>只看我创建</Checkbox>,
       );
+
+      toolBtns.push(
+        <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
+          待审核
+        </Checkbox>,
+      );
     }
     if (roleCode === 'admin') {
@@ -2672,6 +2694,10 @@ const OrderPage = () =&gt; {
           if (onlyShowSalesCreateProcessed) {
             params.condition = 30;
           }
+          //只看自己需要审核的订单
+          if (showCurrentLeaderNeedAuditOrders) {
+            params.condition = 40;
+          }
           //是否只查看已作废
           params.isDeleteQueryOrder = onlyShowCancelOrder;
-import { PAYEE_OPTIONS } from '@/pages/Order/constant';
 import { cloneDeep } from 'lodash';
-import { enumToSelect } from '.';
-
-export function getReceivingCompanyOptions() {
-  let payeeOprions = cloneDeep(PAYEE_OPTIONS);
-  payeeOprions.ANY = '任意';
-  return payeeOprions;
-}
-
-/**
- *
- * @returns 获取付款公司选项
- */
-export function getReceivingCompany() {
-  let options = enumToSelect(getReceivingCompanyOptions());
-  return options;
+export function getReceivingCompanyOptions(PAYEE_OPTIONS: any) {
+  let payeeOptions = cloneDeep(PAYEE_OPTIONS);
+  payeeOptions.ANY = '任意';
+  return payeeOptions;
 }