Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

src/packages/pc/views/report/broker/index.vue

@@ -70,7 +70,6 @@ import { useOperation } from '@/hooks/operation'
 import { formatDate } from '@/filters'
 import { useUserStore } from '@/stores'
 import { getReportTypeList, ReportType, getQuarterList } from '@/constants/report'
-import { queryCommonFlag } from '@/services/api/account'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
@@ -106,13 +105,6 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(orgRep
     }
 })
 
-useRequest(queryCommonFlag, {
-    onSuccess: (res) => {
-        queryParams.reckondate = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-        queryParams.reckondateend = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-    }
-})
-
 // 日期类型
 const dateType = computed(() => {
     switch (queryParams.cycletype) {

src/packages/pc/views/report/investor/index.vue

@@ -73,7 +73,6 @@ import { formatDate } from '@/filters'
 import { useOperation } from '@/hooks/operation'
 import { useUserStore } from '@/stores'
 import { getReportTypeList, ReportType, getQuarterList } from '@/constants/report'
-import { queryCommonFlag } from '@/services/api/account'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
@@ -94,6 +93,7 @@ const { componentMap, componentId, record, openComponent, closeComponent, getFil
 
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(investorReportQuery, {
     params: {
+        cycletype: 0,
         pageNum: 1,
         pageSize: 20,
         orgztypes: userStore.userInfo.orgztypes
@@ -103,13 +103,6 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(invest
     }
 })
 
-useRequest(queryCommonFlag, {
-    onSuccess: (res) => {
-        queryParams.reckondate = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-        queryParams.reckondateend = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-    }
-})
-
 // 日期类型
 const dateType = computed(() => {
     switch (queryParams.cycletype) {
@@ -157,7 +150,7 @@ const onTypeChange = (value: ReportType) => {
 }
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'reckondate', label: '日期' },
+    { field: 'reckondate', label: '日期', formatValue:((val) => formatDate(val)) },
     { field: 'loginids', label: '登录账号' },
     { field: 'accountid', label: '资金账户' },
     { field: 'accountname', label: '账户名称' },

src/packages/pc/views/report/profitshare/index.vue

@@ -51,7 +51,6 @@ import { shareAmountQuery } from '@/services/api/report'
 import { useOperation } from '@/hooks/operation'
 import { useUserStore } from '@/stores'
 import { getReportTypeList, ReportType, getQuarterList } from '@/constants/report'
-import { queryCommonFlag } from '@/services/api/account'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
@@ -81,12 +80,6 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(shareA
     }
 })
 
-useRequest(queryCommonFlag, {
-    onSuccess: (res) => {
-        queryParams.cycletime = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-    }
-})
-
 // 日期类型
 const dateType = computed(() => {
     switch (queryParams.cycletype) {

src/packages/pc/views/report/trade/index.vue

@@ -55,7 +55,6 @@ import { useRequest } from '@/hooks/request'
 import { queryTrade } from '@/services/api/report'
 import { formatDate } from '@/filters'
 import { useOperation } from '@/hooks/operation'
-import { queryCommonFlag } from '@/services/api/account'
 import { getReportTypeList, ReportType, getQuarterList  } from '@/constants/report'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
@@ -85,12 +84,6 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryT
     }
 })
 
-useRequest(queryCommonFlag, {
-    onSuccess: (res) => {
-        queryParams.cycletime = formatDate(res.data.tradedate, 'YYYY-MM-DD')
-    }
-})
-
 // 日期类型
 const dateType = computed(() => {
     switch (queryParams.cycletype) {