Merge branch 'feng-jinfa-20221102' into 'jinfa-20221102'

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts

@@ -71,11 +71,11 @@ const supplierSchema: ISchema = {
   },
 };
 
-// 过滤积分订单，渠道积分订单
+// 只要请购单合同订单，框架合同订单，询价合同订单，物料订单  让后端处理base.config
 const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
   label: item.platformWayName,
   value: item.id,
-})).filter((item) => (item.value !== ORDER_TYPE_POINTS && item.value !== ORDER_TYPE_CHANNEL_POINTS));
+}))
 
 export const addSchema = (orderType: number): ISchema => {
   const isMateriel = isMaterialOrder(orderType);

src/pages/contract/manage/add/components/BankInfo.tsx

@@ -3,6 +3,7 @@ import { useRef, useState, useEffect, forwardRef } from 'react';
 import StandardTable from '@/components/StandardTable';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import { getMemberAbilityMaintenanceMemberBankInfo } from '@/services/MemberV2Api';
+import { values } from 'lodash';
 
 
 const BankInfo = (props: any) => {
@@ -42,7 +43,10 @@ const BankInfo = (props: any) => {
         get: () => new Promise((resolve: any) => {
           resolve(contractBankInfoVO[0])
         }),
-        setSelectedRowKeys:RowCtl.setSelectedRowKeys
+        setSelectedRowKeys:(values)=>{
+          setContractBankInfoVO([values])
+          RowCtl.setSelectedRowKeys([values.bankAccount])
+        }
       }
     }
   })

src/pages/contract/manage/add/components/FormList.tsx

@@ -436,7 +436,7 @@ const FormList = (props: any) => {
         key: 'purchaseCount' + refresh,
         align: 'center',
         render: (text, record, index) =>
-          sourceType == 4
+          sourceType == 4 || sourceType == 5
             ? <Text>-</Text>
             :
             <Form.Item

src/pages/contract/manage/editing/components/FormList.tsx

@@ -83,7 +83,7 @@ const FormList = (props: any) => {
       key: 'purchaseCount',
       align: 'center',
       render: (text, record, index) =>
-        sourceType == 4 ?
+        sourceType == 4 || sourceType == 5 ?
           <>-</>
           :
           <Form.Item

src/pages/contract/manage/editing/index.tsx

@@ -84,7 +84,7 @@ const Editing: React.FC<{}> = (props: any) => {
         setPayPlanList(payPlanList)
         setContractText(contractText)
         setContractVersionVO(res.data?.contractVersionVO)
-        currentBank.current.setSelectedRowKeys([contractBankInfoVO.bankAccount])
+        currentBank.current.setSelectedRowKeys(contractBankInfoVO)
       }
     }).catch((err) => {
 

src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx

@@ -67,7 +67,6 @@ const fetchOrderMode = async () => {
   const { data } = await getOrderBuyerCreatePageItems()
   const { orderModes } = data
   return orderModes.filter(item => !([
-    OrderModalType.FRAME_CONTRACT_ORDER,
     OrderModalType.INQUIRY_QUOTATION_ORDER,
     OrderModalType.PURCHASE_BIDDING_CONTRACT_ORDER,
     OrderModalType.PURCHASE_TENDER_CONTRACT_ORDER,