update

src/pages/newDataAnalysis/borderServiceArea/index.tsx

@@ -477,7 +477,7 @@ const GDPoint: React.FC<{ currentUser: CurrentUser }> = (props) => {
             if (data.Result_Code === 100) {
                 message.success("更新成功！")
                 // actionRef.current?.reload()
-                
+
                 formRef.current?.submit();
                 handleGetTableData()
             } else {

src/pages/reports/Finance/accountMonthly.tsx

@@ -304,7 +304,6 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
                         OPRATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss')
                       }
                       const data = await handleSynchroBANKACCOUNTVERIFY(req)
-                      console.log('data', data);
                       if (data.Result_Code === 100) {
                         message.success(data.Result_Desc)
                         actionRef.current?.reload()
@@ -324,11 +323,9 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
               color:
                 record?.ServerpartShop_Name && !record?.ServerpartShop_ID ? '#1890ff' : record?.Show_Warning ? 'red' : '', cursor: 'pointer'
             }} onClick={async () => {
-              console.log('record', record)
               if (record?.ServerpartShop_Name && !record?.ServerpartShop_ID) {
                 if (record?.BusinessProject_ID) {
                   const data = await getProjectDetail(record?.BusinessProject_ID)
-                  console.log('data', data)
                   setCurrentRow(data);
                   setShowNewDetail(true)
                 } else {
@@ -459,8 +456,6 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
                 (record?.ServerpartShop_Name && !record?.ServerpartShop_ID) ?
                   <span style={{ color: '#1890ff', cursor: 'pointer' }}
                     onClick={() => {
-                      console.log('record', record);
-                      console.log('bigSearchTime', bigSearchTime);
                       // setCurrentRow(record)
                       // setFlowDrawer(true)
                       const res = JSON.parse(JSON.stringify(record))
@@ -512,13 +507,10 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
             const num = record?.Ticket_Price - record?.MobilePay_Price
             return <span style={{ color: num > 0 ? '#60cf60' : num < 0 ? 'red' : '', cursor: record?.index && record?.index.indexOf('.') !== -1 && record?.Ticket_Price - record?.MobilePay_Price !== 0 ? 'pointer' : '' }} onClick={async () => {
               if (record?.index && record?.index.indexOf('.') !== -1 && record?.Ticket_Price - record?.MobilePay_Price !== 0) {
-                console.log('record', record)
                 setCurrentRow(record)
                 setDifferenceDrawer(true)
-                // console.log('record?.BusinessProject_ID', record?.BusinessProject_ID)
                 // const data = await getProjectDetail(record?.BusinessProject_ID)
                 // setProjectDetail(data)
-                // console.log('data', data)
               }
             }}>
               {numeral(record?.Ticket_Price - record?.MobilePay_Price).format('0,0.00')}
@@ -886,7 +878,6 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
     const pageLoading = document.getElementsByClassName(`pageLoading`)[0]
 
     const row = main.getElementsByClassName(`${name}`)[0]
-    console.log('row', row);
 
     const loadingBox = document.createElement('tr');
     const span = document.createElement('span');
@@ -923,7 +914,6 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
           Keyword: searchText || ''
         }
         const data = await handleGetRoyaltyReport(req)
-        console.log('time', obj?.Statistics_Date);
         const res: any = data.data
         if (res && res.length > 0) {
           result.forEach((item: any) => {
@@ -932,7 +922,6 @@ const ReportTable: React.FC<{ currentUser?: CurrentUser }> = (props) => {
             }
           })
         }
-        console.log('result', result);
         setReqBigDetailList(result)
       }
       setBigExportLoadingBtn(false)

src/pages/reports/revenueConfirmation/components/monthTopTable.tsx

@@ -75,7 +75,7 @@ const MonthTopTable = ({ compareCurrent, newData, reload, headerTitle }: DetailP
                     align: 'center',
                     width: 100,
                     render: (_, record) => {
-                        return record?.GUARANTEERATIO ? `${record?.GUARANTEERATIO  }%` : ''
+                        return record?.GUARANTEERATIO ? `${record?.GUARANTEERATIO}%` : ''
                     }
                 }
             ]

src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx

@@ -2818,7 +2818,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
             {
                 // parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') && parentRow?.BUSINESSAPPROVAL_ID > 0 ?
                 parentRow?.ProjectExit ?
-                    <HistoricalProjects parentRow={parentRow} pageType={'search'} /> : ""
+                    <HistoricalProjects parentRow={parentRow} pageType={currentApprovalstate > 0 && parentRow?.PEND_STATE === 0 && parentRow?.APPLY_PROCCESS ? 'edit' : 'search'} /> : ""
             }
 
 

src/utils/requestJava.ts

@@ -58,7 +58,7 @@ const errorHandler = (error: { response: Response }): Response => {
 const request = extend({
   errorHandler, // default error handling
   // prefix: '/EShangApiMain',//  开发
-  prefix: 'https://admin.es.eshangtech.com/platform', // 正式
+  prefix: 'https://java.es.eshangtech.com', // 正式
   // prefix: 'http://10.104.1.175:8070/platform', // 正式
   headers: {
     token: '',