Merge branch '0518' into 'jinfa-0518'

src/components/TableOperation/index.tsx

@@ -32,7 +32,7 @@ const TableOperation: React.FC<TableOperationProps> = (props) =>
   const { buttonTextFieldMap, operationHandler, buttonPermissionsMap = null, menuCode = null } = props
 
   const keyNames = Object.keys(buttonTextFieldMap)
-
+  console.log(buttonPermissionsMap, keyNames)
   return (<>
     {
       Object.values(buttonTextFieldMap).filter(Boolean).length > 2

src/constants/order.ts

@@ -14,6 +14,10 @@ const intl = getIntl();
 /** 订单类型 */
 
 /**
+ * 请购单合同
+ */
+ export const ORDER_TYPE_REQUISITION_CONTRACT = 14;
+/**
  * 询价采购
  */
 export const ORDER_TYPE_INQUIRYT_PURCHASE = 1;
@@ -144,7 +148,7 @@ export const DELIVERY_TYPE = ['',
 
 // 订单类型映射-Array形式
 export const ORDER_TYPE = ['',
-  intl.formatMessage({ id: 'constants.order.1' }, { default: '询价采购' }), 
+  intl.formatMessage({ id: 'constants.order.1' }, { default: '询价采购' }),
   intl.formatMessage({ id: 'constants.order.2' }, { default: '需求采购' }),
   intl.formatMessage({ id: 'constants.order.3' }, { default: '现货采购' }),
   intl.formatMessage({ id: 'constants.order.4' }, { default: '集采' }),

src/pages/afterService/utils.ts

@@ -10,6 +10,7 @@ import {
   ORDER_TYPE_BIDDING_CONTRACT,
   ORDER_TYPE_TENDER_CONTRACT,
   ORDER_TYPE_REQUISITION,
+  ORDER_TYPE_REQUISITION_CONTRACT,
 } from '@/constants/order';
 import { getMemberManageAftersaleReplacePage, getMemberManageUpperProviderMerchantPage } from '@/services/MemberV2Api';
 import BASE_CONFIG from '@/../config/base.config.json';
@@ -21,6 +22,7 @@ export const isMaterialOrder = (orderType: number) => {
     || orderType === ORDER_TYPE_BIDDING_CONTRACT
     || orderType === ORDER_TYPE_TENDER_CONTRACT
     || orderType === ORDER_TYPE_REQUISITION
+    || orderType === ORDER_TYPE_REQUISITION_CONTRACT
   )
 };
 

src/pages/transaction/purchaseRequisition/components/descriptionsInfo/index.tsx

@@ -37,6 +37,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({ cardTitle, type, styles })
         { title: intl.formatMessage({ id: 'purchaseRequisition.qinggoubumen:', defaultMessage: '请购部门:' }), name: 'department' },
         { title: "请购人:", name: 'requisitioner' },
         { title: "币别:", name: 'currencyName' },
+        { title: intl.formatMessage({ id: 'purchaseRequisition.spaNo:', defaultMessage: 'SAP需求编号:' }), name: 'sapNo' },
         { title: "内部状态:", name: 'innerStatusName' },
       ]
     },

src/pages/transaction/purchaseRequisition/increaseRequisition/components/editSalesman/index.tsx

 import React, { Fragment, useEffect, useState } from 'react';
 import { Modal, Form, Space, Input, Select, Button, Row, Col } from 'antd';
 import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
-import { getMemberUserSalesManList } from '@/services/MemberV2Api';
+import { getMemberUserPage, getMemberUserSalesManList } from '@/services/MemberV2Api';
 import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd';
 import { useIntl } from 'umi';
 
@@ -24,11 +24,11 @@ const EditSalesman: React.FC<MemberModalTableProps> = (props) => {
   const [form] = Form.useForm();
 
   useEffect(() => {
-    getMemberUserSalesManList().then(res => {
+    getMemberUserPage({pageSize: '9999', current: '1'} as any).then(res => {
       if (res.code !== 1000) {
         return
       }
-      setSalesManList(res.data)
+      setSalesManList(res.data.data)
     })
   }, [])
 

src/utils/defaultHomePath.ts

@@ -7,10 +7,10 @@ import { getAuth } from "./auth";
  */
 const defaultHomePath = (): string => {
   const userAuth = getAuth();
-  if (userAuth.urls.includes(SRM_PURCHASER_HOME_PATH)) {
+  if (userAuth.urls?.includes(SRM_PURCHASER_HOME_PATH)) {
     return SRM_PURCHASER_HOME_PATH;
   }
   return HOME_PATH;
 };
 
-export default defaultHomePath;
\ No newline at end of file
+export default defaultHomePath;