fix: 修复新增合同的代码合并出的bug

src/locales/en-US/contract.ts

@@ -516,4 +516,5 @@ export default {
    'contract.payRatio100': 'The payment ratio of all payment plans, must not exceed 100',
    'contract.verify.payAmount': 'The payment amount of all payment plans, which cannot exceed the total contract amount',
 
+   'contract.guanlianhetong': 'Affiliate Contracts'
 }

src/locales/ko-KR/contract.ts

@@ -521,4 +521,6 @@ export default {
    'contract.select':'계약 선택',
    'contract.payRatio100': '모든 지불 계획의 지불 비율은 100을 초과할 수 없습니다.',
    'contract.verify.payAmount': '전체 계약 금액을 초과할 수 없는 모든 지불 계획의 지불 금액',
+
+   'contract.guanlianhetong': '관련 계약'
 }

src/locales/zh-CN/contract.ts

@@ -535,5 +535,6 @@ export default {
   'contract.payRatio100': '全部付款计划付款比例，不得超过100',
   'contract.verify.payAmount': '全部付款计划付款金额，不得超过合同总金额',
 
+  'contract.guanlianhetong': '关联合同',
 
 }

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

@@ -8,7 +8,7 @@ import { getIntl } from 'umi';
 import FileHt from '@/pages/contract/components/fileHt';
 const intl = getIntl();
 const ContractText = (props: any) => {
-  const { currentRef, memberId,purchaseMate,roleId,basicsVO,currency,Price} = props;
+  const { currentRef, memberId, purchaseMate, roleId, basicsVO, currency, Price, tabIndex, getOtherInfo } = props;
   const [TemplatePage, setTemplatePage] = useState<any>([]);
   const [template, setTemplate] = useState<any>({});
   const [templateDemo, setTemplateDemo] = useState<any>({});

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

@@ -39,7 +39,7 @@ const layout: any = {
 };
 
 const Information = (props: any) => {
-  const { fetchdata, currentRef, Row, getrow, getmemberId, sourceType, getsourceType, getbasicsVO, getroleId,getcurrency, sourceWay } = props;
+  const { fetchdata, currentRef, Row, getrow, getmemberId, sourceType, getsourceType, getbasicsVO, getroleId, getcurrency, sourceWay, changeTabs } = props;
   const {
     state,
   } = history.location;
@@ -78,7 +78,7 @@ const Information = (props: any) => {
 
   const [businessTypeList, setBusinessTypeList] = useState<any>()
 
-  const [Currency,setCurrency]=useState<string>('')
+  const [Currency, setCurrency] = useState<string>('')
 
   /* 显示弹出 */
   const Choose = (sourceType?) => {
@@ -180,7 +180,7 @@ const Information = (props: any) => {
     basicsVO.arrivalArea = Row.arrivalArea ? Row.arrivalArea : undefined;
     basicsVO.arrivalAreaName = Row.arrivalAreaName ? Row.arrivalAreaName : undefined;
 
-    if(!_state?.demandPoolData){
+    if (!_state?.demandPoolData) {
       basicsVO.sourceType = Row.sourceType ? Row.sourceType + '' : '1';
       basicsVO.partyBName = Row.partyBName ? Row.partyBName : '';
       basicsVO.partyBMemberId = sourceType === '1' ? Row.awardRoleId ? Row.awardMemberId : '' : Row.partyBMemberId;
@@ -192,8 +192,8 @@ const Information = (props: any) => {
 
     getbasicsVO({
       ...basicsVO,
-      id:basicsVO?.contractId,
-      oldContractId:basicsVO?.contractId,
+      id: basicsVO?.contractId,
+      oldContractId: basicsVO?.contractId,
     })
 
     attrValueForm.setFieldsValue(basicsVO)

src/pages/contract/manage/add/contracAdd.tsx

@@ -51,8 +51,8 @@ const Add: React.FC<{}> = (props: any) => {
 
   const [payList, setPayList] = useState<any>()
 
-  const [memberId, setmemberId] = useState<string>('')
-  const [memberRoleId, setmemberRoleId] = useState<string>('')
+  const [memberId, setMemberId] = useState<string>('')
+  const [memberRoleId, setMemberRoleId] = useState<string>('')
   const [currency, setCurrency] = useState<any>({});
 
   //配送方式
@@ -61,6 +61,7 @@ const Add: React.FC<{}> = (props: any) => {
   const [purchasePaymentData, setPurchasePaymentData] = useState<any>()
 
   const [tabIndex, setTabIndex] = useState<number | string>(0);
+  const [roleId, setRoleId] = useState<string>('')
 
 
   /* 获取下拉框选中的id 查询物料 */
@@ -73,12 +74,12 @@ const Add: React.FC<{}> = (props: any) => {
 
   /* 获取供应商角色id */
   const getmemberId = (memberId, roleId) => {
-    setmemberId(memberId)
-    setmemberRoleId(roleId)
+    setMemberId(memberId)
+    setMemberRoleId(roleId)
   }
   /* 采购商会员关联id */
   const getroleId = (roleId) => {
-    setroleId(roleId)
+    setRoleId(roleId)
   }
 
   /* 采购商会员关联id */
@@ -162,6 +163,7 @@ const Add: React.FC<{}> = (props: any) => {
           changeTabs={changeTabs}
           getbasicsVO={getbasicsVO}
           fetchdata={basic}
+          getroleId={getroleId}
           getcurrency={getcurrency}
         />
     },
@@ -176,7 +178,7 @@ const Add: React.FC<{}> = (props: any) => {
           sourceType={type}
           deliveryType={deliveryType}
           getPurchaseData={getPurchaseData}
-          totalAmountChange={(num)=> setPrice(num)}
+          totalAmountChange={(num) => setPrice(num)}
         />
     },
     {
@@ -227,7 +229,8 @@ const Add: React.FC<{}> = (props: any) => {
           memberId={memberId}
           getOtherInfo={getOtherInfo}
           purchaseMate={purchaseMate}
-          roleId={memberRoleId}
+          // roleId={memberRoleId}
+          roleId={roleId}
           currency={currency}
           basicsVO={basic}
           Price={Price}
@@ -348,15 +351,19 @@ const Add: React.FC<{}> = (props: any) => {
   }
 
   useEffect(() => {
+    if(!sourceType){
+      sessionStorage.removeItem('recordList')
+      sessionStorage.removeItem('record')
+    }
     if (sourceType) {
       setType(sourceType)
       setRow(JSON.parse(sessionStorage.getItem('record')))
       setPrice(JSON.parse(sessionStorage.getItem('record')).totalAmount)
       const memberId = JSON.parse(sessionStorage.getItem('record'))?.partyBMemberId || JSON.parse(sessionStorage.getItem('record'))?.partyBMemberId
       const memberRoleId = JSON.parse(sessionStorage.getItem('record'))?.vendorRoleId || JSON.parse(sessionStorage.getItem('record'))?.partyBRoleId
-      setmemberId(memberId)
-      setmemberRoleId(memberRoleId)
-      setroleId(memberRoleId)
+      setMemberId(memberId)
+      setMemberRoleId(memberRoleId)
+      setRoleId(memberRoleId)
     }
 
     if (sourceType == 4) {
@@ -369,7 +376,7 @@ const Add: React.FC<{}> = (props: any) => {
     if (_state?.demandPoolData || _state?.demandPoolRows) {
       setType(4)
     }
-    
+
   }, [])
 
   const handleTabChange = (i) => {