xxxxx

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

@@ -2,8 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
-                :show-message="false">
+            <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules" :show-message="false">
                 <el-form-item label="报表类型" prop="cycletype">
                     <el-select v-model="queryParams.cycletype" @change="onTypeChange">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
@@ -12,7 +11,7 @@
                 </el-form-item>
                 <el-form-item label="日期" prop="cycletime">
                     <el-date-picker :type="dateType" v-model="queryParams.cycletime" :format="dateFormat"
-                    :value-format="dateFormat" />
+                    :value-format="dateFormat" placeholder="请选择日期"/>
                 </el-form-item>
                 <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
                     <el-select v-model="queryParams.quarter">
@@ -21,11 +20,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否包含子机构" prop="isson">
-                    <el-checkbox :v-model="queryParams.isson" size="small" />
+                    <el-checkbox v-model="isson" size="small" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch">查询</el-button>
-                    <el-button type="danger" @click="onSearch(false)"> 重置</el-button>
                 </el-form-item>
             </el-form>
         </template>
@@ -45,7 +43,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, reactive, computed } from 'vue'
+import { shallowRef, reactive, computed, ref } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useRequest } from '@/hooks/request'
 import { formatDate } from '@/filters'
@@ -53,21 +51,22 @@ 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'
 
 const formRef = shallowRef<FormInstance>()
-const dateValue = shallowRef<string[]>([])
 const userStore = useUserStore()
+const isson = ref(true)
 
 const queryParams = reactive<Model.ShareAmountQueryReq>({
-    isson: 0,
     orgztypes: userStore.userInfo.orgztypes,
-    cycletype: 0
+    cycletype: 0,
+    cycletime: ''
 })
 
