fix: bug

src/pages/contract/components/detailCard/PaymentCard/index.tsx

@@ -51,9 +51,8 @@ const PaymentCard: React.FC<Iprops> = ({
   const purchaseColumns = [
     {
       title: intl.formatMessage({ id: 'contract.advance' }),
-      dataIndex: 'AdvanceChargeEnum',
+      dataIndex: 'advanceChargeName',
       align: 'left',
-      render: (text)=> <>{text == 1 ? '需要预付' : '无需预付'}</>
     },
     {
       title: intl.formatMessage({ id: 'contract.paymentClause' }),

src/pages/contract/contractexecution/details/index.tsx

@@ -184,7 +184,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: contractCoordinationSourceVO.currencyTypeName ? contractCoordinationSourceVO.currencyTypeName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractCoordinationSourceVO.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${contractCoordinationSourceVO.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractCoordinationSourceVO.totalAmount ? `${contractCoordinationSourceVO.totalAmount}` : '' },
             { label: intl.formatMessage({ id: 'contract.portDestination' }), extra: contractCoordinationSourceVO.arrivalPortName ? contractCoordinationSourceVO.arrivalPortName : '', },
           ]
         }

src/pages/contract/coordination/details/components/PurchaseList.tsx

@@ -107,7 +107,7 @@ const purchaseList: React.FC<Iprops> = ({
         }
       },
       { title: intl.formatMessage({ id: 'contract.remark' }), dataIndex: 'remark', align: 'center',key:'remark' },
-    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryMethodName', align: 'center',key:'deliveryMethodName' },
+    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryTypeName', align: 'center',key:'deliveryTypeName' },
     
     ];
     setcolumns(columns)

src/pages/contract/coordination/details/index.tsx

@@ -111,7 +111,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: contractCoordinationSourceVO.currencyName ? contractCoordinationSourceVO.currencyName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractCoordinationSourceVO.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${contractCoordinationSourceVO.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractCoordinationSourceVO.totalAmount ? `${contractCoordinationSourceVO.totalAmount}` : '' },
             { label: intl.formatMessage({ id: 'contract.portDestination' }), extra: contractCoordinationSourceVO.arrivalPortName ? contractCoordinationSourceVO.arrivalPortName : '', },
           ]
         }
@@ -368,9 +368,8 @@ const Details = (props: any) => {
   const columns =  [
     {
       title: intl.formatMessage({ id: 'contract.advance' }),
-      dataIndex: 'AdvanceChargeEnum',
+      dataIndex: 'advanceChargeName',
       align: 'left',
-      render: (text)=> <>{text == 1 ? '需要预付' : '无需预付'}</>
     },
     {
       title: intl.formatMessage({ id: 'contract.paymentClause' }),

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

@@ -34,9 +34,8 @@ const FormList = (props: any) => {
   const columns =  [
     {
       title: intl.formatMessage({ id: 'contract.advance' }),
-      dataIndex: 'AdvanceChargeEnum',
+      dataIndex: 'advanceChargeName',
       align: 'left',
-      render: (text)=> <>{text == 1 ? '需要预付' : '无需预付'}</>
     },
     {
       title: intl.formatMessage({ id: 'contract.paymentClause' }),
@@ -299,7 +298,6 @@ const FormList = (props: any) => {
   })
 
   const fetchData = (params: any) => {
-    console.log('basicsVO.sourceTypebasicsVO.sourceTypebasicsVO.sourceType',111)
     // ctx()
     let param = {
       memberId: memberId,
@@ -308,7 +306,11 @@ const FormList = (props: any) => {
     }
     return new Promise(resolve => {
       postContractManageGetFeignPayPlan({ ...param }, { ctlType: 'none' }).then(res => {
-        resolve(res.data)
+        let data:any = res.data
+        data?.data?.length && data.data.map((i,k)=>{
+          i.id = param.current + (k.toString())
+        })
+        resolve(data)
       }).catch(err => {
         console.log(err)
       })

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

@@ -123,7 +123,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: contractSourceVO.currencyTypeName ? contractSourceVO.currencyTypeName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractSourceVO.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${contractSourceVO.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: contractSourceVO.totalAmount ? `${contractSourceVO.totalAmount}` : '' },
             { label: intl.formatMessage({ id: 'contract.portDestination' }), extra: contractSourceVO.arrivalPortName ? contractSourceVO.arrivalPortName : '', },
           ]
         }
@@ -263,7 +263,7 @@ const Details = (props: any) => {
       }
     },
     { title: intl.formatMessage({ id: 'contract.remark' }), dataIndex: 'remark', align: 'center',key:'remark' },
-    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryMethodName', align: 'center',key:'deliveryMethodName' },
+    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryTypeName', align: 'center',key:'deliveryTypeName' },
      {
       dataIndex: 'guanlianqinggoudan', align: 'center',
       title: intl.formatMessage({ id: 'contract.guanliandanju' }),

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

@@ -138,7 +138,7 @@ const FormList = (props: any) => {
       render: (text: any, record: any) => <Text>{Number(record.bidAmount).toFixed(2)}</Text>
     },
     { title: intl.formatMessage({ id: 'contract.remark' }), dataIndex: 'remark', align: 'center',key:'remark' },
-    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryMethodName', align: 'center',key:'deliveryMethodName' },
+    { title: intl.formatMessage({ id: 'contract.purchase.type' }), dataIndex: 'deliveryTypeName', align: 'center',key:'deliveryTypeName' },
     
   ];
   useEffect(() => {

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

@@ -252,9 +252,8 @@ const FormList = (props: any) => {
   const columns =  [
     {
       title: intl.formatMessage({ id: 'contract.advance' }),
-      dataIndex: 'AdvanceChargeEnum',
+      dataIndex: 'advanceChargeName',
       align: 'left',
-      render: (text)=> <>{text == 1 ? '需要预付' : '无需预付'}</>
     },
     {
       title: intl.formatMessage({ id: 'contract.paymentClause' }),