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

src/pages/afterService/returnApplication/components/DetailInfo/index.tsx

@@ -128,6 +128,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       orderType: detailInfo?.orderType,
       refundAmount: record.refundAmount,
       salesList: record.salesList,
+      productBrandNo: record.productBrandNo,
     });
     setVisibleReturnInfo(true);
   };

src/pages/balance/businessRequestFunds/admin/add.tsx

@@ -514,6 +514,8 @@ const Add = () => {
     let _rows = [...rows]
     _rows = _rows.map((item) => { return { ...item, applyPayment: item?.applyPayment ?? Number(item.billAmount - item.paid - item.appliedUnpaid) } })
     const _tabelSource = [...tabelSource].concat(_rows)
+    console.log(_tabelSource,'_tabelSource');
+    
     form.setFieldsValue({ 'rows': _tabelSource, 'paymentClauseTypeName': _tabelSource[0].paymentTypeName })
     setTabelSource(_tabelSource);
     form.setFieldsValue({ 'rows': _tabelSource })
@@ -548,7 +550,7 @@ const Add = () => {
   }, 
   {
     title: '预计结算日期',
-    dataIndex: 'settlementTime', 
+    dataIndex: 'settlementDate', 
     width: 120,
   },{
     title: intl.formatMessage({ id: 'balance.businessRequestFunds.admin.add.columns.billTypeName' }),
@@ -656,7 +658,7 @@ const Add = () => {
   }, 
   {
     title: '预计结算日期',
-    dataIndex: 'settlementTime', 
+    dataIndex: 'settlementDate', 
     width: 120,
   },{
     title: intl.formatMessage({ id: 'balance.businessRequestFunds.admin.add.fundsColumns.billTypeName' }),

src/pages/balance/businessRequestFunds/detail/index.tsx

@@ -174,7 +174,7 @@ const SearchDetail = () => {
     },
     {
       title: '预计结算日期',
-      dataIndex: 'settlementTime', 
+      dataIndex: 'settlementDate', 
     },
     {
       title: intl.formatMessage({ id: 'balance.businessRequestFunds.detail.columns.billTypeName' }),