-const { componentMap, componentId, record, openComponent, closeComponent, getFilteredButtons } = useOperation<Model.InvestorOrderRsp>({
+const { componentMap, componentId, record, openComponent, closeComponent, getFilteredButtons } = useOperation<Model.ShareAmountQueryRsp>({
     onClose: () => onSearch()
 })
 
@@ -82,6 +81,12 @@ 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) {
@@ -140,16 +145,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 
 // 表单验证规则
 const formRules: FormRules = {
-    cycletime: [{
-        required: true,
-        validator: (rule, value, callback) => {
-            if (dateValue.value.length === 2) {
-                callback()
-            } else {
-                callback(new Error('请选择日期'))
-            }
-        },
-    }],
+    cycletime: [{ required: true }],
 }
 
 const onSearch = (clear = false) => {
@@ -162,16 +158,9 @@ const openComponentOnClick = (code: string) => {
 
 // 处理请求参数
 const processRequiredParams = (callback: (params: Model.ShareAmountQueryReq) => void, clear = false) => {
-    if (!clear) {
-        queryParams.cycletime = ''
-        queryParams.cycletype = 0
-        queryParams.isson = 0
-        return
-    }
+    queryParams.isson = isson.value ? 1 : 0
     formRef.value?.validate((valid) => {
         if (valid) {
-            const [startDate] = dateValue.value
-            queryParams.tradedate = startDate
             callback(queryParams)
         }
     })

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

@@ -2,9 +2,42 @@
 <template>
     <app-view>
         <template #header>
-            <app-filter :options="filterOptons" />
+            <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules">
+                <el-form-item label="报表类型" prop="cycletype">
+                    <el-select v-model="queryParams.cycletype" @change="onTypeChange">
+                        <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="日期" prop="cycletime">
+                    <el-date-picker :type="dateType" v-model="queryParams.cycletime" :format="dateFormat"
+                    :value-format="dateFormat" placeholder="请选择日期"/>
+                </el-form-item>
+                <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
+                    <el-select v-model="queryParams.quarter">
+                        <el-option v-for="item in getQuarterList()" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="资金账户" prop="accountid">
+                    <app-select-account v-model="queryParams.userid" @change="onAccountChange" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="onSearch">查询</el-button>
+                    <el-button type="danger" @click="onSearch(false)"> 重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="report-account__info" v-if="selectedAccount">
+                <span>账户：{{ selectedAccount.relatedname }}</span>
+                <span>资金账户：{{ selectedAccount.accountid }}</span>
+                <span>登录账号：{{ selectedAccount.invloginids }}</span>
+            </div>
         </template>
         <app-table :data="dataList" showIndex v-model:columns="tableColumns" :loading="loading">
+            <template #headerLeft>
+                <app-operation :data-list="getFilteredButtons(['query_order_institutionsumm_export'])"
+                    @click="openComponentOnClick" />
+            </template>
             <template #footer>
                 <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
                     @change="onSearch" />
@@ -16,34 +49,98 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
-import { ElMessage } from 'element-plus'
+import { shallowRef, reactive, computed } from 'vue'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useRequest } from '@/hooks/request'
-import { useDataFilter } from '@/hooks/datatable'
 import { queryTrade } from '@/services/api/report'
+import { formatDate } from '@/filters'
 import { useOperation } from '@/hooks/operation'
-import { getReportTypeList } from '@/constants/report'
+import { queryCommonFlag } from '@/services/api/account'
+import { getReportTypeList, ReportType, getQuarterList  } from '@/constants/report'
 import AppTable from '@pc/components/base/table/index.vue'
-import AppFilter from '@pc/components/base/table-filter/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
+import AppOperation from '@pc/components/base/operation/index.vue'
+import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
 
-const queryParams = shallowRef<Model.TradeReq>()
-const { filterOptons, getQueryParams } = useDataFilter<Model.TradeReq>()
+const queryParams = reactive<Model.TradeReq>({
+    cycletype: 0,
+    cycletime: ''
+})
+const formRef = shallowRef<FormInstance>()
+const selectedAccount = shallowRef<Model.TAAccountChildrenSelectRsp>()
 
-const { componentMap, componentId, record, closeComponent } = useOperation<Model.TradeReq>({
+const { componentMap, componentId, record, openComponent, closeComponent, getFilteredButtons } = useOperation<Model.TradeRsp>({
     onClose: () => onSearch()
 })
 
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryTrade, {
     params: {
         pageNum: 1,
-        pageSize: 20
+        pageSize: 20,
+        cycletype: 0,
+        cycletime: ''
     },
     onError: (err) => {
         ElMessage.error(err)
     }
 })
 
+useRequest(queryCommonFlag, {
+    onSuccess: (res) => {
+        queryParams.cycletime = formatDate(res.data.tradedate, 'YYYY-MM-DD')
+    }
+})
+
+// 日期类型
+const dateType = computed(() => {
+    switch (queryParams.cycletype) {
+        case ReportType.Week:
+            return 'week'
+        case ReportType.Month:
+            return 'month'
+        case ReportType.Quarter:
+        case ReportType.Year:
+            return 'year'
+        default:
+            return 'date'
+    }
+})
+
+
+// 日期格式
+const dateFormat = computed(() => {
+    switch (queryParams.cycletype) {
+        case ReportType.Month:
+            return 'YYYY-MM'
+        case ReportType.Quarter:
+        case ReportType.Year:
+            return 'YYYY'
+        default:
+            return 'YYYY-MM-DD'
+    }
+})
+
+const onTypeChange = (value: ReportType) => {
+    const dateValue = queryParams.cycletime
+    if (dateValue) {
+        switch (value) {
+            case ReportType.Month:
+            queryParams.cycletime = formatDate(dateValue, 'YYYY-MM')
+                break
+            case ReportType.Quarter:
+            case ReportType.Year:
+            queryParams.cycletime = formatDate(dateValue, 'YYYY')
+                break
+            default:
+            queryParams.cycletime = formatDate(dateValue, 'YYYY-MM-DD')
+        }
+    }
+}
+
+const onAccountChange = (item?: Model.TAAccountChildrenSelectRsp) => {
+    selectedAccount.value = item
+}
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'goodsname', label: '商品代码/名称	' },
     { field: 'marketname', label: '市场' },
@@ -55,24 +152,32 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'closecharge', label: '转让手续费' }
 ])
 
-filterOptons.selectList = [
-    {
-        key: 'cycletype',
-        label: '报表类型',
-        selectedValue: 0,
-        locked: true,
-        options: getReportTypeList(),
-    }
-]
-
-filterOptons.buttonList = [
-    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-    { lable: '重置', className: 'el-button--primary', onClick: () => onSearch(true) }
-]
+// 表单验证规则
+const formRules: FormRules = {
+    cycletime: [{ required: true }],
+}
 
 const onSearch = (clear = false) => {
-    const qs = getQueryParams(clear)
-    run(qs)
+    processRequiredParams((qs) => run(qs), clear)
+}
+
+const openComponentOnClick = (code: string) => {
+    processRequiredParams(() => openComponent(code))
+}
+
+// 处理请求参数
+const processRequiredParams = (callback: (params: Model.TradeReq) => void, clear = false) => {
+    
+    if (!clear) {
+        queryParams.cycletime = ''
+        queryParams.cycletype = 0
+        return
+    }
+    formRef.value?.validate((valid) => {
+        if (valid) {
+            callback(queryParams)
+        }
+    })
 }
 
 </script>