瀏覽代碼

Merge branch 'feature_20260228_周报半月报动态配置' into uat(dev)

# Conflicts:
#	src/views/week/daily.vue
#	src/views/week/dailyApproval.vue
#	src/views/week/dailyDetails.vue
#	src/views/week/dailyHistoricalDetails.vue
#	src/views/week/doubleHistoricalWeeklyDetils.vue
#	src/views/week/doubleWeekly.vue
#	src/views/week/doubleWeeklyApproval.vue
#	src/views/week/doubleWeeklyDetils.vue
#	src/views/week/weekly.vue
#	src/views/week/weeklyApproval.vue
#	src/views/week/weeklyApprovalDetils.vue
#	src/views/week/weeklyHistoricalDetils.vue
zhujindu 22 小時之前
父節點
當前提交
03e31c520b

+ 1 - 0
src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -148,6 +148,7 @@ import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
 import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
+import reportCustom from './reportCustom.vue';
 export default {
   name: 'home',
   components: {

+ 1 - 0
src/views/week/doubleWeeklyApproval.vue

@@ -114,6 +114,7 @@ import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
 import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
+import reportCustom from './reportCustom.vue';
 
 export default {
   name: 'home',

+ 1 - 0
src/views/week/doubleWeeklyDetils.vue

@@ -127,6 +127,7 @@ import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
 import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
+import reportCustom from './reportCustom.vue';
 
 export default {
   name: 'home',