Handy_Cao 1 éve
szülő
commit
46d8fad0ff

+ 26 - 2
src/packages/pc/views/report/institution/index.vue

@@ -9,6 +9,30 @@
                         :placeholder="t('common.pleasechoice')" :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                     </el-form-item>
                 </template>
+                <template #quarter="{ item }">
+                    <el-form-item :label="item.label" prop="quarter"
+                        v-if="queryParams.cycletype === ReportType.Quarter">
+                        <el-select v-model="item.value">
+                            <el-option v-for="option in getQuarterList()" :key="option.value" :label="option.label"
+                                :value="option.value" />
+                        </el-select>
+                    </el-form-item>
+                    <template v-else>
+                        {{ (item.value = undefined) }}
+                    </template>
+                </template>
+                <template #quarterend="{ item }">
+                    <el-form-item :label="item.label" prop="quarterend"
+                        v-if="queryParams.cycletype === ReportType.Quarter">
+                        <el-select v-model="item.value">
+                            <el-option v-for="option in getQuarterList()" :key="option.value" :label="option.label"
+                                :value="option.value" />
+                        </el-select>
+                    </el-form-item>
+                    <template v-else>
+                        {{ (item.value = undefined) }}
+                    </template>
+                </template>
                 <template #inamount>
                     <el-form-item :label="t('report.investor.inamount')" prop="inamount">
                         <el-input-number v-model="queryParams.inamount" :min="0" controls-position="right"
@@ -189,12 +213,12 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
         {
             field: 'quarter',
             label: '开始季度',
-            options: () => getQuarterList()
+            required: true
         },
         {
             field: 'quarterend',
             label: '结束季度',
-            options: () => getQuarterList()
+            required: true
         },
         {
             field: 'inamount',

+ 5 - 5
src/packages/pc/views/report/profitshare/index.vue

@@ -13,8 +13,8 @@
                     <el-form-item :label="item.label" prop="quarter"
                         v-if="queryParams.cycletype === ReportType.Quarter">
                         <el-select v-model="item.value">
-                            <el-option v-for="item in getQuarterList()" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                            <el-option v-for="option in getQuarterList()" :key="option.value" :label="option.label"
+                                :value="option.value" />
                         </el-select>
                     </el-form-item>
                     <template v-else>
@@ -93,7 +93,7 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
         },
         {
             field: 'quarter',
-            label: t('report.account.quarter'),
+            label: t('report.profitshare.quarter'),
             required: true
         },
         {
@@ -103,8 +103,8 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
         }
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
     ]
 })