ソース対応

src/views/fcbi/sales/sumResult.vue

@@ -4,7 +4,7 @@
     <div class="csv-title">
       <el-button   @click="handleExportCSV" class="append-button">CSV出力</el-button>
     </div>
-    <el-table v-show="initLoadingCompleted && aggregationType === 'FC_CHECKBOX'"  v-loading="listLoading" :border="true" :data="fcItemList">
+    <el-table v-show="initLoadingCompleted && aggregationType === AGGREGATION_TYPE.FC"  v-loading="listLoading" :border="true" :data="fcItemList">
       <el-table-column :show-overflow-tooltip="true" align="left" header-align="center" label="FC" min-width="60"
                        prop="fcName"
       >
@@ -29,7 +29,7 @@
                        width=""/>
     </el-table>
 
-    <el-table  v-show="initLoadingCompleted && aggregationType === 'STORE_CHECKBOX'"  v-loading="listLoading" :border="true" :data="storeItemList">
+    <el-table  v-show="initLoadingCompleted && aggregationType === AGGREGATION_TYPE.STORE"  v-loading="listLoading" :border="true" :data="storeItemList">
       <el-table-column :show-overflow-tooltip="true" align="left" header-align="center" label="FC" min-width="60"
                        prop="fcName"
       >
@@ -67,7 +67,11 @@
 import { salesSurvey} from "@/api/fcbi/survey.js"
 import { useSurveySalesStore } from '@/store/surveyStore';
 import {download} from "@/utils/request.js";
-
+import { AGGREGATION_TYPE, TARGET_PERIOD_TYPE } from '@/constants';
+defineExpose({
+  AGGREGATION_TYPE,
+  TARGET_PERIOD_TYPE
+});
 // 認証項目のテーブルデータを格納するリアクティブ
 const fcItemList = ref([]);
 const storeItemList = ref([]);

src/views/fcbi/sales/sumSettings.vue

@@ -84,7 +84,7 @@
 import { getRegionTree } from "@/api/fcbi/survey.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, toRefs } from 'vue';
 import PublicRange from '../../../components/PublicRange.vue';
-import { useSurveyStore, F } from '@/store/surveyStore';
+import { useSurveyStore, useSurveySalesStore } from '@/store/surveyStore';
 import { useRouter } from 'vue-router';
 import { AGGREGATION_TYPE, TARGET_PERIOD_TYPE } from '@/constants';
 
@@ -123,7 +123,7 @@ const data = reactive({
   queryParams: {
     brandCode: [],
     businessTypeCode: [],
-    targetPeriodType:  TARGET_PERIOD_TYPE.MONTHLY,
+    targetPeriodType: TARGET_PERIOD_TYPE.MONTHLY,
     aggregationType: AGGREGATION_TYPE.FC,
     monthYear: null,
     startMonth: null,
@@ -298,10 +298,14 @@ const handleConfirm = () => {
       const hasArea = queryParams.value.regions && queryParams.value.regions.length > 0;
       salesFlag = isMonth ? (hasArea ? 1 : 2) : (hasArea ? 3 : 4);
       break;
+    case AGGREGATION_TYPE.AREA:
+      salesFlag = isMonth ? 7 : 8;
+      break;
     case AGGREGATION_TYPE.STORE:
       salesFlag = isMonth ? 5 : 6;
       break;
     default:
+      proxy.$message.warning('集計種別を選択してください');
       return;
   }