Merge branch 'master' of http://172.14.1.63:3000/liuxf/ds-yamada-fcbi-admin

src/store/surveyStore.js

@@ -75,7 +75,7 @@ export const useSurveyStore = defineStore('survey', {
     }
 })
 
-export const useSurveySalesStore = defineStore('surveySales', {
+export const useSalesStore = defineStore('surveySales', {
     state: () => ({
         // 存储销售统计传递的数据
         salesData: {

src/views/fcbi/customer/export.vue

@@ -26,7 +26,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 } from '@/store/surveyStore';
+import { useSurveyStore } from '@/store/yamadaStore.js';
 import {download} from "@/utils/request.js";
 import { ElMessageBox } from 'element-plus';
 

src/views/fcbi/sales/sumResult.vue

@@ -62,10 +62,10 @@
   </div>
 </template>
 
-<script name="SurveySumResults" setup>
+<script name="purchaseSaleResults" setup>
 
 import { purchaseSaleList} from "@/api/fcbi/purchaseSale.js"
-import { useSurveySalesStore } from '@/store/surveyStore';
+import { useSalesStore } from '@/store/yamadaStore.js';
 import {download} from "@/utils/request.js";
 import { AGGREGATION_TYPE, TARGET_PERIOD_TYPE } from '@/constants';
 defineExpose({
@@ -81,15 +81,15 @@ const listLoading = ref(false);
 const listTotalCnt = ref(0);
 // 初期ロードが完了したかどうかを示すリアクティブ
 const initLoadingCompleted = ref(false);
-const surveySalesStore = useSurveySalesStore();
+const SalesStore = useSalesStore();
 
 const aggregationType = computed(() => {
-  return surveySalesStore.salesData.aggregationType;
+  return SalesStore.salesData.aggregationType;
 });
 
 const ratioLabel = computed(() => {
   // 从存储中获取选择的类型（月指定/年度指定）
-  const { releaseType } = surveySalesStore.salesData;
+  const { releaseType } = SalesStore.salesData;
   // 返回对应的标题
   return releaseType === 'immediate' ? '前月比' : '前年度比';
 });
@@ -123,7 +123,7 @@ onMounted(() => {
     regionCodes,
     salesFlag,
     aggregationType
-  } = surveySalesStore.salesData;
+  } = SalesStore.salesData;
 
   queryParams.value.startYear = startYear;
   queryParams.value.startMonth = startMonth;

src/views/fcbi/sales/sumSettings.vue

@@ -70,11 +70,11 @@
   </div>
 </template>
 
-<script name="surveySumSettings" setup>
+<script name="purchaseSaleSettings" setup>
 import { getRegionTree } from "@/api/fcbi/survey.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, toRefs } from 'vue';
 import PublicRange from '../../../components/PublicRange.vue';
-import { useSurveyStore, useSurveySalesStore } from '@/store/surveyStore';
+import { useSurveyStore, useSalesStore } from '@/store/yamadaStore';
 import { useRouter } from 'vue-router';
 import { AGGREGATION_TYPE, TARGET_PERIOD_TYPE } from '@/constants';
 
@@ -84,7 +84,7 @@ const months = Array.from({ length: 12 }, (_, i) => i + 1);
 const error = ref('');
 const { proxy } = getCurrentInstance();
 const surveyStore = useSurveyStore();
-const surveySalesStore = useSurveySalesStore();
+const SalesStore = useSalesStore();
 const router = useRouter();
 
 // テンプレートで定数を使用可能にするため、エクスポートします
@@ -300,7 +300,7 @@ const handleAggregate = () => {
     aggregationType: queryParams.value.aggregationType,
     salesFlag: salesFlag
   };
-  surveySalesStore.setSalesData(transferData);
+  SalesStore.setSalesData(transferData);
   router.push({ name: 'salesSumResult' });
 };
 

src/views/fcbi/survey/decision.vue

@@ -302,7 +302,7 @@ import { addSurvey } from "@/api/fcbi/survey.js"
 import { reactive, toRefs, ref, watch } from 'vue';
 import RegionTree from '../../../components/RegionTree.vue';
 import { ElMessage } from "element-plus";
-import { useSurveyStore } from '@/store/surveyStore'
+import { useSurveyStore } from '@/store/yamadaStore.js'
 
 // サーベイストアを取得（アンケート関連の状態管理）
 const surveyStore = useSurveyStore()

src/views/fcbi/survey/detail.vue

@@ -292,7 +292,7 @@ import { reactive, toRefs, ref, watch, onMounted } from 'vue';
 import RegionTree from '../../../components/RegionTree.vue';
 import { ElMessage } from "element-plus";
 import {useRoute, useRouter} from 'vue-router';
-import { useSurveyStore } from '@/store/surveyStore'
+import { useSurveyStore } from '@/store/yamadaStore.js'
 
 const { proxy } = getCurrentInstance();
 const surveyStore = useSurveyStore()

src/views/fcbi/survey/form.vue

@@ -280,7 +280,7 @@ import { reactive, toRefs, ref, watch, onMounted } from 'vue';
 import PublicRange from '../../../components/PublicRange.vue';
 import { ElMessage } from "element-plus";
 import { useRouter } from 'vue-router';
-import { useSurveyStore } from '@/store/surveyStore'
+import { useSurveyStore } from '@/store/yamadaStore.js'
 import {formatMsg} from "@/utils/yamada.js"
 
 const { proxy } = getCurrentInstance();